Skip to content

Feat: Improve Styling With Material 3 Expressive #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JeelDobariya38 merged 9 commits into from
May 18, 2026
Merged

Feat: Improve Styling With Material 3 Expressive #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7eeaea6
chore(deps): bump com.google.android.material:material
dependabot[bot] May 17, 2026
5111d5e
chore(deps): bump org.jetbrains.compose from 1.10.3 to 1.11.0
dependabot[bot] May 18, 2026
ebc1a77
chore(deps): bump com.google.devtools.ksp from 2.3.7 to 2.3.8
dependabot[bot] May 17, 2026
4b23016
chore(deps): bump ktor from 3.4.3 to 3.5.0
dependabot[bot] May 18, 2026
9670669
chore(deps): bump gradle-wrapper from 9.5.0 to 9.5.1
dependabot[bot] May 17, 2026
78e3a3f
feat: add material3 expressive components
JeelDobariya38 May 18, 2026
eda450f
fix: material button to have expressiveness
JeelDobariya38 May 18, 2026
a1ce8d0
feat: add dynamic colors
JeelDobariya38 May 18, 2026
b1009c7
fix: view password old ui for spell checking
JeelDobariya38 May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/kotlin/com/jeeldobariya/passcodes/PasscodesApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.jeeldobariya.passcodes

