caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #9 from MilosKozak/master

Browse source 
update to Milos master
This commit is contained in:
AdrianLxM 2016-11-09 12:41:11 +01:00 committed by GitHub
parent d3582dab36 8707b42526
commit 3a84abb4f1
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -27,7 +27,7 @@ def generateGitBuild = { ->
String commitObject = stdout.toString().trim() String commitObject = stdout.toString().trim()
stringBuilder.append(commitObject) stringBuilder.append(commitObject)
} catch (ignored) { } catch (ignored) {
return "NoGitSystemAvailable"; stringBuilder.append('NoGitSystemAvailable')
} }
stringBuilder.append('-') stringBuilder.append('-')
stringBuilder.append((new Date()).format('yyyy.MM.dd')) stringBuilder.append((new Date()).format('yyyy.MM.dd'))

14
app/src/main/java/info/nightscout/androidaps/MainActivity.java
View file

@ -1,5 +1,6 @@
package info.nightscout.androidaps; package info.nightscout.androidaps;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@ -7,6 +8,7 @@ import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
@ -110,7 +112,17 @@ public class MainActivity extends AppCompatActivity {
startActivity(i); startActivity(i);
break; break;
case R.id.nav_resetdb: case R.id.nav_resetdb:
MainApp.getDbHelper().resetDatabases(); new AlertDialog.Builder(this)
.setTitle(R.string.nav_resetdb)
.setMessage(R.string.reset_db_confirm)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override public void onClick(DialogInterface dialog, int which) {
MainApp.getDbHelper().resetDatabases();
}
})
.create()
.show();
break; break;
case R.id.nav_export: case R.id.nav_export:
ImportExportPrefs.verifyStoragePermissions(this); ImportExportPrefs.verifyStoragePermissions(this);

3
app/src/main/res/values/strings.xml
View file

@ -8,7 +8,8 @@
<string name="nav_refreshtreatments">Refresh treatments from NS</string> <string name="nav_refreshtreatments">Refresh treatments from NS</string>
<string name="nav_backup">Backup</string> <string name="nav_backup">Backup</string>
<string name="nav_test_alert">Test alarm</string> <string name="nav_test_alert">Test alarm</string>
<string name="nav_resetdb">Reset databases</string> <string name="nav_resetdb">Reset Databases</string>
<string name="reset_db_confirm">Do you really want to reset the databases?</string>
<string name="nav_exit">Exit</string> <string name="nav_exit">Exit</string>
<string name="danar_useextended_title">Use extended boluses for >200%</string> <string name="danar_useextended_title">Use extended boluses for >200%</string>
<string name="danar_bt_name_title">DanaR Bluetooth device</string> <string name="danar_bt_name_title">DanaR Bluetooth device</string>