Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07260d53 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Improvements in system page

parent 8353ecc3
Loading
Loading
Loading
Loading
+9 −8
Original line number Diff line number Diff line
@@ -401,10 +401,10 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
        List<UpdateInfo> 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());
@@ -564,7 +564,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
                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);
        }
@@ -578,13 +578,14 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
            }
        } 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);
        }
    }
    }

    @SuppressLint("ClickableViewAccessibility")
    private void showPreferencesDialog() {
+38 −10
Original line number Diff line number Diff line
@@ -48,14 +48,24 @@
                android:paddingStart="16dp"
                app:layout_collapseMode="parallax">

                <TextView
                    android:id="@+id/header_current_version"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:paddingBottom="24dp"
                    android:text="@string/current_version"
                    android:textColor="?android:attr/textColorPrimary"
                    android:textSize="16sp" />

                <TextView
                    android:id="@+id/header_title"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:fontFamily="sans-serif-light"
                    android:paddingBottom="16dp"
                    android:paddingBottom="24dp"
                    android:layout_below="@id/header_current_version"
                    android:textColor="?android:attr/textColorPrimary"
                    android:textSize="56sp"
                    android:textSize="30sp"
                    tools:text="LineageOS\n20"/>

                <TextView
@@ -81,7 +91,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"
                    tools:text="Last checked: 1970-01-01"/>
@@ -112,13 +121,32 @@
            android:textColor="?android:textColorSecondary" />
    </androidx.core.widget.NestedScrollView>

    <LinearLayout
        android:id="@+id/content"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical"
        android:visibility="gone" 
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <TextView
            android:id="@+id/available_update_header"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:paddingTop="24dp"
            android:paddingBottom="24dp"
            android:paddingStart="16dp"
            android:textSize="16sp"
            android:background="?attr/colorPrimary"
            android:text="@string/available_updates"
            android:textColor="?android:textColorPrimary" />
        
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recycler_view"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:paddingBottom="5dp"
        android:scrollbars="vertical"
        app:layout_behavior="@string/appbar_scrolling_view_behavior"
        tools:listitem="@layout/update_item_view" />
            android:scrollbars="vertical" />
    </LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
+3 −0
Original line number Diff line number Diff line
@@ -14,4 +14,7 @@

    <!-- /e/ brand changes-->
    <string name="header_title_text_e">/e/OS\n%1$s</string>

    <string name="available_updates">Available updates:</string>
    <string name="current_version">Current version:</string>
</resources>