From cac2c849e8d7d35bd9c72fc8c9bb8bc322eb24a0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 12 Nov 2022 22:21:31 +0100
Subject: create UI for message of the day

---
 app/src/main/res/drawable-hdpi/ic_arrow_right.png  | Bin 0 -> 562 bytes
 app/src/main/res/drawable-ldpi/ic_arrow_right.png  | Bin 0 -> 458 bytes
 app/src/main/res/drawable-mdpi/ic_arrow_right.png  | Bin 0 -> 551 bytes
 app/src/main/res/drawable-xhdpi/ic_arrow_right.png | Bin 0 -> 753 bytes
 .../main/res/drawable-xxhdpi/ic_arrow_right.png    | Bin 0 -> 784 bytes
 .../main/res/drawable-xxxhdpi/ic_arrow_right.png   | Bin 0 -> 1168 bytes
 app/src/main/res/layout/f_motd.xml                 | 116 +++++++++++++++++++++
 7 files changed, 116 insertions(+)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_right.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_arrow_right.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_right.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_right.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_right.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png
 create mode 100644 app/src/main/res/layout/f_motd.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_right.png b/app/src/main/res/drawable-hdpi/ic_arrow_right.png
new file mode 100644
index 00000000..2d081384
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_right.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_arrow_right.png b/app/src/main/res/drawable-ldpi/ic_arrow_right.png
new file mode 100644
index 00000000..7fc572af
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_arrow_right.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_right.png b/app/src/main/res/drawable-mdpi/ic_arrow_right.png
new file mode 100644
index 00000000..60702e35
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_right.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_right.png b/app/src/main/res/drawable-xhdpi/ic_arrow_right.png
new file mode 100644
index 00000000..f1f4f691
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_right.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png
new file mode 100644
index 00000000..e0031ca8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png
new file mode 100644
index 00000000..1b4f4239
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png differ
diff --git a/app/src/main/res/layout/f_motd.xml b/app/src/main/res/layout/f_motd.xml
new file mode 100644
index 00000000..3cfe7dfe
--- /dev/null
+++ b/app/src/main/res/layout/f_motd.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:theme="@style/BitmaskTheme"
+    tools:context=".base.fragments.MotdFragment"
+    android:fitsSystemWindows="true">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.1" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.9" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.85" />
+
+    <!-- The primary full-screen view. This can be replaced with whatever view
+         is needed to present your content, e.g. VideoView, SurfaceView,
+         TextureView, etc. -->
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
+        app:layout_constraintLeft_toLeftOf="@+id/guideline_left"
+        app:layout_constraintRight_toRightOf="@+id/guideline_right"
+        android:clipChildren="true"
+        android:fillViewport="true"
+        >
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            >
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_sv_top"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.1" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_sv_center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.4" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/motd_icon"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                app:layout_constraintTop_toTopOf="@id/guideline_sv_top"
+                app:layout_constraintBottom_toTopOf="@+id/guideline_sv_center"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                android:src="@drawable/donation_img"
+                android:scaleType="fitXY"
+                android:visibility="gone" />
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/motd_icon_circle"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                app:layout_constraintTop_toTopOf="@id/guideline_sv_top"
+                app:layout_constraintBottom_toTopOf="@+id/guideline_sv_center"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                android:src="@drawable/donation_img"
+                android:visibility="visible"
+                />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/motd_content"
+                app:layout_constraintTop_toBottomOf="@+id/guideline_sv_center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/standard_margin"
+                android:gravity="center_horizontal"
+                android:keepScreenOn="true"
+                android:padding="@dimen/stdpadding"
+                android:elegantTextHeight="true"
+                android:autoSizeTextType="uniform"
+                android:text=" aaa aaa aaa aaaaaaaaaaaaaaaaaaaa \n\n\”ssdfsdf Riseup's services are funded by donations from people like you. We try not to ask too often, but we have to ask sometimes. Please consider making a https://riseup.net/donate donation if you value this freely available service, appreciate that we don't track or sell your data, or want to support people around the world working towards liberatory social change."
+                android:textSize="16sp"
+                android:textStyle="bold" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/next_btn"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_alignParentBottom="true"
+        android:src="@drawable/ic_arrow_right"
+        android:text="next"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 1a9004432b1733ae30f9cc8ebb85a70af8d93d34 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 12 Nov 2022 23:18:12 +0100
Subject: use gradient for motd background, simple button style

---
 app/src/main/res/drawable/background_motd.xml |  9 ++++++
 app/src/main/res/layout/f_motd.xml            | 42 +++++++++++++++------------
 app/src/main/res/values/colors.xml            |  1 +
 3 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/drawable/background_motd.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/background_motd.xml b/app/src/main/res/drawable/background_motd.xml
