Adjust colours after feedback on GitHub.

Rainbow is lighter, and pastel is from colorbrewer2.

Also reordered themes so most likely to be chosen are shown
first.

app/src/main/java/com/nicobrailo/pianoli/Preferences.java

@@ -19,7 +19,7 @@ public class Preferences {
     private final static String PREF_SELECTED_SOUND_SET = "selectedSoundSet";
     private final static String PREF_SELECTED_MELODIES = "selectedMelodies";
     private final static String PREF_ENABLE_MELODIES = "enableMelodies";
-    private static final String DEFAULT_THEME = "boomwhacker";
+    private static final String DEFAULT_THEME = "rainbow";
     private final static String PREF_THEME = "theme";
 
     /**

app/src/main/java/com/nicobrailo/pianoli/Theme.java

@@ -18,11 +18,11 @@ public static Theme fromPreferences(Context context) {
             case "pastel":
                 return PASTEL;
 
-            case "rainbow":
-                return RAINBOW;
+            case "boomwhacker":
+                return BOOMWHACKER;
 
             default:
-                return BOOMWHACKER;
+                return RAINBOW;
         }
     }
 
@@ -45,13 +45,14 @@ public static Theme fromPreferences(Context context) {
 
     private static final Theme PASTEL = new Theme(
             new KeyColour[] {
-                    KeyColour.createLighterWhenPressed(0xffbbcfc4, 0.5f),  // pistache
-                    KeyColour.createLighterWhenPressed(0xffb0a99c, 0.5f),  // beige
-                    KeyColour.createLighterWhenPressed(0xffffd9a6, 0.5f),  // sand
-                    KeyColour.createLighterWhenPressed(0xffce9043, 0.5f),  // dun
-                    KeyColour.createLighterWhenPressed(0xfff6c1ce, 0.5f),  // lightpink
-                    KeyColour.createLighterWhenPressed(0xffe3777e, 0.5f),  // darkpink
-                    KeyColour.createLighterWhenPressed(0xffa65560, 0.5f),  // plum
+                    // https://colorbrewer2.org/#type=qualitative&scheme=Pastel1&n=8
+                    KeyColour.createLighterWhenPressed(0xfffbb4ae, 0.5f),
+                    KeyColour.createLighterWhenPressed(0xffb3cde3, 0.5f),
+                    KeyColour.createLighterWhenPressed(0xffccebc5, 0.5f),
+                    KeyColour.createLighterWhenPressed(0xffdecbe4, 0.5f),
+                    KeyColour.createLighterWhenPressed(0xfffed9a6, 0.5f),
+                    KeyColour.createLighterWhenPressed(0xffffffcc, 0.5f),
+                    KeyColour.createLighterWhenPressed(0xffe5d8bd, 0.5f),
             }
     );
 
@@ -63,7 +64,7 @@ public static Theme fromPreferences(Context context) {
                     KeyColour.createLighterWhenPressed(0xffbde53d, 0.5f), // lightgreen
                     KeyColour.createLighterWhenPressed(0xfffcc000, 0.5f), // yellow
                     KeyColour.createLighterWhenPressed(0xffff810a, 0.5f), // lightorange
-                    KeyColour.createLighterWhenPressed(0xffff7416, 0.5f), // darkorange
+                    KeyColour.createLighterWhenPressed(0xffff5616, 0.5f), // darkorange
                     KeyColour.createLighterWhenPressed(0xffd51016, 0.5f), // red
             }
     );

app/src/main/res/values/donottranslate.xml

@@ -17,16 +17,16 @@
     </string-array>
 
     <string-array name="theme_entryValues">
-        <item>boomwhacker</item>
-        <item>black_and_white</item>
-        <item>pastel</item>
         <item>rainbow</item>
+        <item>pastel</item>
+        <item>black_and_white</item>
+        <item>boomwhacker</item>
     </string-array>
 
     <string-array name="theme_entries">
-        <item>@string/theme_boomwhacker</item>
-        <item>@string/theme_black_and_white</item>
-        <item>@string/theme_pastel</item>
         <item>@string/theme_rainbow</item>
+        <item>@string/theme_pastel</item>
+        <item>@string/theme_black_and_white</item>
+        <item>@string/theme_boomwhacker</item>
     </string-array>
 </resources>