From 53edea21669609fc335cc214f360a4ea9326fbfb Mon Sep 17 00:00:00 2001 From: DrDisagree Date: Mon, 11 Dec 2023 18:07:49 +0600 Subject: [PATCH] Extract string resources --- .../ui/fragments/StylingFragment.java | 31 ++++++++++++++----- app/src/main/res/values/strings.xml | 8 +++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/drdisagree/colorblendr/ui/fragments/StylingFragment.java b/app/src/main/java/com/drdisagree/colorblendr/ui/fragments/StylingFragment.java index 93321ac3..9f33a34b 100644 --- a/app/src/main/java/com/drdisagree/colorblendr/ui/fragments/StylingFragment.java +++ b/app/src/main/java/com/drdisagree/colorblendr/ui/fragments/StylingFragment.java @@ -9,7 +9,6 @@ import static com.drdisagree.colorblendr.common.Const.MONET_SEED_COLOR; import static com.drdisagree.colorblendr.common.Const.MONET_SEED_COLOR_ENABLED; -import android.annotation.SuppressLint; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; @@ -28,6 +27,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; +import com.drdisagree.colorblendr.R; import com.drdisagree.colorblendr.config.RPrefs; import com.drdisagree.colorblendr.databinding.FragmentStylingBinding; import com.drdisagree.colorblendr.ui.viewmodel.SharedViewModel; @@ -170,7 +170,6 @@ public void onStopTrackingTouch(@NonNull Slider slider) { public void onStartTrackingTouch(@NonNull Slider slider) { } - @SuppressLint("SetTextI18n") @Override public void onStopTrackingTouch(@NonNull Slider slider) { monetBackgroundLightness[0] = (int) slider.getValue(); @@ -263,11 +262,11 @@ private void enablePaletteOnClickListener() { colorTableRows[i].getChildAt(j).setOnClickListener(v -> { boolean manualOverride = RPrefs.getBoolean(MANUAL_OVERRIDE_COLORS, false); - String snackbarButton = manualOverride ? "Override" : "Copy"; + String snackbarButton = getString(manualOverride ? R.string.override : R.string.copy); Snackbar.make( requireView(), - "Color code: " + ColorUtil.intToHexColor((Integer) v.getTag()), + getString(R.string.color_code, ColorUtil.intToHexColor((Integer) v.getTag())), Snackbar.LENGTH_INDEFINITE) .setAction(snackbarButton, v1 -> { if (!manualOverride) { @@ -278,8 +277,12 @@ private void enablePaletteOnClickListener() { } if (finalJ == 0 || finalJ == 12) { - Snackbar.make(requireView(), "Cannot override this color", Snackbar.LENGTH_SHORT) - .setAction("Dismiss", v2 -> { + Snackbar.make( + requireView(), + getString(R.string.cannot_override_color), + Snackbar.LENGTH_SHORT + ) + .setAction(getString(R.string.override), v2 -> { }) .show(); return; @@ -316,13 +319,25 @@ private void enablePaletteOnClickListener() { ((TextView) ((ViewGroup) v) .getChildAt(0)) .setTextColor(ColorUtil.calculateTextColor(systemColors[finalI][finalJ])); - Snackbar.make(requireView(), "Custom color cleared", Snackbar.LENGTH_SHORT) - .setAction("Reset all", v2 -> { + Snackbar.make( + requireView(), + getString(R.string.color_reset_success), + Snackbar.LENGTH_SHORT + ) + .setAction(getString(R.string.reset_all), v2 -> { for (int x = 0; x < colorTableRows.length; x++) { for (int y = 0; y < colorTableRows[x].getChildCount(); y++) { RPrefs.clearPref("monet_color_" + x + y); } } + Snackbar.make( + requireView(), + getString(R.string.reset_all_success), + Snackbar.LENGTH_SHORT + ) + .setAction(getString(R.string.dismiss), v3 -> { + }) + .show(); }) .show(); return true; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 19c772c6..e4a0879c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -65,4 +65,12 @@ Consider buying me a coffee Override colors manually Tap on the color palette preview to override individual colors; long press to reset + Override + Copy + Color code: %s + Cannot override this color + Dismiss + Custom color reset successfully + Reset all + All colors reset successfully \ No newline at end of file