new file mode 100644
index 00000000..519e0233
--- /dev/null
+++ b/app/src/main/res/drawable/background_motd.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <gradient android:startColor="@color/black_high_transparent"
+        android:endColor="@color/white_transparent"
+        android:angle="90"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_motd.xml b/app/src/main/res/layout/f_motd.xml
index 3cfe7dfe..3202e95b 100644
--- a/app/src/main/res/layout/f_motd.xml
+++ b/app/src/main/res/layout/f_motd.xml
@@ -8,26 +8,13 @@
     tools:context=".base.fragments.MotdFragment"
     android:fitsSystemWindows="true">
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_left"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.1" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_right"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.9" />
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_bottom"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.85" />
+        app:layout_constraintBottom_toTopOf="@+id/next_btn"
+        />
 
     <!-- The primary full-screen view. This can be replaced with whatever view
          is needed to present your content, e.g. VideoView, SurfaceView,
@@ -37,10 +24,11 @@
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
-        app:layout_constraintLeft_toLeftOf="@+id/guideline_left"
-        app:layout_constraintRight_toRightOf="@+id/guideline_right"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         android:clipChildren="true"
         android:fillViewport="true"
+        android:background="@drawable/background_motd"
         >
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -49,6 +37,21 @@
             android:orientation="vertical"
             >
 
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_sv_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.15" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_sv_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.85" />
+
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideline_sv_top"
                 android:layout_width="wrap_content"
@@ -88,8 +91,10 @@
                 />
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/motd_content"
+                app:layout_constraintLeft_toLeftOf="@id/guideline_sv_left"
+                app:layout_constraintRight_toRightOf="@+id/guideline_sv_right"
                 app:layout_constraintTop_toBottomOf="@+id/guideline_sv_center"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginVertical="@dimen/standard_margin"
                 android:gravity="center_horizontal"
@@ -110,6 +115,7 @@
         android:layout_height="80dp"
         android:layout_alignParentBottom="true"
         android:src="@drawable/ic_arrow_right"
+        android:background="?attr/selectableItemBackground"
         android:text="next"
         />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 792db1ee..40b51436 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,6 +35,7 @@
     <color name="white">#ffffff</color>
     <color name="white_transparent">#20ffffff</color>
     <color name="black_transparent">#20000000</color>
+    <color name="black_high_transparent">#05000000</color>
 
     <color name="colorActionBarTitleFont">@color/white</color>
     <color name="colorActionBarSubtitleFont">@color/black800</color>
-- 
cgit v1.2.3


From d38845aedd6e7df50b5ffbb0627107a4eced95bd Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 13 Nov 2022 00:19:24 +0100
Subject: allow set motd image in custom branded versions

---
 app/src/main/res/drawable/motd_img.xml | 18 ++++++++++++++++++
 app/src/main/res/layout/f_motd.xml     | 14 +-------------
 2 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/motd_img.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/motd_img.xml b/app/src/main/res/drawable/motd_img.xml
new file mode 100644
index 00000000..4a330b8f
--- /dev/null
+++ b/app/src/main/res/drawable/motd_img.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/background_main"
+        android:gravity="fill_horizontal|fill_vertical"/>
+
+    <item
+        android:top="50dp"
+        android:bottom="50dp"
+        android:left="50dp"
+        android:right="50dp"
+        >
+        <bitmap
+            android:src="@drawable/logo"
+            android:gravity="center" />
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_motd.xml b/app/src/main/res/layout/f_motd.xml
index 3202e95b..6e763c75 100644
--- a/app/src/main/res/layout/f_motd.xml
+++ b/app/src/main/res/layout/f_motd.xml
@@ -66,18 +66,6 @@
                 android:orientation="horizontal"
                 app:layout_constraintGuide_percent="0.4" />
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/motd_icon"
-                android:layout_width="120dp"
-                android:layout_height="120dp"
-                app:layout_constraintTop_toTopOf="@id/guideline_sv_top"
-                app:layout_constraintBottom_toTopOf="@+id/guideline_sv_center"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                android:src="@drawable/donation_img"
-                android:scaleType="fitXY"
-                android:visibility="gone" />
-
             <de.hdodenhof.circleimageview.CircleImageView
                 android:id="@+id/motd_icon_circle"
                 android:layout_width="120dp"
@@ -86,7 +74,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/guideline_sv_center"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                android:src="@drawable/donation_img"
+                android:src="@drawable/motd_img"
                 android:visibility="visible"
                 />
             <androidx.appcompat.widget.AppCompatTextView
-- 
cgit v1.2.3