Migrate design system to Material You

CHANGELOG.md

@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file.
 -   Encrypted data is no longer ASCII armored, bringing it in line with `pass`
 -   Removed Bromite from supported Autofill browsers, since they [disable Android autofill](https://github.com/bromite/bromite/blob/master/FAQ.md#does-bromite-support-the-android-autofill-framework).
 -   Changing password generator parameters now automatically updates the password without needing to press the 'Generate' button again
+-   The app UI was reskinned to match Google's Material You guidelines
 
 ## [1.13.5] - 2021-07-28
 

app/build.gradle.kts

@@ -92,6 +92,7 @@ dependencies {
   implementation(libs.compose.foundation.core)
   implementation(libs.compose.foundation.layout)
   implementation(libs.compose.material)
+  implementation(libs.compose.material3)
   implementation(libs.compose.ui.core)
   implementation(libs.compose.ui.viewbinding)
   compileOnly(libs.compose.ui.tooling)

app/src/main/AndroidManifest.xml

@@ -28,13 +28,12 @@
     android:label="@string/app_name"
     android:requestLegacyExternalStorage="true"
     android:supportsRtl="true"
-    android:theme="@style/AppTheme"
+    android:theme="@style/AppThemeM3"
     tools:ignore="GoogleAppIndexingWarning">
 
     <activity
       android:name=".ui.passwords.PasswordStore"
-      android:configChanges="orientation|screenSize"
-      android:label="@string/app_name" />
+      android:configChanges="orientation|screenSize" />
 
     <activity
       android:name=".ui.onboarding.activity.OnboardingActivity"
@@ -51,8 +50,8 @@
     <activity
       android:name=".ui.main.LaunchActivity"
       android:configChanges="orientation|screenSize"
-      android:label="@string/app_name"
-      android:theme="@style/NoBackgroundTheme">
+      android:exported="true"
+      android:theme="@style/NoBackgroundThemeM3">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
@@ -88,14 +87,15 @@
 
     <activity
       android:name=".ui.settings.DirectorySelectionActivity"
-      android:theme="@style/NoBackgroundTheme" />
+      android:theme="@style/NoBackgroundThemeM3" />
 
     <activity
       android:name=".ui.crypto.PasswordCreationActivity"
       android:label="@string/new_password_title"
       android:windowSoftInputMode="adjustResize" />
 
-    <activity android:name=".ui.crypto.PasswordCreationActivityV2"
+    <activity
+      android:name=".ui.crypto.PasswordCreationActivityV2"
       android:label="@string/new_password_title"
       android:windowSoftInputMode="adjustResize" />
 
@@ -105,7 +105,7 @@
 
     <activity
       android:name=".ui.crypto.GetKeyIdsActivity"
-      android:theme="@style/NoBackgroundTheme" />
+      android:theme="@style/NoBackgroundThemeM3" />
 
     <service
       android:name=".util.services.ClipboardService"
@@ -115,6 +115,7 @@
       android:process=":password_export_service_process" />
     <service
       android:name=".util.services.OreoAutofillService"
+      android:exported="true"
       android:permission="android.permission.BIND_AUTOFILL_SERVICE">
       <intent-filter>
         <action android:name="android.service.autofill.AutofillService" />
@@ -127,35 +128,35 @@
     <activity android:name=".ui.folderselect.SelectFolderActivity" />
     <activity
       android:name=".ui.sshkeygen.SshKeyImportActivity"
-      android:theme="@style/NoBackgroundTheme"
+      android:theme="@style/NoBackgroundThemeM3"
       android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".ui.sshkeygen.SshKeyGenActivity"
       android:label="@string/pref_ssh_keygen_title"
       android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".ui.autofill.AutofillDecryptActivity"
-      android:theme="@style/NoBackgroundTheme" />
+      android:theme="@style/NoBackgroundThemeM3" />
     <activity
       android:name=".ui.autofill.AutofillDecryptActivityV2"
-      android:theme="@style/NoBackgroundTheme" />
+      android:theme="@style/NoBackgroundThemeM3" />
     <activity
       android:name=".ui.autofill.AutofillFilterView"
       android:configChanges="orientation|keyboardHidden"
-      android:theme="@style/DialogLikeTheme"
+      android:theme="@style/DialogLikeThemeM3"
       android:windowSoftInputMode="adjustNothing" />
     <activity
       android:name=".ui.autofill.AutofillSaveActivity"
-      android:theme="@style/NoBackgroundTheme" />
+      android:theme="@style/NoBackgroundThemeM3" />
     <activity
       android:name=".autofill.oreo.ui.AutofillSmsActivity"
       android:configChanges="orientation"
-      android:theme="@style/DialogLikeTheme"
+      android:theme="@style/DialogLikeThemeM3"
       android:windowSoftInputMode="adjustNothing" />
     <activity
       android:name=".ui.autofill.AutofillPublisherChangedActivity"
       android:configChanges="orientation|keyboardHidden"
-      android:theme="@style/DialogLikeTheme"
+      android:theme="@style/DialogLikeThemeM3"
       android:windowSoftInputMode="adjustNothing" />
   </application>
 

app/src/main/java/dev/msfjarvis/aps/Application.kt

@@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
+import com.google.android.material.color.DynamicColors
 import dagger.hilt.android.HiltAndroidApp
 import dev.msfjarvis.aps.injection.context.FilesDirPath
 import dev.msfjarvis.aps.injection.prefs.SettingsPreferences
@@ -49,6 +50,7 @@ class Application : android.app.Application(), SharedPreferences.OnSharedPrefere
     setUpBouncyCastleForSshj()
     runMigrations(filesDirPath, prefs, gitSettings)
     proxyUtils.setDefaultProxy()
+    DynamicColors.applyToActivitiesIfAvailable(this)
   }
 
   override fun onTerminate() {

app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt

@@ -4,7 +4,6 @@
  */
 package dev.msfjarvis.aps.ui.dialogs
 
-import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -21,7 +20,6 @@ import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_FOLDER
 import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_KEY
 import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_PASSWORD
 import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ITEM_CREATION_REQUEST_KEY
-import dev.msfjarvis.aps.util.extensions.resolveAttribute
 
 class ItemCreationBottomSheet : BottomSheetDialogFragment() {
 
@@ -70,11 +68,6 @@ class ItemCreationBottomSheet : BottomSheetDialogFragment() {
         }
       }
     )
-    val gradientDrawable =
-      GradientDrawable().apply {
-        setColor(requireContext().resolveAttribute(android.R.attr.windowBackground))
-      }
-    view.background = gradientDrawable
   }
 
   override fun dismiss() {

app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt

@@ -65,7 +65,11 @@ class GitServerConfigActivity : BaseGitActivity() {
         AuthMode.OpenKeychain -> check(binding.authModeOpenKeychain.id)
         AuthMode.None -> check(View.NO_ID)
       }
-      setOnCheckedChangeListener { _, checkedId ->
+      addOnButtonCheckedListener { _, checkedId, isChecked ->
+        if (!isChecked) {
+          newAuthMode = AuthMode.None
+          return@addOnButtonCheckedListener
+        }
         when (checkedId) {
           binding.authModeSshKey.id -> newAuthMode = AuthMode.SshKey
           binding.authModeOpenKeychain.id -> newAuthMode = AuthMode.OpenKeychain
@@ -213,12 +217,12 @@ class GitServerConfigActivity : BaseGitActivity() {
         authModeSshKey.isVisible = false
         authModeOpenKeychain.isVisible = false
         authModePassword.isVisible = true
-        if (authModeGroup.checkedChipId != authModePassword.id) authModeGroup.check(View.NO_ID)
+        if (authModeGroup.checkedButtonId != authModePassword.id) authModeGroup.check(View.NO_ID)
       } else {
         authModeSshKey.isVisible = true
         authModeOpenKeychain.isVisible = true
         authModePassword.isVisible = true
-        if (authModeGroup.checkedChipId == View.NO_ID) authModeGroup.check(authModeSshKey.id)
+        if (authModeGroup.checkedButtonId == View.NO_ID) authModeGroup.check(authModeSshKey.id)
       }
     }
 

app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt

@@ -17,7 +17,6 @@ import dev.msfjarvis.aps.util.extensions.performTransactionWithBackStack
 import dev.msfjarvis.aps.util.extensions.viewBinding
 
 @Keep
-@Suppress("unused")
 class WelcomeFragment : Fragment(R.layout.fragment_welcome) {
 
   private val binding by viewBinding(FragmentWelcomeBinding::bind)

app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt

@@ -216,7 +216,7 @@ class PasswordStore : BaseGitActivity() {
 
     model.currentDir.observe(this) { dir ->
       val basePath = PasswordRepository.getRepositoryDirectory().absoluteFile
-      supportActionBar!!.apply {
+      supportActionBar?.apply {
         if (dir != basePath) title = dir.name else setTitle(R.string.app_name)
       }
     }
@@ -611,7 +611,7 @@ class PasswordStore : BaseGitActivity() {
       model.forceRefresh()
     } else {
       model.reset()
-      supportActionBar!!.setDisplayHomeAsUpEnabled(false)
+      supportActionBar?.setDisplayHomeAsUpEnabled(false)
     }
   }
 

app/src/main/java/dev/msfjarvis/aps/ui/theme/Color.kt

@@ -0,0 +1,58 @@
+package dev.msfjarvis.aps.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val md_theme_light_primary = Color(0xFF006591)
+val md_theme_light_onPrimary = Color(0xFFffffff)
+val md_theme_light_primaryContainer = Color(0xFFc7e6ff)
+val md_theme_light_onPrimaryContainer = Color(0xFF001e30)
+val md_theme_light_secondary = Color(0xFF4f606e)
+val md_theme_light_onSecondary = Color(0xFFffffff)
+val md_theme_light_secondaryContainer = Color(0xFFd3e5f5)
+val md_theme_light_onSecondaryContainer = Color(0xFF0b1d29)
+val md_theme_light_tertiary = Color(0xFF006494)
+val md_theme_light_onTertiary = Color(0xFFffffff)
+val md_theme_light_tertiaryContainer = Color(0xFFc8e6ff)
+val md_theme_light_onTertiaryContainer = Color(0xFF001e31)
+val md_theme_light_error = Color(0xFFba1b1b)
+val md_theme_light_errorContainer = Color(0xFFffdad4)
+val md_theme_light_onError = Color(0xFFffffff)
+val md_theme_light_onErrorContainer = Color(0xFF410001)
+val md_theme_light_background = Color(0xFFfcfcff)
+val md_theme_light_onBackground = Color(0xFF1a1c1e)
+val md_theme_light_surface = Color(0xFFfcfcff)
+val md_theme_light_onSurface = Color(0xFF1a1c1e)
+val md_theme_light_surfaceVariant = Color(0xFFdde3ea)
+val md_theme_light_onSurfaceVariant = Color(0xFF41474d)
+val md_theme_light_outline = Color(0xFF72787e)
+val md_theme_light_inverseOnSurface = Color(0xFFf0f0f3)
+val md_theme_light_inverseSurface = Color(0xFF2e3133)
+
+val md_theme_dark_primary = Color(0xFF85ceff)
+val md_theme_dark_onPrimary = Color(0xFF00344e)
+val md_theme_dark_primaryContainer = Color(0xFF004c6f)
+val md_theme_dark_onPrimaryContainer = Color(0xFFc7e6ff)
+val md_theme_dark_secondary = Color(0xFFb7c9d9)
+val md_theme_dark_onSecondary = Color(0xFF21323e)
+val md_theme_dark_secondaryContainer = Color(0xFF384956)
+val md_theme_dark_onSecondaryContainer = Color(0xFFd3e5f5)
+val md_theme_dark_tertiary = Color(0xFF8aceff)
+val md_theme_dark_onTertiary = Color(0xFF003450)
+val md_theme_dark_tertiaryContainer = Color(0xFF004b70)
+val md_theme_dark_onTertiaryContainer = Color(0xFFc8e6ff)
+val md_theme_dark_error = Color(0xFFffb4a9)
+val md_theme_dark_errorContainer = Color(0xFF930006)
+val md_theme_dark_onError = Color(0xFF680003)
+val md_theme_dark_onErrorContainer = Color(0xFFffdad4)
+val md_theme_dark_background = Color(0xFF1a1c1e)
+val md_theme_dark_onBackground = Color(0xFFe1e2e5)
+val md_theme_dark_surface = Color(0xFF1a1c1e)
+val md_theme_dark_onSurface = Color(0xFFe1e2e5)
+val md_theme_dark_surfaceVariant = Color(0xFF41474d)
+val md_theme_dark_onSurfaceVariant = Color(0xFFc1c7ce)
+val md_theme_dark_outline = Color(0xFF8b9197)
+val md_theme_dark_inverseOnSurface = Color(0xFF1a1c1e)
+val md_theme_dark_inverseSurface = Color(0xFFe1e2e5)
+
+val seed = Color(0xFF003e5b)
+val error = Color(0xFFba1b1b)

app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt

@@ -0,0 +1,83 @@
+package dev.msfjarvis.aps.ui.theme
+
+import android.content.Context
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+
+private val LightThemeColors =
+  lightColorScheme(
+    primary = md_theme_light_primary,
+    onPrimary = md_theme_light_onPrimary,
+    primaryContainer = md_theme_light_primaryContainer,
+    onPrimaryContainer = md_theme_light_onPrimaryContainer,
+    secondary = md_theme_light_secondary,
+    onSecondary = md_theme_light_onSecondary,
+    secondaryContainer = md_theme_light_secondaryContainer,
+    onSecondaryContainer = md_theme_light_onSecondaryContainer,
+    tertiary = md_theme_light_tertiary,
+    onTertiary = md_theme_light_onTertiary,
+    tertiaryContainer = md_theme_light_tertiaryContainer,
+    onTertiaryContainer = md_theme_light_onTertiaryContainer,
+    error = md_theme_light_error,
+    errorContainer = md_theme_light_errorContainer,
+    onError = md_theme_light_onError,
+    onErrorContainer = md_theme_light_onErrorContainer,
+    background = md_theme_light_background,
+    onBackground = md_theme_light_onBackground,
+    surface = md_theme_light_surface,
+    onSurface = md_theme_light_onSurface,
+    surfaceVariant = md_theme_light_surfaceVariant,
+    onSurfaceVariant = md_theme_light_onSurfaceVariant,
+    outline = md_theme_light_outline,
+    inverseOnSurface = md_theme_light_inverseOnSurface,
+    inverseSurface = md_theme_light_inverseSurface,
+  )
+private val DarkThemeColors =
+  darkColorScheme(
+    primary = md_theme_dark_primary,
+    onPrimary = md_theme_dark_onPrimary,
+    primaryContainer = md_theme_dark_primaryContainer,
+    onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+    secondary = md_theme_dark_secondary,
+    onSecondary = md_theme_dark_onSecondary,
+    secondaryContainer = md_theme_dark_secondaryContainer,
+    onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+    tertiary = md_theme_dark_tertiary,
+    onTertiary = md_theme_dark_onTertiary,
+    tertiaryContainer = md_theme_dark_tertiaryContainer,
+    onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+    error = md_theme_dark_error,
+    errorContainer = md_theme_dark_errorContainer,
+    onError = md_theme_dark_onError,
+    onErrorContainer = md_theme_dark_onErrorContainer,
+    background = md_theme_dark_background,
+    onBackground = md_theme_dark_onBackground,
+    surface = md_theme_dark_surface,
+    onSurface = md_theme_dark_onSurface,
+    surfaceVariant = md_theme_dark_surfaceVariant,
+    onSurfaceVariant = md_theme_dark_onSurfaceVariant,
+    outline = md_theme_dark_outline,
+    inverseOnSurface = md_theme_dark_inverseOnSurface,
+    inverseSurface = md_theme_dark_inverseSurface,
+  )
+
+@Composable
+fun APSTheme(
+  useDynamicColors: Boolean = true,
+  useDarkTheme: Boolean = isSystemInDarkTheme(),
+  context: Context,
+  content: @Composable () -> Unit,
+) {
+  val colors =
+    when (useDarkTheme) {
+      true -> if (useDynamicColors) dynamicDarkColorScheme(context) else DarkThemeColors
+      false -> if (useDynamicColors) dynamicLightColorScheme(context) else LightThemeColors
+    }
+
+  MaterialTheme(colorScheme = colors, typography = AppTypography, content = content)
+}