diff options
Diffstat (limited to 'app/src/main/res/layout')
4 files changed, 6 insertions, 46 deletions
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index 3eb9168..e6e226f 100644 --- a/app/src/main/res/layout/apptrackers_fragment.xml +++ b/app/src/main/res/layout/apptrackers_fragment.xml @@ -60,31 +60,12 @@ android:layout_weight="1" android:text="@string/apptrackers_block_all_toggle" /> - <androidx.constraintlayout.widget.ConstraintLayout + <Switch + android:id="@+id/block_all_toggle" android:layout_width="wrap_content" - android:layout_height="wrap_content"> - - <Switch - android:id="@+id/block_all_toggle" - android:layout_width="wrap_content" - android:layout_height="24dp" - android:checked="true" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - /> - <View - android:id="@+id/block_all_toggle_clicker" - android:layout_width="0dp" - android:layout_height="0dp" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - android:clickable="true" - /> - </androidx.constraintlayout.widget.ConstraintLayout> + android:layout_height="24dp" + android:checked="true" + /> </LinearLayout> <View android:layout_width="match_parent" diff --git a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml index 20e0bdc..8cf7b2e 100644 --- a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml +++ b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml @@ -21,28 +21,10 @@ tools:text="Body sensor" /> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content"> <Switch android:id="@+id/toggle" android:layout_width="wrap_content" android:layout_height="24dp" android:checked="true" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> - <View - android:id="@+id/toggle_clicker" - android:layout_width="0dp" - android:layout_height="0dp" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - android:clickable="true" - /> - </androidx.constraintlayout.widget.ConstraintLayout> </androidx.appcompat.widget.LinearLayoutCompat> diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index d2cb53c..d79dea1 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -13,7 +13,6 @@ android:layout_width="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" > - <LinearLayout android:background="@color/background" android:gravity="center_horizontal" @@ -200,7 +199,6 @@ android:text="@string/dashboard_state_ipaddress_off" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/graph" /> - <View android:id="@+id/graph_legend_blocked_icon" android:layout_width="16dp" diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml index 64432cb..47b86bf 100644 --- a/app/src/main/res/layout/fragment_fake_location.xml +++ b/app/src/main/res/layout/fragment_fake_location.xml @@ -9,6 +9,7 @@ android:layout_width="match_parent" > + <include layout="@layout/topbar" /> <androidx.core.widget.NestedScrollView @@ -16,7 +17,6 @@ android:layout_width="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" > - <LinearLayout android:layout_height="match_parent" android:padding="16dp" @@ -24,7 +24,6 @@ android:orientation="vertical" tools:context=".main.MainActivity" > - <TextView android:id="@+id/fake_location_info" android:layout_gravity="center_horizontal" |