Skip to content

Commit 5240375

Browse files
author
Paolo Rotolo
committed
Update strings. Releasing 0.12.0.
1 parent 0668ee7 commit 5240375

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
defaultConfig {
3333
minSdkVersion 16
3434
targetSdkVersion 23
35-
versionCode 19
36-
versionName '0.11.0'
35+
versionCode 20
36+
versionName '0.12.0'
3737
applicationId "org.glucosio.android"
3838

3939
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'

app/src/main/java/org/glucosio/android/activity/MainActivity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,10 @@ public void openBackupDialog() {
389389
public void onClick(DialogInterface dialog, int which) {
390390
if (which == 0) {
391391
if (checkPlayServices()) {
392-
Intent intent = new Intent(getApplicationContext(), BackupActivity.class);
393-
startActivity(intent);
392+
// TODO: Finish backup in next release
393+
/*Intent intent = new Intent(getApplicationContext(), BackupActivity.class);
394+
startActivity(intent);*/
395+
Toast.makeText(getApplicationContext(), R.string.preferences_coming_soon, Toast.LENGTH_SHORT).show();
394396
} else {
395397
dialog.dismiss();
396398
}

app/src/main/res/values/strings.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<string name="preferences_about">About</string>
154154
<string translatable="false" name="preferences_experimental_title">Here be dragons :/</string>
155155
<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>
156-
<string name="version" translatable="false">0.11.0 (Imli)</string>
156+
<string name="version" translatable="false">0.12.0 (Imli)</string>
157157
<string name="preferences_version">Version</string>
158158
<string name="preferences_coming_soon">Coming soon...</string>
159159
<string name="preferences_terms">Terms of use</string>
@@ -395,13 +395,24 @@
395395
<string name="menu_backup_backup">Backup on Google Drive</string>
396396
<string name="menu_backup_restore">Restore</string>
397397
<string name="menu_backup_csv">CSV export</string>
398+
<string name="activity_backup_drive_automatic">Automatic backup</string>
399+
<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>
398400
<string name="activity_backup_drive_message_restart">Restarting to apply changes...</string>
399401
<string name="activity_backup_drive_desc_1">Sync Glucosio\'s database in the cloud with Google Drive.</string>
400402
<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>
401403
<string name="activity_backup_drive_success">Database correctly uploaded on Drive</string>
402404
<string name="activity_backup_drive_restore_success">Correctly restored database from Drive</string>
403405
<string name="activity_backup_drive_failed">Something went wrong. Please try again :/</string>
406+
<string name="activity_backup_drive_last">Last backup:</string>
407+
<string name="activity_backup_drive_folder">Backup folder</string>
404408
<string name="activity_backup_drive_button_backup">Backup now</string>
409+
<string name="activity_backup_drive_recent">Recent backups</string>
410+
<string name="activity_backup_drive_more">See more Backups</string>
411+
<string name="activity_backup_drive_dialog_restore_title">Revert to previous version</string>
412+
<string name="activity_backup_drive_dialog_restore_desc">Restoring the backup will overwrite all the existing data with the backup.</string>
413+
<string name="activity_backup_drive_dialog_restore_details">Backup details</string>
414+
<string name="activity_backup_drive_dialog_restore_button_cancel">Cancel</string>
415+
<string name="activity_backup_drive_dialog_restore_button_restore">Restore backup</string>
405416
<string name="activity_backup_drive_button_restore">Restore from Drive</string>
406417
<string name="activity_backup_drive_error_restore">Unable to find a valid backup to restore from Drive</string>
407418
<string name="activity_main_error_play_services">Glucosio needs Play Services to enable Google Drive backup.</string>

wear/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
applicationId "org.glucosio.android"
3030
minSdkVersion 21
3131
targetSdkVersion 23
32-
versionCode 19
33-
versionName '0.11.0'
32+
versionCode 20
33+
versionName '0.12.0'
3434
}
3535
buildTypes {
3636
debug {

0 commit comments

Comments
 (0)