Skip to content

Commit

Permalink
Extract string resources
Browse files Browse the repository at this point in the history
  • Loading branch information
Mahmud0808 committed Dec 11, 2023
1 parent 4865419 commit 53edea2
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,12 @@
<string name="buymeacoffee_desc">Consider buying me a coffee</string>
<string name="override_colors_manually_title">Override colors manually</string>
<string name="override_colors_manually_desc">Tap on the color palette preview to override individual colors; long press to reset</string>
<string name="override">Override</string>
<string name="copy">Copy</string>
<string name="color_code">Color code: %s</string>
<string name="cannot_override_color">Cannot override this color</string>
<string name="dismiss">Dismiss</string>
<string name="color_reset_success">Custom color reset successfully</string>
<string name="reset_all">Reset all</string>
<string name="reset_all_success">All colors reset successfully</string>
</resources>

0 comments on commit 53edea2

Please sign in to comment.