diff options
author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-03-03 07:23:34 +0000 |
---|---|---|
committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-03-03 07:23:34 +0000 |
commit | 72a66e8640c21683e99e4e7d866253fe205d14f0 (patch) | |
tree | 17ee151ea3a5e5f90b8d48ecea88b78b6bb938f0 /app/src/main/res/layout | |
parent | ed659e60de259fe51b811af96a589c6bb9fd7d35 (diff) | |
parent | e9e22d2fdbde4e9679337fa681d60b3fdbfeace7 (diff) |
Merge branch 'UX_upgrades' into 'main'
Ux upgrades
See merge request e/privacy-central/privacycentralapp!20
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/apptrackers_fragment.xml | 7 | ||||
-rw-r--r-- | app/src/main/res/layout/trackers_item_app.xml | 36 |
2 files changed, 38 insertions, 5 deletions
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index 13f58e3..17d992e 100644 --- a/app/src/main/res/layout/apptrackers_fragment.xml +++ b/app/src/main/res/layout/apptrackers_fragment.xml @@ -41,6 +41,13 @@ android:layout_width="match_parent" android:orientation="vertical" > + <TextView + android:id="@+id/trackers_count_summary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="16sp" + android:padding="16dp" + /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/trackers_item_app.xml b/app/src/main/res/layout/trackers_item_app.xml index b368664..310c792 100644 --- a/app/src/main/res/layout/trackers_item_app.xml +++ b/app/src/main/res/layout/trackers_item_app.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.appcompat.widget.LinearLayoutCompat - xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:layout_height="52dp" android:layout_width="match_parent" @@ -16,23 +16,49 @@ android:layout_height="32dp" android:layout_width="32dp" android:src="@drawable/ic_facebook" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" /> <TextView android:id="@+id/title" - android:layout_centerVertical="true" android:layout_height="wrap_content" android:layout_width="0dp" - android:layout_weight="1" android:maxLines="1" android:ellipsize="end" android:layout_marginStart="16dp" android:textSize="14sp" + android:textColor="@color/black_text" tools:text="Body sensor" + app:layout_constraintLeft_toRightOf="@+id/icon" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@+id/counts" + app:layout_constraintRight_toLeftOf="@+id/arrow" + app:layout_constraintVertical_chainStyle="packed" + /> + <TextView + android:id="@+id/counts" + android:layout_height="wrap_content" + android:layout_width="0dp" + android:maxLines="1" + android:ellipsize="end" + android:layout_marginStart="16dp" + android:textSize="14sp" + android:textColor="@color/grey_text_2" + tools:text="1 tracker blocked out of 4" + app:layout_constraintLeft_toRightOf="@+id/icon" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/title" + app:layout_constraintRight_toLeftOf="@+id/arrow" /> <ImageView + android:id="@+id/arrow" android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/ic_chevron_right_24dp" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" /> -</androidx.appcompat.widget.LinearLayoutCompat> +</androidx.constraintlayout.widget.ConstraintLayout> |