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

Commit 86ad1f3e authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

Issue 5186: Adjust install buttons for non-English users

parent f74ad0e9

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

+143 −146
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->



<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/applicationList"
@@ -29,10 +29,6 @@ 
    android:clickable="true"

    android:focusable="true">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



    <androidx.cardview.widget.CardView

        android:id="@+id/app_icon_card"

        android:layout_width="75dp"
@@ -110,11 +106,11 @@ 
    <com.google.android.material.button.MaterialButton

        android:id="@+id/installButton"

        style="@style/InstallButtonStyle"

            android:layout_width="120dp"

        android:layout_width="wrap_content"

        android:layout_height="43dp"

        android:minWidth="120dp"

        android:text="@string/install"

        android:textAllCaps="false"

            android:textSize="18sp"

        app:autoSizeTextType="uniform"

        app:cornerRadius="4dp"

        app:layout_constraintRight_toRightOf="parent"
@@ -134,15 +130,17 @@ 
        <ImageView

            android:layout_width="16dp"

            android:layout_height="16dp"

            android:layout_gravity="center_vertical"

            android:src="@drawable/ic_lock" />



        <TextView

            android:id="@+id/app_privacy_score"

            android:layout_width="wrap_content"

                android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:ellipsize="end"

            android:maxLines="1"

            android:layout_gravity="center_vertical"

            android:text="@string/not_available"

            android:textColor="?android:textColorPrimary"

            android:textSize="14sp"
@@ -182,6 +180,5 @@ 
        android:layout_marginTop="12dp"

        android:background="@color/colorGrey"

        app:layout_constraintTop_toBottomOf="@+id/app_rating_bar" />

    </androidx.constraintlayout.widget.ConstraintLayout>



</RelativeLayout>
 
</androidx.constraintlayout.widget.ConstraintLayout>

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

+4 −4
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ 
    <com.google.android.material.textview.MaterialTextView

        android:id="@+id/appName"

        android:layout_width="96dp"

        android:layout_height="30dp"

        android:layout_height="wrap_content"

        android:layout_marginStart="5dp"

        android:layout_marginEnd="5dp"

        android:ellipsize="end"

        android:maxLines="2"

        android:lines="2"

        android:textAlignment="center"

        android:textColor="?android:textColorPrimary"

        android:textSize="12sp" />
@@ -60,12 +60,12 @@ 
    <com.google.android.material.button.MaterialButton

        android:id="@+id/installButton"

        style="@style/InstallButtonStyle"

        android:layout_width="96dp"

        android:layout_width="wrap_content"

        android:minWidth="102dp"

        android:layout_height="43dp"

        android:layout_marginStart="1dp"

        android:text="@string/install"

        android:textAllCaps="false"

        android:textSize="18sp"

        app:autoSizeTextType="uniform"

        app:cornerRadius="4dp" />

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

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ 
    <style name="InstallButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">

        <item name="android:textColor">@color/install_button_background</item>

        <item name="strokeColor">@color/install_button_background</item>

        <item name="android:paddingStart">4dp</item>

        <item name="android:paddingEnd">4dp</item>

    </style>



    <style name="UpdateButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">