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

Unverified Commit 773e0571 authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

refactor: update no connection UI

parent 69169a15

app/src/main/res/drawable/ic_no_connection.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="48dp"

    android:height="48dp"

    android:viewportWidth="48"

    android:viewportHeight="48">

  <path

      android:pathData="M24,22.167C19.677,22.167 15.694,23.594 12.5,26L8.667,20.889C12.947,17.673 18.25,15.778 24,15.778C29.75,15.778 35.053,17.673 39.333,20.889L36.607,24.509C35.819,24.658 35.032,24.871 34.307,25.169C31.326,23.232 27.791,22.167 24,22.167ZM43.167,15.778L47,10.667C40.59,5.854 32.625,3 24,3C15.375,3 7.41,5.854 1,10.667L4.833,15.778C10.157,11.774 16.802,9.389 24,9.389C31.198,9.389 37.843,11.774 43.167,15.778ZM24,28.556C21.125,28.556 18.463,29.514 16.333,31.111L24,41.333L26.215,38.373C26.13,37.947 26.13,37.521 26.13,37.074C26.13,34.22 27.067,31.601 28.664,29.471C27.194,28.896 25.64,28.556 24,28.556ZM43.422,29.535L38.907,34.071L34.393,29.556L31.39,32.559L35.905,37.074L31.39,41.589L34.393,44.613L38.907,40.077L43.422,44.613L46.446,41.589L41.91,37.074L46.446,32.559L43.422,29.535Z"

      android:fillColor="#000000"

      android:fillAlpha="0.38"/>

</vector>

app/src/main/res/layout/activity_main.xml

+33 −11
Original line number Diff line number Diff line
@@ -23,24 +23,46 @@ 
    android:layout_height="match_parent"

    tools:context=".ui.MainActivity">



    <com.google.android.material.textview.MaterialTextView

    <LinearLayout

        android:id="@+id/noInternet"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="20dp"

        android:layout_marginTop="10dp"

        android:layout_marginEnd="20dp"

        android:drawableTop="@drawable/ic_error_circular"

        android:text="@string/no_internet_message"

        android:textAlignment="center"

        android:textColor="?android:textColorSecondary"

        android:textSize="18sp"

        android:layout_marginHorizontal="56dp"

        android:gravity="center"

        android:orientation="vertical"

        android:visibility="gone"

        app:drawableTint="@color/colorAccent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@id/bottomNavigationView"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent" />

        tools:visibility="visible">



        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:contentDescription="@string/no_internet_title"

            android:src="@drawable/ic_no_connection"

            app:tint="@color/e_disabled_color" />



        <com.google.android.material.textview.MaterialTextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:text="@string/no_internet_title"

            android:textColor="@color/e_primary_text_color"

            android:textSize="18sp" />



        <com.google.android.material.textview.MaterialTextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:text="@string/no_internet_message"

            android:textAlignment="center"

            android:textColor="@color/e_disabled_color"

            android:textSize="15sp"

            android:visibility="visible" />



    </LinearLayout>



    <androidx.fragment.app.FragmentContainerView

        android:id="@+id/fragment"

app/src/main/res/values/strings.xml

+5 −4
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ 
    <string name="search_hint" weblate_ctx="search">Search for an app</string>

    <string name="search_back_button">Back</string>

    <string name="search_clear_button">Clear search</string>

    <string name="search_tab_standard_apps">APPS</string>

    <string name="search_tab_open_source">OPEN SOURCE</string>

    <string name="search_tab_web_apps">WEB APPS</string>

    <string name="search_tab_standard_apps" translatable="false">APPS</string>

    <string name="search_tab_open_source" translatable="false">OPEN SOURCE</string>

    <string name="search_tab_web_apps" translatable="false">WEB APPS</string>

    <string name="no_apps_found">No apps found…</string>

    <string name="search_error">This page or resource is unavailable due to maintenance.</string>

    <string name="search_error_title">Please try again later</string>
@@ -194,7 +194,8 @@ 
    <string name="only_unmetered_network" translatable="false">updateUnmeteredOnly</string>

    <string name="update_apps_from_other_stores" translatable="false">updateAppsFromOtherStores</string>

    <!-- No Internet Fragment -->

    <string name="no_internet_message">Can\'t connect! Please check your internet connection and try again</string>

    <string name="no_internet_title">No connection</string>

    <string name="no_internet_message">Please check your internet connection and try again.</string>

    <!--Timeout-->

    <string name="timeout_title">Timeout fetching applications!</string>

    <string name="timeout_desc_gplay">Some network issue is preventing fetching all applications.