Merge branch 'motd' into 'master'

Motd

Closes #9082

See merge request leap/bitmask_android!213

10 files changed, 138 insertions, 0 deletions

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
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_right.png
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
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_arrow_right.png
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
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_right.png
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
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_right.png
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
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_right.png
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
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right.png
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/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
new file mode 100644
index 00000000..6e763c75
--- /dev/null
+++ b/app/src/main/res/layout/f_motd.xml
@@ -0,0 +1,110 @@
+<?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_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        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,
+         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="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"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            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"
+                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" />
+
+            <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/motd_img"
+                android:visibility="visible"
+                />
+            <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="0dp"
+                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:background="?attr/selectableItemBackground"
+        android:text="next"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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>