version 1.6.9 beta

* in app updater

6 files changed, 53 insertions, 0 deletions

diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml
new file mode 100644
index 000000000..b8da14415
--- /dev/null
+++ b/src/main/res/layout/activity_updater.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout 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"
+    tools:context="eu.siacs.conversations.ui.UpdaterActivity">
+
+    <TextView android:id="@+id/current_versionName" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true" android:layout_marginTop="16dp"
+        android:text="Current" android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textStyle="bold" />
+
+    <TextView android:id="@+id/versionName" android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New" android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textStyle="bold"
+        android:layout_below="@+id/current_versionName" />
+
+</RelativeLayout>
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 866bb85f8..47214a6b7 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -67,5 +67,10 @@
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>
+    <item
+        android:id="@+id/action_check_updates"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_check_update"/>
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/menu_updater.xml b/src/main/res/menu/menu_updater.xml
new file mode 100644
index 000000000..f52657372
--- /dev/null
+++ b/src/main/res/menu/menu_updater.xml
@@ -0,0 +1,7 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="eu.siacs.conversations.ui.UpdaterActivity">
+    <item android:id="@+id/action_settings" android:title="@string/action_settings"
+        android:orderInCategory="100" app:showAsAction="never" />
+</menu>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index b6e345dfb..dd796042f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -482,4 +482,12 @@
   <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string>
   <string name="pref_use_white_background">Weißen Hintergrund benutzen</string>
   <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
+  <string name="account_status_dns_timeout">Zeitüberschreibung beim DNS</string>
+  <string name="action_check_update">Auf Updates prüfen</string>
+  <string name="current_version">Installierte Version:</string>
+  <string name="new_version">Neue Version: </string>
+  <string name="remind_later">später</string>
+  <string name="title_activity_updater">Update Dienst</string>
+  <string name="update">Aktualisieren</string>
+  <string name="update_available">Eine neuere Version von Conversations ist verfügbar. Jetzt aktualisieren?</string>
 </resources>
diff --git a/src/main/res/values-w820dp/dimens.xml b/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5fe6bde54..8ca3cec86 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -515,4 +515,12 @@
 	<string name="pref_use_white_background">Use white background</string>
 	<string name="pref_use_white_background_summary">Show received messages as black text on a white background</string>
 	<string name="account_status_dns_timeout">Timeout in DNS</string>
+
+	<string name="action_check_update">Check for Updates</string>
+    <string name="title_activity_updater">Update Service</string>
+    <string name="update_available">There is newer version of this application available. Upgrade now?</string>
+    <string name="remind_later">later</string>
+    <string name="update">Update</string>
+    <string name="new_version">New version:</string>
+    <string name="current_version">installed version:</string>
 </resources>