wip

meikpiep · Jan 26, 2025 · 07902a7 · 07902a7
1 parent 97af7cf
commit 07902a7
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 0 deletions.
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/ActivityUtils.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/ActivityUtils.kt
@@ -38,6 +38,9 @@ class ActivityUtils : KoinComponent {
             Theme.DYNAMIC_COLORS -> {
                 activity.setTheme(com.google.android.material.R.style.Theme_Material3_DynamicColors_DayNight_NoActionBar)
             }
+            Theme.MONOCHROME -> {
+                activity.setTheme(R.style.AppThemeMonochrome)
+            }
         }
 
         when (applicationPreferences.nightMode) {

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/grid/GridUI.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/grid/GridUI.kt
@@ -7,6 +7,7 @@ import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnTouchListener
+import com.google.android.material.color.MaterialColors
 import org.koin.core.component.KoinComponent
 import org.piepmeyer.gauguin.R
 import org.piepmeyer.gauguin.grid.Grid

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/ThemeChooserFragment.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/ThemeChooserFragment.kt
@@ -65,6 +65,11 @@ class ThemeChooserFragment(
             binding.themeDynamicColors.visibility = View.GONE
         }
 
+        binding.themeMonochrome.isChecked = preferences.theme == Theme.MONOCHROME
+        binding.themeMonochrome.setOnClickListener {
+            configureTheme(Theme.MONOCHROME)
+        }
+
         return binding.root
     }
 

diff --git a/gauguin-app/src/main/res/drawable/monochrome_photos_24px.xml b/gauguin-app/src/main/res/drawable/monochrome_photos_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,700Q555,700 607.5,647.5Q660,595 660,520Q660,445 607.5,392.5Q555,340 480,340Q405,340 352.5,392.5Q300,445 300,520Q300,595 352.5,647.5Q405,700 480,700ZM480,620Q438,620 409,591Q380,562 380,520Q380,478 409,449Q438,420 480,420Q522,420 551,449Q580,478 580,520Q580,562 551,591Q522,620 480,620ZM160,840Q127,840 103.5,816.5Q80,793 80,760L80,280Q80,247 103.5,223.5Q127,200 160,200L286,200L360,120L600,120L674,200L800,200Q833,200 856.5,223.5Q880,247 880,280L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM480,760L800,760Q800,760 800,760Q800,760 800,760L800,280Q800,280 800,280Q800,280 800,280L638,280L565,200L480,200L480,760Z"/>
+</vector>
diff --git a/gauguin-app/src/main/res/layout/fragment_theme_chooser.xml b/gauguin-app/src/main/res/layout/fragment_theme_chooser.xml
@@ -82,6 +82,12 @@
             style="@style/VerticalButtonGroupButton"
             android:text="@string/setting_theme_entry_dynamic_colors"
             />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/themeMonochrome"
+            style="@style/VerticalButtonGroupButton"
+            app:icon="@drawable/monochrome_photos_24px"
+            android:text="Monochrome"
+            />
     </com.google.android.material.button.MaterialButtonToggleGroup>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/gauguin-app/src/main/res/values/themes.xml b/gauguin-app/src/main/res/values/themes.xml
@@ -58,4 +58,64 @@
         <item name="colorGridSelectedText">@color/md_theme_light_onSecondary</item>
         <item name="colorGridCage">#512f36</item>
   </style>
