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

Commit 8eb4fa48 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch '5399-master-ui_improvements' into 'main' 

privacycentralapp: fix ui in different languages

See merge request e/privacy-central/privacycentralapp!57
parents bf286ad5 cc17a774

app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ class DashboardFeature( 
                        is Action.ShowMostLeakedApp -> {

                            Log.d("mostleak", "Action.ShowMostLeakedApp")

                            flowOf(

                                trackersStatisticsUseCase.getMostLeakedApp()?.let { Effect.OpenAppDetailsEffect(appDesc = it) } ?: Effect.NoEffect

                                trackersStatisticsUseCase.getMostLeakedApp()?.let { Effect.OpenAppDetailsEffect(appDesc = it) } ?: Effect.OpenTrackersEffect

                            )

                        }

                    }

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

+12 −3
Original line number Diff line number Diff line
@@ -212,13 +212,16 @@ android:text="@string/dashboard_state_ipaddress_off" 
                    />

                <TextView

                    android:id="@+id/graph_legend_blocked"

                    android:layout_width="wrap_content"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    tools:text="0 Trackers"

                    android:ellipsize="end"

                    android:maxLines="1"

                    android:layout_marginStart="8dp"

                    android:textSize="12sp"

                    app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked_icon"

                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"

                    app:layout_constraintRight_toLeftOf="@id/graph_legend_allowed_icon"

                    android:layout_marginTop="8dp"

                    android:text="@string/graph_legend_blocked"

                    />
@@ -230,17 +233,21 @@ android:text="@string/dashboard_state_ipaddress_off" 
                    android:padding="1dp"

                    app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked"

                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"

                    app:layout_constraintRight_toLeftOf="@id/graph_legend_allowed"

                    android:layout_marginTop="8dp"

                    android:layout_marginStart="32dp"

                    android:layout_marginStart="16dp"

                    android:background="@drawable/ic_legend_leaked"

                    />

                <TextView

                    android:id="@+id/graph_legend_allowed"

                    android:layout_width="wrap_content"

                    android:layout_width="0dp"

                    android:ellipsize="end"

                    android:maxLines="1"

                    android:layout_height="wrap_content"

                    tools:text="0 Trackers"

                    android:layout_marginStart="8dp"

                    android:textSize="12sp"

                    app:layout_constraintRight_toLeftOf="@id/leaking_app_button"

                    app:layout_constraintLeft_toRightOf="@+id/graph_legend_allowed_icon"

                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"

                    android:layout_marginTop="8dp"
@@ -258,7 +265,9 @@ android:text="@string/dashboard_state_ipaddress_off" 
                    app:layout_constraintRight_toRightOf="parent"

                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"

                    app:layout_constraintTop_toTopOf="@+id/graph_legend_blocked_icon"

                    app:layout_constraintLeft_toRightOf="@id/graph_legend_allowed"

                    android:gravity="center_vertical|end"

                    android:layout_marginLeft="16dp"

                    android:layout_marginRight="16dp"

                    />

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

+11 −3
Original line number Diff line number Diff line
@@ -69,13 +69,16 @@ 
            />

        <TextView

            android:id="@+id/graph_legend_blocked"

            android:layout_width="wrap_content"

            android:layout_width="0dp"

            android:maxLines="1"

            android:ellipsize="end"

            android:layout_height="wrap_content"

            tools:text="0 Trackers"

            android:layout_marginStart="8dp"

            android:textSize="12sp"

            app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked_icon"

            app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"

            app:layout_constraintRight_toLeftOf="@id/graph_legend_allowed_icon"

            android:layout_marginTop="8dp"

            android:text="@string/graph_legend_blocked"

            />
@@ -87,20 +90,25 @@ 
            android:padding="1dp"

            app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked"

            app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"

            app:layout_constraintRight_toLeftOf="@id/graph_legend_allowed"

            android:layout_marginTop="8dp"

            android:layout_marginStart="32dp"

            android:layout_marginStart="16dp"

            android:background="@drawable/ic_legend_leaked"

            />

        <TextView

            android:id="@+id/graph_legend_allowed"

            android:layout_width="wrap_content"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:maxLines="1"

            android:ellipsize="end"

            tools:text="0 Trackers"

            android:layout_marginStart="8dp"

            android:textSize="12sp"

            app:layout_constraintLeft_toRightOf="@+id/graph_legend_allowed_icon"

            app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"

            app:layout_constraintRight_toRightOf="parent"

            android:layout_marginTop="8dp"

            android:layout_marginRight="16dp"

            android:text="@string/graph_legend_allowed"

            />

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

+9 −3
Original line number Diff line number Diff line
@@ -702,9 +702,12 @@ 
            android:src="@drawable/ic_legend_blocked"

            />

        <TextView

            android:ellipsize="end"

            android:id="@+id/graph_legend_blocked"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:maxLines="1"

            tools:text="0 Trackers"

            android:textColor="@color/on_primary_medium_emphasis"

            android:layout_marginStart="8dp"
@@ -717,14 +720,17 @@ 
            android:layout_width="16dp"

            android:layout_height="16dp"

            android:padding="1dp"

            android:layout_marginStart="32dp"

            android:layout_marginStart="10dp"

            android:src="@drawable/ic_legend_leaked"

            />



        <TextView

            android:ellipsize="end"

            android:id="@+id/graph_legend_allowed"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:maxLines="1"

            tools:text="0 Trackers"

            android:textColor="@color/on_primary_medium_emphasis"

            android:layout_marginStart="8dp"
@@ -734,9 +740,9 @@ 


        <TextView

            android:id="@+id/graph_view_trackers_btn"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="10dp"

            android:textSize="12sp"

            android:textAlignment="textEnd"

            android:gravity="center_vertical|end"