From f09d35e55ad3519436521558f6795559b2a385a3 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 31 May 2016 19:49:27 +0200
Subject: add database importer

---
 src/main/res/layout/welcome.xml | 20 ++++++++++++++++++++
 src/main/res/values/ids.xml     |  1 +
 src/main/res/values/strings.xml |  3 +++
 3 files changed, 24 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 813570759..2fb9667a5 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -43,6 +43,26 @@
                 android:textColor="@color/black87"
                 android:textSize="?attr/TextSizeBody" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/import_text"
+                android:textColor="@color/black87"
+                android:textSize="?attr/TextSizeBody"
+                android:visibility="gone"
+                android:id="@id/import_text" />
+
+            <Button
+                android:id="@+id/import_database"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:text="@string/import_database"
+                android:textColor="@color/accent"
+                android:visibility="gone" />
+
             <Button
                 android:id="@+id/create_account"
                 style="?android:attr/borderlessButtonStyle"
diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml
index 75f75673b..0786006cf 100644
--- a/src/main/res/values/ids.xml
+++ b/src/main/res/values/ids.xml
@@ -3,4 +3,5 @@
     <item name="snackbar_location_message" type="id" />
     <item name="message_image_view" type="id" />
     <item name="message_video_view" type="id" />
+    <item name="import_text" type="id" />
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f25918008..b71122003 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -642,5 +642,8 @@
 	<string name="conference_subject">Subject</string>
 	<string name="choose_participants">Choose participants</string>
 	<string name="creating_conference">Creating conference…</string>
+	<string name="import_text">There is a backup on your device. Shall the backup be imported?</string>
+	<string name="import_database">import backup</string>
+	<string name="import_failed">The import has failed</string>
 
 </resources>
-- 
cgit v1.2.3