Skip to content

Commit 2cfd5f7

Browse files
hoc081098hoc081098
authored
Merge pull request #95 from Kotlin-Android-Open-Source/fix/UI_xml_format
fix(ui): wrong color in dark mode and format .xml files
2 parents 2814d42 + c7ccdf0 commit 2cfd5f7

File tree

39 files changed

+461
-442
lines changed

39 files changed

+461
-442
lines changed

‎.github/workflows/qodana.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
name: Qodana
2-
3-
on:
4-
push:
5-
branches: [ master ]
6-
paths-ignore: [ '**.md', '**.MD' ]
7-
pull_request:
8-
branches: [ master ]
9-
paths-ignore: [ '**.md', '**.MD' ]
10-
workflow_dispatch:
11-
12-
jobs:
13-
build:
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: actions/checkout@v2
17-
18-
- uses: JetBrains/[email protected]
19-
with:
20-
linter: jetbrains/qodana-jvm-android:latest
21-
fail-threshold: 10
1+
name: Qodana
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
paths-ignore: [ '**.md', '**.MD' ]
7+
pull_request:
8+
branches: [ master ]
9+
paths-ignore: [ '**.md', '**.MD' ]
10+
workflow_dispatch:
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
18+
- uses: JetBrains/[email protected]
19+
with:
20+
linter: jetbrains/qodana-jvm-android:latest
21+
fail-threshold: 10

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
/.idea/assetWizardSettings.xml
1010
.DS_Store
1111
/build
12-
buildSrc/build
1312
/captures
1413
.externalNativeBuild
1514
.cxx
15+
local.properties
16+
**/build/

‎.idea/misc.xml‎

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

‎app/release/app-release.apk‎

-2.5 MB
Binary file not shown.

‎app/src/main/java/com/hoc/flowmvi/core/CoreModule.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
44
import com.hoc.flowmvi.core_ui.navigator.Navigator
55
import org.koin.dsl.module
66

7+
@JvmField
78
val coreModule = module {
89
single<CoroutineDispatchers> { DefaultCoroutineDispatchers() }
910

‎buildSrc/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/build
2+
.gradle

‎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/java/com/hoc/flowmvi/core_ui/FlowBinding.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import androidx.appcompat.widget.SearchView
88
import androidx.core.widget.doOnTextChanged
99
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
1010
import kotlinx.coroutines.Dispatchers
11-
import kotlinx.coroutines.ExperimentalCoroutinesApi
1211
import kotlinx.coroutines.channels.awaitClose
1312
import kotlinx.coroutines.flow.Flow
1413
import kotlinx.coroutines.flow.callbackFlow
@@ -23,7 +22,6 @@ internal fun checkMainThread() {
2322
}
2423
}
2524

26-
@ExperimentalCoroutinesApi
2725
@CheckResult
2826
fun EditText.firstChange(): Flow<Unit> {
2927
return callbackFlow {
@@ -39,7 +37,6 @@ fun EditText.firstChange(): Flow<Unit> {
3937
}.take(1)
4038
}
4139

42-
@ExperimentalCoroutinesApi
4340
@CheckResult
4441
fun SwipeRefreshLayout.refreshes(): Flow<Unit> {
4542
return callbackFlow {
@@ -50,7 +47,6 @@ fun SwipeRefreshLayout.refreshes(): Flow<Unit> {
5047
}
5148
}
5249

53-
@ExperimentalCoroutinesApi
5450
@CheckResult
5551
fun View.clicks(): Flow<View> {
5652
return callbackFlow {
@@ -67,7 +63,6 @@ data class SearchViewQueryTextEvent(
6763
val isSubmitted: Boolean,
6864
)
6965

70-
@ExperimentalCoroutinesApi
7166
@CheckResult
7267
fun SearchView.queryTextEvents(): Flow<SearchViewQueryTextEvent> {
7368
return callbackFlow {
@@ -109,7 +104,6 @@ fun SearchView.queryTextEvents(): Flow<SearchViewQueryTextEvent> {
109104
}
110105
}
111106

112-
@ExperimentalCoroutinesApi
113107
@CheckResult
114108
fun EditText.textChanges(): Flow<CharSequence?> {
115109
return callbackFlow {

‎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>

0 commit comments

Comments
 (0)