diff options
| author | Abhishek Aggarwal <warabhishek@e.email> | 2022-04-13 14:26:50 +0000 |
|---|---|---|
| committer | Abhishek Aggarwal <warabhishek@e.email> | 2022-04-13 14:26:50 +0000 |
| commit | 5658347ab0099c4f512e19a3807d38758396114a (patch) | |
| tree | d3843d84ed1da95f9f43a34bd1fc82c480b789cf /app/src/main/res/layout | |
| parent | 714db561375e369a9bc080447de6a7b5e619870b (diff) | |
| parent | 14815678aaa5020e81f0cca9274f289e6ac7e2d5 (diff) | |
Merge branch '5249_alpha_issues' into 'main'
Fix 5249 5255 5248 alpha issues
See merge request e/privacy-central/privacycentralapp!41
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/apptrackers_fragment.xml | 27 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_dashboard.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_trackers.xml | 8 |
3 files changed, 43 insertions, 4 deletions
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index b0b9e71..3eb9168 100644 --- a/app/src/main/res/layout/apptrackers_fragment.xml +++ b/app/src/main/res/layout/apptrackers_fragment.xml @@ -60,10 +60,31 @@ android:layout_weight="1" android:text="@string/apptrackers_block_all_toggle" /> - <Switch - android:id="@+id/block_all_toggle" + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="wrap_content" - android:layout_height="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> </LinearLayout> <View android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index ff64733..d2cb53c 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -168,6 +168,18 @@ android:text="@string/dashboard_state_ipaddress_off" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> + <TextView + android:id="@+id/graph_subtitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/graph_subtitle" + android:layout_marginLeft="16dp" + android:paddingTop="4dp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/graph_title" + android:textColor="@color/secondary_text" + android:textSize="14sp" + /> <com.github.mikephil.charting.charts.BarChart android:id="@+id/graph" diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml index 2122816..7ee4d29 100644 --- a/app/src/main/res/layout/fragment_trackers.xml +++ b/app/src/main/res/layout/fragment_trackers.xml @@ -35,10 +35,16 @@ android:lineSpacingExtra="5sp" android:text="@string/trackers_info" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/graph_subtitle" + android:paddingTop="24dp" + /> <include layout="@layout/trackers_item_graph" android:id="@+id/graph_day" - android:layout_marginTop="32dp" + android:layout_marginTop="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" app:period="@{@string/trackers_period_day}" |