Update strings. Releasing 0.12.0.

Glucosio · Apr 26, 2016 · 5240375 · 5240375
1 parent 0668ee7
commit 5240375
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,8 +32,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 19
-        versionName '0.11.0'
+        versionCode 20
+        versionName '0.12.0'
         applicationId "org.glucosio.android"
 
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'

diff --git a/app/src/main/java/org/glucosio/android/activity/MainActivity.java b/app/src/main/java/org/glucosio/android/activity/MainActivity.java
@@ -389,8 +389,10 @@ public void openBackupDialog() {
             public void onClick(DialogInterface dialog, int which) {
                 if (which == 0) {
                     if (checkPlayServices()) {
-                        Intent intent = new Intent(getApplicationContext(), BackupActivity.class);
-                        startActivity(intent);
+                        // TODO: Finish backup in next release
+                        /*Intent intent = new Intent(getApplicationContext(), BackupActivity.class);
+                        startActivity(intent);*/
+                        Toast.makeText(getApplicationContext(), R.string.preferences_coming_soon, Toast.LENGTH_SHORT).show();
                     } else {
                         dialog.dismiss();
                     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -153,7 +153,7 @@
     <string name="preferences_about">About</string>
     <string translatable="false" name="preferences_experimental_title">Here be dragons :/</string>
     <string name="preferences_experimental">These features are experimental and may not fully work and are for early testing by users. Remember that you can shake your phone to send us feedback.</string>
-    <string name="version" translatable="false">0.11.0 (Imli)</string>
+    <string name="version" translatable="false">0.12.0 (Imli)</string>
     <string name="preferences_version">Version</string>
     <string name="preferences_coming_soon">Coming soon...</string>
     <string name="preferences_terms">Terms of use</string>
@@ -395,13 +395,24 @@
     <string name="menu_backup_backup">Backup on Google Drive</string>
     <string name="menu_backup_restore">Restore</string>
     <string name="menu_backup_csv">CSV export</string>
+    <string name="activity_backup_drive_automatic">Automatic backup</string>
+    <string name="activity_backup_drive_desc">Backing up your data to Google Drive allows you to restore all your readings in case you lost or change your phone.</string>
     <string name="activity_backup_drive_message_restart">Restarting to apply changes...</string>
     <string name="activity_backup_drive_desc_1">Sync Glucosio\'s database in the cloud with Google Drive.</string>
     <string name="activity_backup_drive_desc_2">You\'ll be able to restore all your readings if you lost or change phone or sync Glucosio\'s data between your devices.</string>
     <string name="activity_backup_drive_success">Database correctly uploaded on Drive</string>
     <string name="activity_backup_drive_restore_success">Correctly restored database from Drive</string>
     <string name="activity_backup_drive_failed">Something went wrong. Please try again :/</string>
+    <string name="activity_backup_drive_last">Last backup:</string>
+    <string name="activity_backup_drive_folder">Backup folder</string>
     <string name="activity_backup_drive_button_backup">Backup now</string>
+    <string name="activity_backup_drive_recent">Recent backups</string>
+    <string name="activity_backup_drive_more">See more Backups</string>
+    <string name="activity_backup_drive_dialog_restore_title">Revert to previous version</string>
+    <string name="activity_backup_drive_dialog_restore_desc">Restoring the backup will overwrite all the existing data with the backup.</string>
+    <string name="activity_backup_drive_dialog_restore_details">Backup details</string>
+    <string name="activity_backup_drive_dialog_restore_button_cancel">Cancel</string>
+    <string name="activity_backup_drive_dialog_restore_button_restore">Restore backup</string>
     <string name="activity_backup_drive_button_restore">Restore from Drive</string>
     <string name="activity_backup_drive_error_restore">Unable to find a valid backup to restore from Drive</string>
     <string name="activity_main_error_play_services">Glucosio needs Play Services to enable Google Drive backup.</string>

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "org.glucosio.android"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 19
-        versionName '0.11.0'
+        versionCode 20
+        versionName '0.12.0'
     }
     buildTypes {
         debug {