diff --git a/Android.bp b/Android.bp index b4c66111893ae828599e7130dd2103c20c3ee750..7b072fc878d79c7289b417f8518807956ea9c1ca 100644 --- a/Android.bp +++ b/Android.bp @@ -31,6 +31,7 @@ android_app { "androidx.localbroadcastmanager_localbroadcastmanager", "androidx.preference_preference", "androidx.recyclerview_recyclerview", + "elib", ], platform_apis: true, diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml index 4651a7e034668064fed8245428e9ea6bdc6d978a..b6c3dc64a6ea2c5539aa698f0b6443eb82bb28ff 100644 --- a/res/layout/activity_updates.xml +++ b/res/layout/activity_updates.xml @@ -14,7 +14,7 @@ android:fitsSystemWindows="true" android:outlineAmbientShadowColor="@android:color/transparent" android:outlineSpotShadowColor="@android:color/transparent" - android:background="?android:attr/colorPrimary" + android:background="@color/toolbar_collapsed" android:theme="@style/Theme.CollapsingToolbar.Settings"> + + + android:textSize="30sp" /> diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 21b0fdcddad3ee9af75907a640da46116b2323f9..aa2cf345d875ee06041f44e40439f1512d473a79 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -2,9 +2,5 @@ #212121 #1c1c1c - @*android:color/accent_device_default_dark - @*android:color/system_neutral1_800 - @android:color/system_neutral1_700 - #f5f5f5 diff --git a/res/values/colors.xml b/res/values/colors.xml index a7add882bb62842ce3d8f206e16f290b1ea70d1f..26fa91d802bd49530d0cb5a0f6933d14b6d7816c 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -2,9 +2,9 @@ #f5f5f5 #e0e0e0 - @*android:color/accent_device_default_light - @*android:color/system_neutral1_0 - @android:color/system_neutral1_100 + @color/e_accent + @color/e_background_variant + @color/e_action_bar #FF0E0E0F #222222 diff --git a/res/values/strings.xml b/res/values/strings.xml index 7dcb92a9f9dd3cf7d8472057b5fca3d0a5674a90..4610b39da84fb7da4a87f1f03babdb5501a5c404 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -170,4 +170,7 @@ /e/OS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between! + + + /e/OS\n%1$s diff --git a/res/values/styles.xml b/res/values/styles.xml index c3efca45e4b3de6aac203960588e7094cbe9a830..a71cb33d6f62346516a0a549029d6268298c1450 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -8,6 +8,9 @@ @bool/theme_is_light @bool/theme_is_light @color/background + @style/Dialog + @style/Snackbar + @style/Switch + + + + + diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index 8bfd2b9c3bf81a066b58125b44bab12276a69685..d99cb09d318cef311026d7d9766b7ecadcbff717 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -51,6 +51,7 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.LinearLayoutManager; @@ -150,7 +151,7 @@ public class UpdatesActivity extends UpdatesListActivity { } TextView headerTitle = findViewById(R.id.header_title); - headerTitle.setText(getString(R.string.header_title_text, + headerTitle.setText(getString(R.string.header_title_text_e, BuildInfoUtils.getDisplayVersion())); updateLastCheckedString(); @@ -440,7 +441,7 @@ public class UpdatesActivity extends UpdatesListActivity { @Override public void showSnackbar(int stringId, int duration) { - Snackbar.make(findViewById(R.id.main_container), stringId, duration).show(); + Snackbar.make(findViewById(R.id.main_container), stringId, duration).setTextColor(ContextCompat.getColor(this, R.color.e_background)).show(); } private void refreshAnimationStart() {