diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/fragment_dashboard.xml | 31 | ||||
| -rw-r--r-- | app/src/main/res/layout/widget.xml | 50 |
2 files changed, 57 insertions, 24 deletions
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 8b8792b..cedf569 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -42,12 +42,6 @@ android:textSize="14sp" android:textColor="@color/secondary_text" /> - <Switch - android:id="@+id/toggle_privacy_central" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_margin="16dp" - /> </LinearLayout> <View android:layout_width="match_parent" @@ -69,8 +63,9 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="8dp" + android:gravity="center_horizontal" > + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -89,13 +84,19 @@ android:textColor="@color/primary_text" android:textAllCaps="true" /> + <Switch + android:id="@+id/toggle_trackers" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_margin="12dp" + /> </LinearLayout> <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="8dp" + android:gravity="center_horizontal" > <TextView android:layout_width="wrap_content" @@ -115,13 +116,19 @@ android:textColor="@color/primary_text" android:textAllCaps="true" /> + <Switch + android:id="@+id/toggle_location" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_margin="12dp" + /> </LinearLayout> <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="8dp" + android:gravity="center_horizontal" > <TextView android:layout_width="wrap_content" @@ -148,6 +155,12 @@ android:text="@string/dashboard_state_ipaddress_off" android:layout_height="16dp" android:indeterminate="true" android:visibility="visible"/> + <Switch + android:id="@+id/toggle_ipscrambling" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_margin="12dp" + /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml index 60cbffa..1e78bc7 100644 --- a/app/src/main/res/layout/widget.xml +++ b/app/src/main/res/layout/widget.xml @@ -72,13 +72,6 @@ android:textSize="12sp" android:textColor="@color/on_primary_medium_emphasis" /> - <ImageView - android:id="@+id/toggle_privacy_central" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_switch_disabled" - /> - </LinearLayout> <LinearLayout android:layout_width="match_parent" @@ -92,6 +85,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" + android:gravity="center_horizontal" > <TextView android:id="@+id/trackers_label" @@ -106,11 +100,19 @@ <TextView android:id="@+id/state_trackers" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="18dp" android:text="@string/dashboard_state_trackers_off" - android:textSize="14sp" + android:textSize="12sp" android:textColor="@color/on_primary_high_emphasis" android:textAllCaps="true" + android:gravity="center" + /> + <ImageView + android:id="@+id/toggle_trackers" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:src="@drawable/ic_switch_disabled" /> </LinearLayout> <LinearLayout @@ -118,6 +120,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" + android:gravity="center_horizontal" > <TextView android:id="@+id/geolocation_label" @@ -132,11 +135,19 @@ <TextView android:id="@+id/state_geolocation" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="18dp" android:text="@string/dashboard_state_geolocation_off" - android:textSize="14sp" + android:textSize="12sp" android:textColor="@color/on_primary_high_emphasis" android:textAllCaps="true" + android:gravity="center" + /> + <ImageView + android:id="@+id/toggle_location" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:src="@drawable/ic_switch_disabled" /> </LinearLayout> <LinearLayout @@ -144,6 +155,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" + android:gravity="center_horizontal" > <TextView android:id="@+id/ip_address_label" @@ -158,19 +170,27 @@ <TextView android:id="@+id/state_ip_address" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="18dp" android:text="@string/dashboard_state_ipaddress_off" - android:textSize="14sp" + android:textSize="12sp" android:textColor="@color/on_primary_high_emphasis" android:textAllCaps="true" android:visibility="gone" + android:gravity="center" /> <ProgressBar android:id="@+id/state_ip_address_loader" - android:layout_width="16dp" - android:layout_height="16dp" + android:layout_width="18dp" + android:layout_height="18dp" android:indeterminate="true" android:visibility="visible"/> + <ImageView + android:id="@+id/toggle_ipscrambling" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:src="@drawable/ic_switch_disabled" + /> </LinearLayout> </LinearLayout> |