diff --git a/app/build.gradle b/app/build.gradle index 83fb9fc4..59d5d396 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,6 +16,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildFeatures { + viewBinding true + } + buildTypes { release { minifyEnabled false diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a44f56ff..1eba23b2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ + + + + + + diff --git a/app/src/main/res/layout/settings_fragment_keyboard.xml b/app/src/main/res/layout/settings_fragment_keyboard.xml index c0463ff6..6fd8f1e7 100644 --- a/app/src/main/res/layout/settings_fragment_keyboard.xml +++ b/app/src/main/res/layout/settings_fragment_keyboard.xml @@ -24,9 +24,9 @@ android:layout_marginEnd="4dp" android:padding="8dp" android:background="@drawable/shape_rect_rounded" - android:backgroundTint="#F8F808" + android:backgroundTint="?colorWarning" android:text="@string/settings__keyboard__subtype_no_subtypes_configured_warning" - android:textColor="#000000"/> + android:textColor="?textColorWarning"/> @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="8dp" + android:paddingHorizontal="8dp" android:gravity="center_vertical"> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index a6299ea3..d1c8002b 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -36,4 +36,12 @@ + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index cb11aaa1..64cac579 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,6 +5,13 @@ #FF9800 #F57C00 + @color/colorPrimary + #FFFFFF + #FFFF00 + #000000 + #B00020 + #FFFFFF + #78909C #FFFFFF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5035ec4b..367a31c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,6 +52,7 @@ Advanced Welcome to %s + FlorisBoard is not enabled in the system and thus won\'t be available as an input method in the input picker. Click here to resolve this issue. Keyboard & Text Correction It seems that you haven\'t configured any subtypes. As a fallback the subtype English/QWERTY will be used! diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 826d5655..8f8d6907 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -76,5 +76,19 @@ @color/cardViewBackgroundColor 4dp + + + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index aa7ffa5e..2d8c0786 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -94,6 +94,13 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + + @color/colorSuccess + @color/textColorSuccess + @color/colorWarning + @color/textColorWarning + @color/colorError + @color/textColorError