Skip to content

Commit f32e486

Browse files
hoc081098hoc081098
committed
- fix(ui): wrong color in dark mode
- style: format .xml files
1 parent 2814d42 commit f32e486

File tree

18 files changed

+226
-234
lines changed

18 files changed

+226
-234
lines changed

‎.idea/misc.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core-ui/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.hoc.flowmvi.core_ui">
3+
package="com.hoc.flowmvi.core_ui">
44

5-
<application>
5+
<application>
66

7-
<meta-data
8-
android:name="preloaded_fonts"
9-
android:resource="@array/preloaded_fonts" />
7+
<meta-data
8+
android:name="preloaded_fonts"
9+
android:resource="@array/preloaded_fonts" />
1010

11-
</application>
11+
</application>
1212

1313
</manifest>

‎core-ui/src/main/res/font/noto_sans.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
3-
app:fontProviderAuthority="com.google.android.gms.fonts"
4-
app:fontProviderPackage="com.google.android.gms"
5-
app:fontProviderQuery="Noto Sans"
6-
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
7-
</font-family>
3+
app:fontProviderAuthority="com.google.android.gms.fonts"
4+
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
5+
app:fontProviderPackage="com.google.android.gms"
6+
app:fontProviderQuery="Noto Sans"></font-family>

‎core-ui/src/main/res/values/themes.xml‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
<resources>
2-
<style name="AppTheme" parent="Theme.Material3.DayNight">
3-
<item name="colorPrimary">@color/md_theme_light_primary</item>
4-
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
5-
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
6-
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
7-
<item name="colorSecondary">@color/md_theme_light_secondary</item>
8-
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
9-
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
10-
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
11-
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
12-
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
13-
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
14-
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
15-
<item name="colorError">@color/md_theme_light_error</item>
16-
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
17-
<item name="colorOnError">@color/md_theme_light_onError</item>
18-
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
19-
<item name="android:colorBackground">@color/md_theme_light_background</item>
20-
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
21-
<item name="colorSurface">@color/md_theme_light_surface</item>
22-
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
23-
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
24-
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
25-
<item name="colorOutline">@color/md_theme_light_outline</item>
26-
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
27-
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
28-
<item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
29-
</style>
2+
3+
<style name="AppTheme" parent="Theme.Material3.DayNight">
4+
<item name="colorPrimary">@color/md_theme_light_primary</item>
5+
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
6+
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
7+
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
8+
<item name="colorSecondary">@color/md_theme_light_secondary</item>
9+
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
10+
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
11+
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
12+
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
13+
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
14+
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
15+
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
16+
<item name="colorError">@color/md_theme_light_error</item>
17+
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
18+
<item name="colorOnError">@color/md_theme_light_onError</item>
19+
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
20+
<item name="android:colorBackground">@color/md_theme_light_background</item>
21+
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
22+
<item name="colorSurface">@color/md_theme_light_surface</item>
23+
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
24+
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
25+
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
26+
<item name="colorOutline">@color/md_theme_light_outline</item>
27+
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
28+
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
29+
<item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
30+
</style>
3031
</resources>

‎data/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.hoc.flowmvi.data">
2+
<manifest package="com.hoc.flowmvi.data">
43

54
</manifest>

‎feature-add/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.hoc.flowmvi.ui.add">
3+
package="com.hoc.flowmvi.ui.add">
44

5-
<application>
5+
<application>
66

7-
<activity
8-
android:name=".AddActivity"
9-
android:label="Add user" />
7+
<activity
8+
android:name=".AddActivity"
9+
android:label="Add user" />
1010

11-
</application>
11+
</application>
1212

1313
</manifest>

‎feature-main/src/main/AndroidManifest.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.hoc.flowmvi.ui.main">
3+
package="com.hoc.flowmvi.ui.main">
44

5-
<application>
5+
<application>
66

7-
<activity
8-
android:name=".MainActivity"
9-
android:exported="true">
10-
<intent-filter>
11-
<action android:name="android.intent.action.MAIN" />
7+
<activity
8+
android:name=".MainActivity"
9+
android:exported="true">
10+
<intent-filter>
11+
<action android:name="android.intent.action.MAIN" />
1212

13-
<category android:name="android.intent.category.LAUNCHER" />
14-
</intent-filter>
15-
</activity>
13+
<category android:name="android.intent.category.LAUNCHER" />
14+
</intent-filter>
15+
</activity>
1616

17-
</application>
17+
</application>
1818
</manifest>

‎feature-main/src/main/res/drawable/ic_baseline_search_24.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
22
android:width="24dp"
33
android:height="24dp"
4+
android:tint="?attr/colorControlNormal"
45
android:viewportWidth="24"
5-
android:viewportHeight="24"
6-
android:tint="?attr/colorControlNormal">
7-
<path
8-
android:fillColor="@android:color/white"
9-
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
6+
android:viewportHeight="24">
7+
<path
8+
android:fillColor="@android:color/white"
9+
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
1010
</vector>

‎feature-main/src/main/res/layout/activity_main.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
android:maxLines="2"
6767
android:text="TextView"
6868
android:textAlignment="center"
69-
android:textColor="#424242"
7069
android:textSize="15sp"
7170
app:layout_constraintBottom_toBottomOf="parent"
7271
app:layout_constraintEnd_toEndOf="parent"

‎feature-main/src/main/res/layout/item_recycler_user.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
6-
android:layout_height="wrap_content"
7-
>
6+
android:layout_height="wrap_content">
87

98
<ImageView
109
android:id="@+id/avatarImage"
@@ -21,13 +20,13 @@
2120

2221
<TextView
2322
android:id="@+id/nameTextView"
23+
style="@style/TextAppearance.Material3.TitleMedium"
2424
android:layout_width="0dp"
2525
android:layout_height="wrap_content"
2626
android:layout_marginStart="8dp"
2727
android:layout_marginEnd="8dp"
2828
android:fontFamily="@font/noto_sans"
2929
android:maxLines="1"
30-
android:textColor="#424242"
3130
android:textSize="16sp"
3231
app:layout_constraintBottom_toTopOf="@+id/emailTextView"
3332
app:layout_constraintEnd_toEndOf="parent"
@@ -39,6 +38,7 @@
3938

4039
<TextView
4140
android:id="@+id/emailTextView"
41+
style="@style/TextAppearance.Material3.TitleSmall"
4242
android:layout_width="0dp"
4343
android:layout_height="wrap_content"
4444
android:layout_marginStart="8dp"

0 commit comments

Comments
 (0)