aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/IntroActivity.java1
-rw-r--r--src/schulchat/res/drawable/background.xml11
-rw-r--r--src/schulchat/res/layout/welcome.xml109
-rw-r--r--src/schulchat/res/values/strings.xml1
4 files changed, 121 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/IntroActivity.java b/src/main/java/de/pixart/messenger/ui/IntroActivity.java
index e7438a87d..d368c3274 100644
--- a/src/main/java/de/pixart/messenger/ui/IntroActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/IntroActivity.java
@@ -1,6 +1,5 @@
package de.pixart.messenger.ui;
-import android.Manifest;
import android.content.Intent;
import android.os.Bundle;
diff --git a/src/schulchat/res/drawable/background.xml b/src/schulchat/res/drawable/background.xml
new file mode 100644
index 000000000..cc4f16b21
--- /dev/null
+++ b/src/schulchat/res/drawable/background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@android:color/transparent" />
+
+ <item>
+ <bitmap
+ android:gravity="center"
+ android:src="@drawable/logo" />
+ </item>
+</layer-list> \ No newline at end of file
diff --git a/src/schulchat/res/layout/welcome.xml b/src/schulchat/res/layout/welcome.xml
new file mode 100644
index 000000000..f697ca443
--- /dev/null
+++ b/src/schulchat/res/layout/welcome.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <include layout="@layout/toolbar" />
+
+ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/color_background_secondary">
+
+ <LinearLayout
+ android:id="@+id/linearLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentBottom="true"
+ android:minHeight="256dp"
+ android:orientation="vertical"
+ android:paddingStart="16dp"
+ android:paddingLeft="16dp"
+ android:paddingEnd="16dp"
+ android:paddingRight="16dp"
+ android:paddingBottom="8dp">
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/welcome_header"
+ android:textAppearance="@style/TextAppearance.Conversations.Title" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/welcome_text"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ <TextView
+ android:id="@id/import_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/import_text"
+ android:textColor="?attr/text_Color_Main"
+ android:textSize="?attr/TextSizeBody"
+ android:visibility="gone" />
+
+ <Button
+ android:id="@+id/import_database"
+ style="@style/Widget.Conversations.Button.Borderless"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:text="@string/import_database"
+ android:textColor="?attr/colorAccent"
+ android:visibility="gone" />
+
+ <Button
+ android:id="@+id/create_account"
+ style="@style/Widget.Conversations.Button.Borderless"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:text="@string/create_account"
+ android:textColor="?attr/colorAccent" />
+
+ <Button
+ android:id="@+id/use_existing_account"
+ style="@style/Widget.Conversations.Button.Borderless"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:text="@string/welcome_existing_account"
+ android:textColor="?attr/colorAccent" />
+ </LinearLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/linearLayout"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:padding="8dp"
+ android:src="@drawable/logo" />
+ </RelativeLayout>
+ </RelativeLayout>
+ </ScrollView>
+</LinearLayout> \ No newline at end of file
diff --git a/src/schulchat/res/values/strings.xml b/src/schulchat/res/values/strings.xml
index 776f7f09d..e5218b527 100644
--- a/src/schulchat/res/values/strings.xml
+++ b/src/schulchat/res/values/strings.xml
@@ -31,6 +31,7 @@
<string name="conversations_backup">Schulchat Messenger backup</string>
<string name="not_a_backup_file">The file you selected is not a Schulchat Messenger backup file</string>
<string name="welcome_header">Welcome to\nSchulchat Messenger</string>
+ <string name="welcome_text">…is a free and secure XMPP/Jabber client for use with kurswahl-online.de.</string>
<string name="intro_whats_xmpp">What is XMPP / Jabber / Schulchat Messenger?</string>
<string name="intro_desc_privacy">Schulchat Messenger will neither sell nor analyze your data and you decide which permissions you grant.</string>
</resources>