+
+  <style name="AppThemeMonochrome" parent="Theme.Material3.DayNight.NoActionBar">
+    <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle</item>
+    <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
+    <item name="android:windowActivityTransitions">true</item>
+
+    <item name="android:windowSharedElementEnterTransition">
+      @transition/change_image_transform</item>
+    <item name="android:windowSharedElementExitTransition">
+      @transition/change_image_transform</item>
+
+    <item name="colorPrimary">@color/md_theme_monochrome_primary</item>
+    <item name="colorOnPrimary">@color/md_theme_monochrome_onPrimary</item>
+    <item name="colorPrimaryContainer">@color/md_theme_monochrome_primaryContainer</item>
+    <item name="colorOnPrimaryContainer">@color/md_theme_monochrome_onPrimaryContainer</item>
+    <item name="colorSecondary">@color/md_theme_monochrome_secondary</item>
+    <item name="colorOnSecondary">@color/md_theme_monochrome_onSecondary</item>
+    <item name="colorSecondaryContainer">@color/md_theme_monochrome_secondaryContainer</item>
+    <item name="colorOnSecondaryContainer">@color/md_theme_monochrome_onSecondaryContainer</item>
+    <item name="colorTertiary">@color/md_theme_monochrome_tertiary</item>
+    <item name="colorOnTertiary">@color/md_theme_monochrome_onTertiary</item>
+    <item name="colorTertiaryContainer">@color/md_theme_monochrome_tertiaryContainer</item>
+    <item name="colorOnTertiaryContainer">@color/md_theme_monochrome_onTertiaryContainer</item>
+    <item name="colorError">@color/md_theme_monochrome_error</item>
+    <item name="colorErrorContainer">@color/md_theme_monochrome_errorContainer</item>
+    <item name="colorOnError">@color/md_theme_monochrome_onError</item>
+    <item name="colorOnErrorContainer">@color/md_theme_monochrome_onErrorContainer</item>
+    <item name="android:colorBackground">@color/md_theme_monochrome_background</item>
+    <item name="colorOnBackground">@color/md_theme_monochrome_onBackground</item>
+    <item name="colorSurface">@color/md_theme_monochrome_surface</item>
+    <item name="colorOnSurface">@color/md_theme_monochrome_onSurface</item>
+    <item name="colorSurfaceVariant">@color/md_theme_monochrome_surfaceVariant</item>
+    <item name="colorOnSurfaceVariant">@color/md_theme_monochrome_onSurfaceVariant</item>
+    <item name="colorOutline">@color/md_theme_monochrome_outline</item>
+    <item name="colorOnSurfaceInverse">@color/md_theme_monochrome_inverseOnSurface</item>
+    <item name="colorSurfaceInverse">@color/md_theme_monochrome_inverseSurface</item>
+    <item name="colorCustomColor1">#705d00</item>
+    <item name="colorOnCustomColor1">#ffffff</item>
+    <item name="colorCustomColor1Container">#EEEEEE</item>
+    <item name="colorOnCustomColor1Container">#221b00</item>
+    <item name="harmonizeCustomColor1">false</item>
+    <item name="colorCustomColor2">#9c4140</item>
+    <item name="colorOnCustomColor2">#ffffff</item>
+    <item name="colorCustomColor2Container">#ffdad8</item>
+    <item name="colorOnCustomColor2Container">#410006</item>
+    <item name="harmonizeCustomColor2">false</item>
+    <item name="colorPrimaryInverse">@color/md_theme_monochrome_inversePrimary</item>
+    <item name="colorMainFabForeground">@color/md_theme_monochrome_secondary</item>
+    <item name="colorMainFabBackground">@color/md_theme_monochrome_onSecondary</item>
+    <item name="colorMainTopPanelForeground">@color/md_theme_monochrome_onTertiary</item>
+    <item name="colorMainTopPanelBackground">@color/md_theme_monochrome_tertiary</item>
+    <item name="colorMainHintPopupSuccessForeground">@color/md_theme_monochrome_popup_onSuccess</item>
+    <item name="colorMainHintPopupSuccessBackground">@color/md_theme_monochrome_popup_success</item>
+    <item name="colorMainHintPopupErrorsForeground">@color/md_theme_monochrome_popup_onError</item>
+    <item name="colorMainHintPopupErrorsBackground">@color/md_theme_monochrome_popup_error</item>
+    <item name="colorGridSelected">@color/md_theme_monochrome_grid_selected</item>
+    <item name="colorGridSelectedText">@color/md_theme_monochrome_grid_selected_text</item>
+    <item name="colorGridCage">@color/md_theme_monochrome_grid_cage</item>
+
+  </style>
 </resources>
diff --git a/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/Theme.kt b/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/Theme.kt
@@ -3,4 +3,5 @@ package org.piepmeyer.gauguin
 enum class Theme {
     GAUGUIN,
     DYNAMIC_COLORS,
+    MONOCHROME,
 }