From aadfdb3ccc2bd864a064d8fd6c9ca21028900972 Mon Sep 17 00:00:00 2001 From: Sebastien Vrillaud Date: Mon, 22 May 2017 18:38:24 +0200 Subject: [PATCH] Bump version to 2.1.0 --- .idea/.name | 1 - .idea/codeStyleSettings.xml | 201 ------------------ .idea/compiler.xml | 23 -- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 5 - .idea/gradle.xml | 19 -- .idea/libraries/antpluginlib.xml | 9 - .idea/libraries/appcompat_v7_22_0_0.xml | 13 -- .idea/libraries/fit.xml | 9 - .../libraries/floatingactionbutton_1_3_0.xml | 13 -- .idea/libraries/graphview_4_0_1.xml | 10 - .idea/libraries/hmmapiwsble.xml | 9 - .idea/libraries/httpcore_4_3_2.xml | 11 - .idea/libraries/httpmime_4_3_3.xml | 11 - .idea/libraries/library_2_4_0.xml | 11 - .idea/libraries/play_services_base_7_3_0.xml | 10 - .../libraries/play_services_fitness_7_3_0.xml | 10 - .../play_services_location_7_3_0.xml | 10 - .idea/libraries/play_services_maps_7_3_0.xml | 10 - .idea/libraries/recyclerview_v7_21_0_3.xml | 12 -- .../libraries/support_annotations_22_0_0.xml | 11 - .idea/libraries/support_v4_22_0_0.xml | 13 -- .idea/misc.xml | 10 - .idea/modules.xml | 11 - .idea/scopes/scope_settings.xml | 5 - .idea/vcs.xml | 6 - WeightLogger.iml | 2 +- app/app.iml | 85 +++++--- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 4 +- .../weightlogger/WeightLoggerActivity.java | 2 + .../fragments/PreferencesFragment.java | 2 +- app/src/main/res/menu/home_actionbar.xml | 4 +- .../src/main/res}/values-zh/strings.xml | 4 +- app/src/main/res/values/strings.xml | 2 +- viewflow/viewflow.iml | 56 ++--- 36 files changed, 95 insertions(+), 524 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/libraries/antpluginlib.xml delete mode 100644 .idea/libraries/appcompat_v7_22_0_0.xml delete mode 100644 .idea/libraries/fit.xml delete mode 100644 .idea/libraries/floatingactionbutton_1_3_0.xml delete mode 100644 .idea/libraries/graphview_4_0_1.xml delete mode 100644 .idea/libraries/hmmapiwsble.xml delete mode 100644 .idea/libraries/httpcore_4_3_2.xml delete mode 100644 .idea/libraries/httpmime_4_3_3.xml delete mode 100644 .idea/libraries/library_2_4_0.xml delete mode 100644 .idea/libraries/play_services_base_7_3_0.xml delete mode 100644 .idea/libraries/play_services_fitness_7_3_0.xml delete mode 100644 .idea/libraries/play_services_location_7_3_0.xml delete mode 100644 .idea/libraries/play_services_maps_7_3_0.xml delete mode 100644 .idea/libraries/recyclerview_v7_21_0_3.xml delete mode 100644 .idea/libraries/support_annotations_22_0_0.xml delete mode 100644 .idea/libraries/support_v4_22_0_0.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml rename {res => app/src/main/res}/values-zh/strings.xml (98%) diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index e47fd56..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -WeightLogger \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 4c5388c..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af47..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 1b2e5d8..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/antpluginlib.xml b/.idea/libraries/antpluginlib.xml deleted file mode 100644 index 33e9047..0000000 --- a/.idea/libraries/antpluginlib.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_22_0_0.xml b/.idea/libraries/appcompat_v7_22_0_0.xml deleted file mode 100644 index d59dc81..0000000 --- a/.idea/libraries/appcompat_v7_22_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/fit.xml b/.idea/libraries/fit.xml deleted file mode 100644 index c065063..0000000 --- a/.idea/libraries/fit.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/floatingactionbutton_1_3_0.xml b/.idea/libraries/floatingactionbutton_1_3_0.xml deleted file mode 100644 index 525b74a..0000000 --- a/.idea/libraries/floatingactionbutton_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/graphview_4_0_1.xml b/.idea/libraries/graphview_4_0_1.xml deleted file mode 100644 index 0f96bbd..0000000 --- a/.idea/libraries/graphview_4_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/hmmapiwsble.xml b/.idea/libraries/hmmapiwsble.xml deleted file mode 100644 index 4539bb9..0000000 --- a/.idea/libraries/hmmapiwsble.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/httpcore_4_3_2.xml b/.idea/libraries/httpcore_4_3_2.xml deleted file mode 100644 index 69f65f0..0000000 --- a/.idea/libraries/httpcore_4_3_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/httpmime_4_3_3.xml b/.idea/libraries/httpmime_4_3_3.xml deleted file mode 100644 index 2a373f6..0000000 --- a/.idea/libraries/httpmime_4_3_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/library_2_4_0.xml b/.idea/libraries/library_2_4_0.xml deleted file mode 100644 index eedfc0d..0000000 --- a/.idea/libraries/library_2_4_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_base_7_3_0.xml b/.idea/libraries/play_services_base_7_3_0.xml deleted file mode 100644 index 65e3122..0000000 --- a/.idea/libraries/play_services_base_7_3_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_fitness_7_3_0.xml b/.idea/libraries/play_services_fitness_7_3_0.xml deleted file mode 100644 index de34056..0000000 --- a/.idea/libraries/play_services_fitness_7_3_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_location_7_3_0.xml b/.idea/libraries/play_services_location_7_3_0.xml deleted file mode 100644 index 663bb3d..0000000 --- a/.idea/libraries/play_services_location_7_3_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_maps_7_3_0.xml b/.idea/libraries/play_services_maps_7_3_0.xml deleted file mode 100644 index 81d4d19..0000000 --- a/.idea/libraries/play_services_maps_7_3_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_21_0_3.xml b/.idea/libraries/recyclerview_v7_21_0_3.xml deleted file mode 100644 index c498c20..0000000 --- a/.idea/libraries/recyclerview_v7_21_0_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_22_0_0.xml b/.idea/libraries/support_annotations_22_0_0.xml deleted file mode 100644 index 2d5c969..0000000 --- a/.idea/libraries/support_annotations_22_0_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_22_0_0.xml b/.idea/libraries/support_v4_22_0_0.xml deleted file mode 100644 index 9b75186..0000000 --- a/.idea/libraries/support_v4_22_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 59436c9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 91cc6e4..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/WeightLogger.iml b/WeightLogger.iml index 146c691..0ce8e6f 100644 --- a/WeightLogger.iml +++ b/WeightLogger.iml @@ -8,7 +8,7 @@ - + diff --git a/app/app.iml b/app/app.iml index 8bf7210..241cd45 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,11 @@ - + - + + - + + - + - + + + + + + + + - + + + + + + + + - + - + + - - - - - - - - + + + + + + + - - + + + + + + - - - - - - - - + + + + + + + - - + + + + diff --git a/app/build.gradle b/app/build.gradle index dea6c58..e43fe81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { buildTypes { release { minifyEnabled false - shrinkResources true + shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 823e5fa..9578239 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="23" + android:versionName="2.1.0"> diff --git a/app/src/main/java/org/kochka/android/weightlogger/WeightLoggerActivity.java b/app/src/main/java/org/kochka/android/weightlogger/WeightLoggerActivity.java index c5ec5b7..4067eef 100644 --- a/app/src/main/java/org/kochka/android/weightlogger/WeightLoggerActivity.java +++ b/app/src/main/java/org/kochka/android/weightlogger/WeightLoggerActivity.java @@ -164,12 +164,14 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.item_preferences: startActivityForResult(new Intent(this, EditPreferences.class), 0); break; + /* case R.id.item_ant: antTest(); break; case R.id.item_ble_smartlab: bleTest(); break; + */ case 1: this.finish(); return true; diff --git a/app/src/main/java/org/kochka/android/weightlogger/fragments/PreferencesFragment.java b/app/src/main/java/org/kochka/android/weightlogger/fragments/PreferencesFragment.java index 2c05753..9b441a4 100644 --- a/app/src/main/java/org/kochka/android/weightlogger/fragments/PreferencesFragment.java +++ b/app/src/main/java/org/kochka/android/weightlogger/fragments/PreferencesFragment.java @@ -250,7 +250,7 @@ public void run() { /* Display "About" dialog */ private void showAbout() { String message = "v" + getString(R.string.app_version); - message += "\nSébastien Vrillaud © 2015"; + message += "\nSébastien Vrillaud © 2017"; if (!getString(R.string.translator).equals("")) { message += "\n\n" + Locale.getDefault().getDisplayLanguage().substring(0,1).toUpperCase() + Locale.getDefault().getDisplayLanguage().substring(1); diff --git a/app/src/main/res/menu/home_actionbar.xml b/app/src/main/res/menu/home_actionbar.xml index 5683556..33085aa 100644 --- a/app/src/main/res/menu/home_actionbar.xml +++ b/app/src/main/res/menu/home_actionbar.xml @@ -5,6 +5,6 @@ - - + \ No newline at end of file diff --git a/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml similarity index 98% rename from res/values-zh/strings.xml rename to app/src/main/res/values-zh/strings.xml index 75bb73a..847e45f 100644 --- a/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -17,9 +17,7 @@ --> - Weight Logger - 1.1.3 - + DT27 编辑 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db581e1..9fc0247 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,7 @@ Weight Logger - 2.0.0 + 2.1.0 diff --git a/viewflow/viewflow.iml b/viewflow/viewflow.iml index 10a0c5b..38da476 100644 --- a/viewflow/viewflow.iml +++ b/viewflow/viewflow.iml @@ -9,79 +9,87 @@ - + - + + - + + - + - + + + + + + + + - + + + + + + + + - - + + - - - - - - - + + - - - + +