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

Commit b976f033 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '5690-r-update_page_improvements' into 'v1-r' 

Improvements in system update page

See merge request !94
parents a12c477a cdbbf380

res/layout/activity_updates.xml

+37 −8
Original line number Diff line number Diff line
@@ -34,12 +34,22 @@ 
                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="30sp" />
@@ -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" />

            </RelativeLayout>
@@ -93,12 +102,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" />

            android:scrollbars="vertical" />

    </LinearLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/values-en-rAU/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
    <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>

    <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>

    <string name="list_verifying_update">Verifying update</string>

    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>

    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>

    <string name="action_download">Download</string>

    <string name="action_pause">Pause</string>

    <string name="action_resume">Resume</string>

res/values-en-rCA/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
    <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>

    <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>

    <string name="list_verifying_update">Verifying update</string>

    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>

    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>

    <string name="action_download">Download</string>

    <string name="action_pause">Pause</string>

    <string name="action_resume">Resume</string>

res/values-en-rGB/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
    <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>

    <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>

    <string name="list_verifying_update">Verifying update</string>

    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>

    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>

    <string name="action_download">Download</string>

    <string name="action_pause">Pause</string>

    <string name="action_resume">Resume</string>

res/values-en-rIN/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
    <string name="list_download_progress_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> • <xliff:g id="percentage" example="56">%3$s</xliff:g></string>

    <string name="list_download_progress_eta_new"><xliff:g id="filesize_without_unit" example="12.2">%1$s</xliff:g> of <xliff:g id="filesize_without_unit" example="310 MB">%2$s</xliff:g> (<xliff:g id="eta" example="3 minutes left">%3$s</xliff:g>) • <xliff:g id="percentage" example="56">%4$s</xliff:g></string>

    <string name="list_verifying_update">Verifying update</string>

    <string name="list_no_updates">No new updates found. To manually check for new updates, use the Refresh button.</string>

    <string name="list_no_updates">You are running the latest /e/OS version. To manually check for updates, use the Refresh button.</string>

    <string name="action_download">Download</string>

    <string name="action_pause">Pause</string>

    <string name="action_resume">Resume</string>