Merge pull request #474 from wyne/color-options

Enable Color Options
wyne · Jul 29, 2024 · c77f983 · c77f983
2 parents 943d501 + 7f91863
commit c77f983
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 32 deletions.
diff --git a/src/ColorPalette.ts b/src/ColorPalette.ts
@@ -12,47 +12,31 @@ const palettes: PaletteType = {
         '#dc902c',
         '#62516a',
         '#755647',
-        '#925561',
-    ],
-    'c': [
-        '#88498f',
-        '#779fa1',
-        '#e0cba8',
-        '#ff6542',
-        '#564154'
+        '#e9ecef',
+        '#212529',
     ],
-    'd': [
+    'tropical-fiesta': [
         '#f8ffe5',
         '#06d6a0',
         '#1b9aaa',
         '#ef476f',
         '#ffc43d'
     ],
-    'pastel': [
-        '#f9d5e5',
-        '#eeac99',
-        '#e06377',
-        '#c83349',
-        '#5b9aa0',
-        '#d1b59b',
-        '#8f3e3f',
-        '#f6416c',
+    'spring': [
+        '#7bdff2',
+        '#b2f7ef',
+        '#eff7f6',
+        '#f7d6e0',
+        '#f2b5d4'
     ],
-    'dark': [
-        '#fdfffc',
-        '#2ec4b6',
-        '#e71d36',
-        '#ff9f1c',
-        '#f3722c',
-    ],
-    'f': [
+    'autumn': [
         '#fcaa67',
         '#b0413e',
         '#ffffc7',
         '#548687',
         '#473335'
     ],
-    'grey': [
+    'harkonnen': [
         '#f8f9fa',
         '#e9ecef',
         '#dee2e6',
@@ -64,6 +48,35 @@ const palettes: PaletteType = {
         '#212529',
         '#000000',
     ],
+    'electric-orchid': [
+        '#f72585',
+        '#b5179e',
+        '#7209b7',
+        '#560bad',
+        '#480ca8',
+        '#3a0ca3',
+        '#3f37c9',
+        '#4361ee',
+        '#4895ef',
+        '#4cc9f0',
+    ],
+    'autumn-ocean': [
+        '#005f73',
+        '#0a9396',
+        '#94d2bd',
+        '#e9d8a6',
+        '#ee9b00',
+        '#ca6702',
+        '#bb3e03',
+        '#ae2012',
+    ],
+    'sunset-harbor': [
+        '#edae49',
+        '#d1495b',
+        '#00798c',
+        '#30638e',
+        '#003d5b',
+    ]
 };
 
 export const getPalettes = (): string[] => {

diff --git a/src/components/ColorPalettes/PaletteSelector.tsx b/src/components/ColorPalettes/PaletteSelector.tsx
@@ -56,7 +56,7 @@ const styles = StyleSheet.create({
     },
     palette: {
         width: 40,
-        height: 40,
+        height: 42,
         borderWidth: 2,
         borderColor: 'transparent',
         marginHorizontal: 5,

diff --git a/src/screens/AppInfoScreen.tsx b/src/screens/AppInfoScreen.tsx
@@ -97,16 +97,19 @@ const AppInfoScreen: React.FunctionComponent<Props> = ({ navigation }) => {
                     <SectionItemText text="Point Particle Effect" />
                     <Switch onValueChange={toggleParticleSwitch} value={showPointParticles} />
                 </SectionItem>
+                <SectionItem>
+                    <SectionItemText text="Change Colors (Beta*)" />
+                    <Switch onValueChange={toggleColorPalettesSwitch} value={showColorPalettes} />
+                </SectionItem>
+                <SectionItem>
+                    <SectionItemText text="*Beta features may change or be removed without warning." />
+                </SectionItem>
                 {devMenuEnabled && (
                     <>
                         <SectionItem>
                             <SectionItemText text="Player Numbers" />
                             <Switch onValueChange={togglePlayerIndexSwitch} value={showPlayerIndex} />
                         </SectionItem>
-                        <SectionItem>
-                            <SectionItemText text="Change Colors (Beta)" />
-                            <Switch onValueChange={toggleColorPalettesSwitch} value={showColorPalettes} />
-                        </SectionItem>
                     </>
                 )}
             </Section>