バージョン番号を git のコミットから生成するようにした

4 files changed, 25 insertions, 39 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 18c50db7..e57f7eb1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,13 @@ android {
         applicationId "jp.rhe.smileessence"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 26
-        versionName "1.0.11.1"
+
+        versionName "git -C ${rootDir} describe --tags --long --dirty".execute().text.trim()
+        versionCode "git -C ${rootDir} rev-list HEAD --count".execute().text.trim().toInteger()
+        println "-----------VERSION----------"
+        println "- CODE: " + getVersionCode()
+        println "- NAME: " + getVersionName()
+        println "----------------------------"
     }
     buildTypes {
         debug {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
index f35232d5..94e14c3e 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
@@ -33,11 +33,12 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.text.TextUtils;
 import net.lacolaco.smileessence.Application;
+import net.lacolaco.smileessence.BuildConfig;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.activity.LicenseActivity;
 import net.lacolaco.smileessence.activity.ManageAccountsActivity;
 import net.lacolaco.smileessence.notification.Notificator;
-import net.lacolaco.smileessence.view.dialog.SimpleDialogFragment;
+import net.lacolaco.smileessence.view.dialog.AppInfoDialogFragment;
 
 import static android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 
@@ -90,10 +91,7 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe
     public boolean onPreferenceClick(Preference preference) {
         String key = preference.getKey();
         if (key.contentEquals(getString(R.string.key_setting_application_information))) {
-            SimpleDialogFragment informationDialog = SimpleDialogFragment.newInstance(
-                    R.layout.dialog_app_info,
-                    getString(R.string.dialog_title_about));
-            DialogHelper.showDialog(getActivity(), informationDialog);
+            openAppInfoDialog();
         } else if (key.contentEquals(getString(R.string.key_setting_accounts))) {
             openManageAccountsActivity();
         } else if (key.contentEquals(getString(R.string.key_setting_licenses))) {
@@ -130,6 +128,7 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe
         timelinesPreference.setOnPreferenceChangeListener(this);
         Preference appInfoPreference = findPreference(R.string.key_setting_application_information);
         appInfoPreference.setOnPreferenceClickListener(this);
+        appInfoPreference.setSummary(BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")");
         Preference license = findPreference(R.string.key_setting_licenses);
         license.setOnPreferenceClickListener(this);
     }
@@ -170,6 +169,11 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe
         getActivity().startActivity(intent);
     }
 
+    private void openAppInfoDialog() {
+        AppInfoDialogFragment dialog = new AppInfoDialogFragment();
+        DialogHelper.showDialog(getActivity(), dialog);
+    }
+
     private void setSummaryCurrentValue() {
         EditTextPreference textSizePreference = (EditTextPreference) findPreference(R.string.key_setting_text_size);
         textSizePreference.setSummary(textSizePreference.getText());
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SimpleDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.java
index 436302b9..393bdd06 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SimpleDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.java
@@ -29,49 +29,25 @@ import android.app.Dialog;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.TextView;
+import net.lacolaco.smileessence.BuildConfig;
 import net.lacolaco.smileessence.R;
 
-public class SimpleDialogFragment extends StackableDialogFragment {
-
-    // ------------------------------ FIELDS ------------------------------
-
-    private static final String ARG_LAYOUT = "layout";
-    private static final String ARG_TITLE = "title";
-    private int layoutResourceID;
-    private String title;
-
-    // -------------------------- STATIC METHODS --------------------------
-
-    public static SimpleDialogFragment newInstance(int layoutResourceID, String title) {
-        SimpleDialogFragment fragment = new SimpleDialogFragment();
-        Bundle args = new Bundle();
-        args.putInt(ARG_LAYOUT, layoutResourceID);
-        args.putString(ARG_TITLE, title);
-        fragment.setArguments(args);
-        return fragment;
-    }
+public class AppInfoDialogFragment extends StackableDialogFragment {
 
     // ------------------------ OVERRIDE METHODS ------------------------
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Bundle args = getArguments();
-        layoutResourceID = args.getInt(ARG_LAYOUT);
-        title = args.getString(ARG_TITLE);
-    }
-
-    @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         LayoutInflater inflater = getActivity().getLayoutInflater();
-        View contentView = inflater.inflate(layoutResourceID, null);
+        View contentView = inflater.inflate(R.layout.dialog_app_info, null);
+        TextView versionTextView = (TextView) contentView.findViewById(R.id.versionTextView);
+        versionTextView.setText(BuildConfig.VERSION_NAME + " (rev: " + BuildConfig.VERSION_CODE + "; upstream: " + getString(R.string.app_version_full) + ")");
 
         return new AlertDialog.Builder(getActivity())
-                .setTitle(title)
+                .setTitle(R.string.dialog_title_about)
                 .setView(contentView)
-                .setPositiveButton(R.string.alert_dialog_ok, (dialog, which) -> {
-                    dialog.dismiss();
-                })
+                .setPositiveButton(R.string.alert_dialog_ok, (dialog, which) -> dialog.dismiss())
                 .create();
     }
 }
diff --git a/app/src/main/res/layout/dialog_app_info.xml b/app/src/main/res/layout/dialog_app_info.xml
index 78a64347..f3cda4de 100644
--- a/app/src/main/res/layout/dialog_app_info.xml
+++ b/app/src/main/res/layout/dialog_app_info.xml
@@ -62,6 +62,7 @@
                     android:textSize="20sp" />
 
                 <TextView
+                    android:id="@+id/versionTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/app_version_full"