import android.app.Application
import com.google.android.material.color.DynamicColors
import com.jeeldobariya.passcodes.core.di.coreModule
import com.jeeldobariya.passcodes.database.di.databaseModule
import com.jeeldobariya.passcodes.di.appModule
Expand All @@ -11,6 +12,7 @@ import org.koin.core.context.startKoin
class PasscodesApplication : Application() {
override fun onCreate() {
super.onCreate()
DynamicColors.applyToActivitiesIfAvailable(this)
startKoin {
androidContext(this@PasscodesApplication)
modules(databaseModule)
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/activity_about_us.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".oldui.AboutUsActivity">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/topAppBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface">
android:background="?attr/colorSurface"
android:fitsSystemWindows="true">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/setting_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setting_button_text"
android:textSize="14sp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/about_us_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/about_us_button_text"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/autofill_setting_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
Expand All @@ -191,7 +191,7 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/clear_all_data_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/res/values-night/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">

<style name="PasscodesTheme.Default" parent="Theme.Material3.Dark.NoActionBar">
<style name="PasscodesTheme.Default" parent="Theme.Material3Expressive.Dark.NoActionBar">
<!-- Base Colors -->
<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
Expand Down Expand Up @@ -39,7 +39,7 @@
</style>

<!-- Passcodes Trusted Dark Theme (Bluish) -->
<style name="PasscodesTheme.Trusted" parent="Theme.Material3.Dark.NoActionBar">
<style name="PasscodesTheme.Trusted" parent="Theme.Material3Expressive.Dark.NoActionBar">
<!-- Base Colors - Using a bluish palette -->
<item name="colorPrimary">@color/md_theme_trusted_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_trusted_dark_onPrimary</item>
Expand Down Expand Up @@ -80,7 +80,7 @@


<!-- Passcodes Pink Dark Theme (Pinkish) -->
<style name="PasscodesTheme.Pink" parent="Theme.Material3.Dark.NoActionBar">
<style name="PasscodesTheme.Pink" parent="Theme.Material3Expressive.Dark.NoActionBar">
<!-- Base Colors - Using a pinkish palette -->
<item name="colorPrimary">@color/md_theme_pink_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_pink_dark_onPrimary</item>
Expand Down Expand Up @@ -118,7 +118,7 @@
</style>

<!-- Passcodes Cute Dark Theme (Pinkish) -->
<style name="PasscodesTheme.Cute" parent="Theme.Material3.Dark.NoActionBar">
<style name="PasscodesTheme.Cute" parent="Theme.Material3Expressive.Dark.NoActionBar">
<!-- Base Colors - Using a pinkish palette -->
<item name="colorPrimary">@color/md_theme_cute_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_cute_dark_onPrimary</item>
Expand Down Expand Up @@ -155,7 +155,7 @@
<item name="android:windowLightStatusBar">false</item>
</style>

<style name="PasscodesTheme.GreenSafe" parent="Theme.Material3.Dark.NoActionBar">
<style name="PasscodesTheme.GreenSafe" parent="Theme.Material3Expressive.Dark.NoActionBar">
<item name="colorPrimary">@color/md_theme_green_safe_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_green_safe_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_green_safe_dark_primaryContainer</item>
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">

<style name="PasscodesTheme.Default" parent="Theme.Material3.Light.NoActionBar">
<style name="PasscodesTheme.Default" parent="Theme.Material3Expressive.Light.NoActionBar">
<!-- Base Colors -->
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
Expand Down Expand Up @@ -39,7 +39,7 @@
</style>

<!-- Passcodes Trusted Light Theme (Bluish) -->
<style name="PasscodesTheme.Trusted" parent="Theme.Material3.Light.NoActionBar">
<style name="PasscodesTheme.Trusted" parent="Theme.Material3Expressive.Light.NoActionBar">
<!-- Base Colors - Using a bluish palette -->
<item name="colorPrimary">@color/md_theme_trusted_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_trusted_light_onPrimary</item>
Expand Down Expand Up @@ -79,7 +79,7 @@
</style>

<!-- Passcodes Pink Dark Theme (Pinkish) -->
<style name="PasscodesTheme.Pink" parent="Theme.Material3.Light.NoActionBar">
<style name="PasscodesTheme.Pink" parent="Theme.Material3Expressive.Light.NoActionBar">
<!-- Base Colors - Using a pinkish palette -->
<item name="colorPrimary">@color/md_theme_pink_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_pink_light_onPrimary</item>
Expand Down Expand Up @@ -118,7 +118,7 @@
</style>

<!-- Passcodes Cute Dark Theme (Pinkish) -->
<style name="PasscodesTheme.Cute" parent="Theme.Material3.Light.NoActionBar">
<style name="PasscodesTheme.Cute" parent="Theme.Material3Expressive.Light.NoActionBar">
<!-- Base Colors - Using a pinkish palette -->
<item name="colorPrimary">@color/md_theme_cute_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_cute_light_onPrimary</item>
Expand Down Expand Up @@ -156,7 +156,7 @@
<item name="android:windowLightStatusBar">true</item>
</style>

<style name="PasscodesTheme.GreenSafe" parent="Theme.Material3.Light.NoActionBar">
<style name="PasscodesTheme.GreenSafe" parent="Theme.Material3Expressive.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_green_safe_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_green_safe_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_green_safe_light_primaryContainer</item>
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
# Library versions
coreKtx = "1.18.0"
material = "1.13.0"
material = "1.14.0"
nav3Core = "1.1.1"
lifecycleViewmodelNav3 = "2.10.0"
oss-license = "17.5.1"
Expand All @@ -17,8 +17,8 @@ androidx-junit = "1.3.0"
coroutines = "1.11.0"
lifecycle = "2.10.0"
koin = "4.2.1"
ktor = "3.4.3"
composeMultiplatform = "1.10.3"
ktor = "3.5.0"
composeMultiplatform = "1.11.0"
composeBom = "2026.05.00"
compose-activity = "1.13.0"
compose-viewmodel = "2.10.0"
Expand All @@ -27,7 +27,7 @@ kotlinSerializationJson = "1.11.0"

# Plugin versions
agp = "9.2.1"
ksp = "2.3.7"
ksp = "2.3.8"
kotlin = "2.3.21"
oss-license-plugin = "0.12.0" # Always update also in settings.gradle.kts

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions password_manager/src/main/res/layout/activity_password_manager.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/import_password_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/import_password_button_text"
android:textSize="14sp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/export_password_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/export_password_button_text"
Expand Down
13 changes: 9 additions & 4 deletions password_manager/src/main/res/layout/activity_view_password.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="12sp"
android:inputType="text|textNoSuggestions"
android:focusable="false"
android:focusableInTouchMode="false"
android:cursorVisible="false" />
Expand All @@ -61,6 +62,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="12sp"
android:inputType="text|textNoSuggestions"
android:focusable="false"
android:focusableInTouchMode="false"
android:cursorVisible="false" />
Expand All @@ -80,7 +82,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="12sp"
android:inputType="textPassword"
android:inputType="textVisiblePassword"
android:focusable="false"
android:focusableInTouchMode="false"
android:cursorVisible="false" />
Expand All @@ -100,6 +102,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="12sp"
android:inputType="text|textNoSuggestions"
android:focusable="false"
android:focusableInTouchMode="false"
android:cursorVisible="false" />
Expand All @@ -119,6 +122,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="12sp"
android:inputType="text|textNoSuggestions"
android:focusable="false"
android:focusableInTouchMode="false"
android:cursorVisible="false" />
Expand All @@ -137,6 +141,7 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:textSize="12sp"
android:inputType="text|textNoSuggestions"
android:focusable="false"
android:focusableInTouchMode="false"
android:cursorVisible="false" />
Expand All @@ -152,7 +157,7 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/copy_password_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/copy_password_button_text"
Expand All @@ -161,7 +166,7 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/update_password_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/update_password_button_text"
Expand All @@ -170,7 +175,7 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/delete_password_btn"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/delete_password_button_text"
Expand Down
Loading