From cdbbf3807372faf76d2d80da63e36220f4bd12e4 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 24 Nov 2022 16:22:40 +0530 Subject: [PATCH] Improvements in system update page --- res/layout/activity_updates.xml | 45 +++++++++++++++---- res/values-en-rAU/strings.xml | 2 +- res/values-en-rCA/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values/strings.xml | 5 ++- .../lineageos/updater/UpdatesActivity.java | 8 ++-- 7 files changed, 49 insertions(+), 17 deletions(-) diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml index 9f243b19..76497f33 100644 --- a/res/layout/activity_updates.xml +++ b/res/layout/activity_updates.xml @@ -34,12 +34,22 @@ android:paddingStart="16dp" app:layout_collapseMode="parallax"> + + @@ -64,7 +74,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/header_build_date" - android:layout_marginTop="8dp" android:textColor="?android:attr/textColorPrimary" android:textSize="12sp" /> @@ -93,12 +102,32 @@ android:textColor="?android:textColorSecondary" /> - + android:orientation="vertical" + android:visibility="gone" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + + + + diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index e9b207f6..31516d91 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s • %3$s %1$s of %2$s (%3$s) • %4$s Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 582f3965..acc979b8 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s • %3$s %1$s of %2$s (%3$s) • %4$s Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 9ca4fc73..f2f747f0 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s • %3$s %1$s of %2$s (%3$s) • %4$s Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 9ca4fc73..f2f747f0 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s • %3$s %1$s of %2$s (%3$s) • %4$s Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values/strings.xml b/res/values/strings.xml index cb870f67..e41995b3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -103,7 +103,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause @@ -165,4 +165,7 @@ Did you know? /e/OS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between! Thanks for the info! + + Available updates: + Current version: diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index cdd12d52..7e36740e 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -285,10 +285,10 @@ public class UpdatesActivity extends UpdatesListActivity { List sortedUpdates = controller.getUpdates(); if (sortedUpdates.isEmpty()) { findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE); - findViewById(R.id.recycler_view).setVisibility(View.GONE); + findViewById(R.id.content).setVisibility(View.GONE); } else { findViewById(R.id.no_new_updates_view).setVisibility(View.GONE); - findViewById(R.id.recycler_view).setVisibility(View.VISIBLE); + findViewById(R.id.content).setVisibility(View.VISIBLE); sortedUpdates.sort((u1, u2) -> Long.compare(u2.getTimestamp(), u1.getTimestamp())); for (UpdateInfo update : sortedUpdates) { updateIds.add(update.getDownloadId()); @@ -428,7 +428,7 @@ public class UpdatesActivity extends UpdatesListActivity { mRefreshIconView.setEnabled(false); } } else { - findViewById(R.id.recycler_view).setVisibility(View.GONE); + findViewById(R.id.content).setVisibility(View.GONE); findViewById(R.id.no_new_updates_view).setVisibility(View.GONE); findViewById(R.id.refresh_progress).setVisibility(View.VISIBLE); } @@ -443,7 +443,7 @@ public class UpdatesActivity extends UpdatesListActivity { } else { findViewById(R.id.refresh_progress).setVisibility(View.GONE); if (mAdapter.getItemCount() > 0) { - findViewById(R.id.recycler_view).setVisibility(View.VISIBLE); + findViewById(R.id.content).setVisibility(View.VISIBLE); } else { findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE); } -- GitLab