summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2023-08-30 17:30:23 +0000
committercyberta <cyberta@riseup.net>2023-08-30 17:30:23 +0000
commit9ad95a20f7500e3b52ae0cc50609635e8c73205f (patch)
treef1a7ba3733ed3486c2a7b589c7c19254d64f6006 /app/src/main/res
parent609ea1e6185055d8b67bcdd8f2a029a29b15241e (diff)
parent0022b01b34a290b27f859f3e8e231d504d473898 (diff)
Merge branch 'fix_notification_requests' into 'master'
fix notification permission handling, also covering the case of an app update... Closes #9139 See merge request leap/bitmask_android!255
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_setup.xml29
1 files changed, 29 insertions, 0 deletions
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 5fff1154..6a2c5209 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -46,6 +46,7 @@
app:cardCornerRadius="6dp"
app:cardElevation="0dp"
android:layout_margin="4dp"
+ android:visibility="gone"
>
<View
android:layout_width="match_parent"
@@ -58,6 +59,20 @@
app:cardCornerRadius="6dp"
app:cardElevation="0dp"
android:layout_margin="4dp"
+ android:visibility="gone"
+ >
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/colorPrimary"/>
+ </androidx.cardview.widget.CardView>
+ <androidx.cardview.widget.CardView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ app:cardCornerRadius="6dp"
+ app:cardElevation="0dp"
+ android:layout_margin="4dp"
+ android:visibility="gone"
>
<View
android:layout_width="match_parent"
@@ -70,6 +85,20 @@
app:cardCornerRadius="6dp"
app:cardElevation="0dp"
android:layout_margin="4dp"
+ android:visibility="gone"
+ >
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/colorPrimary"/>
+ </androidx.cardview.widget.CardView>
+ <androidx.cardview.widget.CardView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ app:cardCornerRadius="6dp"
+ app:cardElevation="0dp"
+ android:layout_margin="4dp"
+ android:visibility="gone"
>
<View
android:layout_width="match_parent"