plectrum

commit 6e75c9b37fe262be3f7dc8b494eb7de28a0f4653
parent 7936f9b80182d24e0819232533eade96b27d0b83
Author: gstraube <gstraube@mailbox.org>
Date:   Mon,  5 Feb 2018 18:27:12 +0100

Rename night mode to dark mode

Diffstat:
M
app/src/main/java/com/github/cythara/CanvasPainter.java
 | 
2
+-
M
app/src/main/java/com/github/cythara/MainActivity.java
 | 
20
++++++++++----------
M
app/src/main/res/menu/toolbar_menu.xml
 | 
4
++--
M
app/src/main/res/values-pt-rBR/strings.xml
 | 
2
+-
M
app/src/main/res/values/strings.xml
 | 
2
+-

5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/github/cythara/CanvasPainter.java b/app/src/main/java/com/github/cythara/CanvasPainter.java
@@ -62,7 +62,7 @@ class CanvasPainter {
 
         redBackground = R.color.red_light;
         greenBackground = R.color.green_light;
-        if (MainActivity.isNightModeEnabled()) {
+        if (MainActivity.isDarkModeEnabled()) {
             int color = context.getResources().getColor(R.color.colorPrimaryDark);
             this.canvas.drawColor(color);
 
diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java
@@ -36,16 +36,16 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
     public static final String USE_SCIENTIFIC_NOTATION = "use_scientific_notation";
     public static final String CURRENT_TUNING = "current_tuning";
     private static final String TAG_LISTENER_FRAGMENT = "listener_fragment";
-    private static final String USE_NIGHT_MODE = "use_night_mode";
+    private static final String USE_DARK_MODE = "use_dark_mode";
     private static int tuningPosition = 0;
-    private static boolean isNightModeEnabled;
+    private static boolean isDarkModeEnabled;
 
     public static Tuning getCurrentTuning() {
         return getTuningFromPosition(tuningPosition);
     }
 
-    public static boolean isNightModeEnabled() {
-        return isNightModeEnabled;
+    public static boolean isDarkModeEnabled() {
+        return isDarkModeEnabled;
     }
 
     @Override
@@ -117,13 +117,13 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
 
                 break;
             }
-            case R.id.toggle_night_mode: {
+            case R.id.toggle_dark_mode: {
                 final SharedPreferences preferences = getSharedPreferences(PREFS_FILE,
                         MODE_PRIVATE);
-                boolean currentlyUsingNightMode = preferences.getBoolean(USE_NIGHT_MODE, false);
+                boolean currentlyUsingDarkMode = preferences.getBoolean(USE_DARK_MODE, false);
 
                 SharedPreferences.Editor editor = preferences.edit();
-                editor.putBoolean(USE_NIGHT_MODE, !currentlyUsingNightMode);
+                editor.putBoolean(USE_DARK_MODE, !currentlyUsingDarkMode);
                 editor.apply();
 
                 recreate();
@@ -212,7 +212,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
         MaterialSpinnerAdapter<String> adapter = new MaterialSpinnerAdapter<>(this,
                 Arrays.asList(getResources().getStringArray(R.array.tunings)));
 
-        if (isNightModeEnabled) {
+        if (isDarkModeEnabled) {
             spinner.setTextColor(textColorDark);
             spinner.setBackgroundColor(getResources().getColor(R.color.colorPrimaryDark));
             spinner.setTextColor(textColorDark);
@@ -227,10 +227,10 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
     private void enableTheme() {
         final SharedPreferences preferences = getSharedPreferences(PREFS_FILE,
                 MODE_PRIVATE);
-        isNightModeEnabled = preferences.getBoolean(USE_NIGHT_MODE, false);
+        isDarkModeEnabled = preferences.getBoolean(USE_DARK_MODE, false);
 
         int mode = AppCompatDelegate.MODE_NIGHT_NO;
-        if (isNightModeEnabled) {
+        if (isDarkModeEnabled) {
             mode = AppCompatDelegate.MODE_NIGHT_YES;
         }
 
diff --git a/app/src/main/res/menu/toolbar_menu.xml b/app/src/main/res/menu/toolbar_menu.xml
@@ -13,7 +13,7 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggle_night_mode"
-        android:title="@string/toggle_night_mode"
+        android:id="@+id/toggle_dark_mode"
+        android:title="@string/toggle_dark_mode"
         app:showAsAction="never" />
 </menu>
 \ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -20,5 +20,5 @@
         <item name="scientific">Notação de pitch científico</item>
         <item name="sol">Solfège</item>
     </string-array>
-    <string name="toggle_night_mode">Alternar modo noturno</string>
+    <string name="toggle_dark_mode">Alternar modo escuro</string>
 </resources>
 \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Cythara</string>
     <string name="privacy_policy">Show privacy policy</string>
     <string name="set_notation">Set notation</string>
-    <string name="toggle_night_mode">Toggle night mode</string>
+    <string name="toggle_dark_mode">Toggle dark mode</string>
     <string name="choose_notation">Choose notation</string>
     <string name="permission_required">Permission required</string>
     <string-array name="tunings">