Implement dynamic material3 colors

This commit is contained in:
pavelb 2024-02-15 22:56:09 +01:00
parent efe4c78cdb
commit 5c6a220f1a
8 changed files with 148 additions and 10 deletions

View File

@ -3,7 +3,32 @@
<component name="deploymentTargetDropDown"> <component name="deploymentTargetDropDown">
<value> <value>
<entry key="app"> <entry key="app">
<State /> <State>
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$USER_HOME$/.android/avd/Pixel_3a_API_34_extension_level_7_x86_64.avd" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-02-15T16:39:47.619974727Z" />
<multipleDevicesSelectedInDropDown value="true" />
<runningDeviceTargetsSelectedWithDialog>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$USER_HOME$/.android/avd/Pixel_3a_API_34_extension_level_7_x86_64.avd" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetsSelectedWithDialog>
</State>
</entry> </entry>
</value> </value>
</component> </component>

View File

@ -1,5 +1,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@android:color/white" /> <solid android:color="@android:color/transparent" />
<stroke android:width="1dip" android:color="#4fa5d5"/>
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>

View File

@ -9,7 +9,6 @@
android:id="@+id/titleTextView" android:id="@+id/titleTextView"
android:layout_width="409dp" android:layout_width="409dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:gravity="center" android:gravity="center"
android:text="@string/app_name" android:text="@string/app_name"
@ -33,14 +32,17 @@
<TextView <TextView
android:id="@+id/passwordTextView" android:id="@+id/passwordTextView"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginHorizontal="10dp"
android:gravity="center" android:gravity="center"
android:padding="16dp" android:padding="16dp"
android:text="" android:text=""
android:background="@drawable/password_background"
android:textSize="24sp" android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iconImageView" /> app:layout_constraintTop_toBottomOf="@id/iconImageView" />
@ -50,7 +52,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="72dp" android:layout_marginStart="72dp"
android:layout_marginBottom="96dp" android:layout_marginBottom="76dp"
android:text="@string/textview_password_length" android:text="@string/textview_password_length"
app:layout_constraintBottom_toTopOf="@id/switchWithoutSpaces" app:layout_constraintBottom_toTopOf="@id/switchWithoutSpaces"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@ -63,9 +65,10 @@
android:layout_marginEnd="72dp" android:layout_marginEnd="72dp"
app:layout_constraintBottom_toTopOf="@+id/switchWithoutSpaces" app:layout_constraintBottom_toTopOf="@+id/switchWithoutSpaces"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/passwordLengthLabel" app:layout_constraintStart_toEndOf="@+id/passwordLengthLabel"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.953" /> app:layout_constraintVertical_bias="1.0" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchWithoutSpaces" android:id="@+id/switchWithoutSpaces"
@ -80,6 +83,7 @@
android:id="@+id/switchSpecialChars" android:id="@+id/switchSpecialChars"
android:layout_width="267dp" android:layout_width="267dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginBottom="36dp"
android:text="@string/switch_special_characters" android:text="@string/switch_special_characters"
app:layout_constraintBottom_toTopOf="@id/generateButton" app:layout_constraintBottom_toTopOf="@id/generateButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -89,7 +93,7 @@
android:id="@+id/generateButton" android:id="@+id/generateButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="64dp" android:layout_marginBottom="44dp"
android:text="@string/generate_button_text" android:text="@string/generate_button_text"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View File

@ -1,5 +1,37 @@
<resources> <resources>
<style name="Theme.PasswordZebra" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Theme.PasswordZebra" parent="Theme.Material3.DayNight">
<!-- <style name="Theme.PasswordZebra" parent="Theme.Material3.DayNight.NoActionBar"> -->
<item name="android:actionBarStyle">@android:color/transparent</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
</style> </style>
</resources> </resources>

View File

