diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-01-26 17:41:25 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-01-26 17:41:25 +0000 |
| commit | e1c393d9d69c3ae1be3f9e600b29c8edf12635a1 (patch) | |
| tree | 6dead7d096a4d15ef75d8e60f7bc4b346320c70c /app/src/main/res/layout | |
| parent | 10564e2605d03a23fcc1b3728502bd5ffd77cc74 (diff) | |
| parent | e70807ca9ff87e3b3c237af0b47af5b646a9447d (diff) | |
Merge branch 'feature/ui_ux_updates' into 'main'
Feature/ui ux updates
See merge request e/privacy-central/privacycentralapp!10
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/apptrackers_fragment.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_dashboard.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_internet_activity_policy.xml | 14 |
3 files changed, 18 insertions, 9 deletions
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index f037beb..13f58e3 100644 --- a/app/src/main/res/layout/apptrackers_fragment.xml +++ b/app/src/main/res/layout/apptrackers_fragment.xml @@ -63,6 +63,14 @@ android:layout_height="1dp" android:background="@color/grey_divider" /> + <TextView + android:id="@+id/trackers_list_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/apptrackers_trackers_list_title" + android:padding="16dp" + android:visibility="gone" + /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/trackers" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index c93b985..3197257 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -28,14 +28,15 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_marginBottom="4dp" - android:text="@string/dashboard_state_label_off" + android:text="@string/dashboard_state_subtitle_off" android:textColor="@color/orange_off" android:gravity="center" /> <TextView + android:id="@+id/state_subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/dashboard_change_state_explanations" + android:text="@string/dashboard_state_title_on" android:gravity="center" android:textSize="12sp" android:textColor="@color/grey_text_2" diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml index a59d807..44ea823 100644 --- a/app/src/main/res/layout/fragment_internet_activity_policy.xml +++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml @@ -43,19 +43,19 @@ android:orientation="vertical" > <include layout="@layout/ipscrambling_item_selectmode" - android:id="@+id/radio_use_hidden_ip" - android:layout_width="match_parent" - android:layout_height="88dp" - app:title="@{@string/ipscrambling_hide_ip_label}" - app:subtitle="@{@string/ipscrambling_hide_ip_subtitle}" - /> - <include layout="@layout/ipscrambling_item_selectmode" android:id="@+id/radio_use_real_ip" android:layout_width="match_parent" android:layout_height="88dp" app:title="@{@string/ipscrambling_real_ip_label}" app:subtitle="@{@string/ipscrambling_real_ip_subtitle}" /> + <include layout="@layout/ipscrambling_item_selectmode" + android:id="@+id/radio_use_hidden_ip" + android:layout_width="match_parent" + android:layout_height="88dp" + app:title="@{@string/ipscrambling_hide_ip_label}" + app:subtitle="@{@string/ipscrambling_hide_ip_subtitle}" + /> </RadioGroup> <TextView android:id="@+id/tor_disclaimer" |