@ -11,4 +11,67 @@
<color name="overlay_light_onPrimary">#FFFFFF</color> <color name="overlay_light_onPrimary">#FFFFFF</color>
<color name="overlay_light_primaryContainer">#FFDADB</color> <color name="overlay_light_primaryContainer">#FFDADB</color>
<color name="overlay_light_onPrimaryContainer">#400008</color> <color name="overlay_light_onPrimaryContainer">#400008</color>
<color name="seed">#1B5E20</color>
<color name="md_theme_light_primary">#286C2A</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#ABF5A3</color>
<color name="md_theme_light_onPrimaryContainer">#002203</color>
<color name="md_theme_light_secondary">#00639A</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#CEE5FF</color>
<color name="md_theme_light_onSecondaryContainer">#001D32</color>
<color name="md_theme_light_tertiary">#38656A</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#BCEBF0</color>
<color name="md_theme_light_onTertiaryContainer">#002023</color>
<color name="md_theme_light_error">#BA1A1A</color>
<color name="md_theme_light_errorContainer">#FFDAD6</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_onErrorContainer">#410002</color>
<color name="md_theme_light_background">#FCFDF6</color>
<color name="md_theme_light_onBackground">#1A1C19</color>
<color name="md_theme_light_surface">#FCFDF6</color>
<color name="md_theme_light_onSurface">#1A1C19</color>
<color name="md_theme_light_surfaceVariant">#DEE5D8</color>
<color name="md_theme_light_onSurfaceVariant">#424940</color>
<color name="md_theme_light_outline">#72796F</color>
<color name="md_theme_light_inverseOnSurface">#F1F1EB</color>
<color name="md_theme_light_inverseSurface">#2F312D</color>
<color name="md_theme_light_inversePrimary">#90D889</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#286C2A</color>
<color name="md_theme_light_outlineVariant">#C2C9BD</color>
<color name="md_theme_light_scrim">#000000</color>
<color name="md_theme_dark_primary">#90D889</color>
<color name="md_theme_dark_onPrimary">#003909</color>
<color name="md_theme_dark_primaryContainer">#085314</color>
<color name="md_theme_dark_onPrimaryContainer">#ABF5A3</color>
<color name="md_theme_dark_secondary">#96CCFF</color>
<color name="md_theme_dark_onSecondary">#003353</color>
<color name="md_theme_dark_secondaryContainer">#004A75</color>
<color name="md_theme_dark_onSecondaryContainer">#CEE5FF</color>
<color name="md_theme_dark_tertiary">#A0CFD4</color>
<color name="md_theme_dark_onTertiary">#00363B</color>
<color name="md_theme_dark_tertiaryContainer">#1E4D52</color>
<color name="md_theme_dark_onTertiaryContainer">#BCEBF0</color>
<color name="md_theme_dark_error">#FFB4AB</color>
<color name="md_theme_dark_errorContainer">#93000A</color>
<color name="md_theme_dark_onError">#690005</color>
<color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
<color name="md_theme_dark_background">#1A1C19</color>
<color name="md_theme_dark_onBackground">#E2E3DD</color>
<color name="md_theme_dark_surface">#1A1C19</color>
<color name="md_theme_dark_onSurface">#E2E3DD</color>
<color name="md_theme_dark_surfaceVariant">#424940</color>
<color name="md_theme_dark_onSurfaceVariant">#C2C9BD</color>
<color name="md_theme_dark_outline">#8C9388</color>
<color name="md_theme_dark_inverseOnSurface">#1A1C19</color>
<color name="md_theme_dark_inverseSurface">#E2E3DD</color>
<color name="md_theme_dark_inversePrimary">#286C2A</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_surfaceTint">#90D889</color>
<color name="md_theme_dark_outlineVariant">#424940</color>
<color name="md_theme_dark_scrim">#000000</color>
</resources> </resources>

View File

@ -1,5 +1,19 @@
<resources> <resources>
<style name="Theme.PasswordZebra" parent="Theme.Material3.Light.NoActionBar"> <style name="Theme.PasswordZebra" parent="Theme.Material3.Light">
<!-- <style name="Theme.PasswordZebra" parent="Theme.Material3.Light.NoActionBar"> -->
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:windowTranslucentStatus">false</item>
<item name="android:actionBarStyle">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:windowTranslucentNavigation">false</item>
</style> </style>
</resources> </resources>

View File

@ -1,5 +1,4 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppTheme.Overlay" parent="ThemeOverlay.Material3.DynamicColors.DayNight"> <style name="AppTheme.Overlay" parent="ThemeOverlay.Material3.DynamicColors.DayNight">
<item name="iconColor">@android:color/system_accent2_600</item>
</style> </style>
</resources> </resources>