Generify App Details

*Get app details from Gradle instead of specifying manually in Strings.
rayliverified · Mar 12, 2018 · 740124b · 740124b
1 parent db006bf
commit 740124b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/app/src/main/java/stream/rocketnotes/SettingsFragment.java b/app/src/main/java/stream/rocketnotes/SettingsFragment.java
@@ -273,13 +273,13 @@ public boolean onPreferenceClick(Preference arg0) {
 
         //About
         Preference pref = findPreference("settings_version");
-        pref.setTitle(getString(R.string.app_name) + " " + getString(R.string.app_version));
+        pref.setTitle(getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME);
         itemVersion.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 
             public boolean onPreferenceClick(Preference arg0) {
                 CustomAlertDialogue.Builder alert = new CustomAlertDialogue.Builder(getActivity())
                         .setStyle(CustomAlertDialogue.Style.DIALOGUE)
-                        .setTitle(mContext.getString(R.string.app_name) + " " + mContext.getString(R.string.app_version))
+                        .setTitle(mContext.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME)
                         .setMessage("© Copyright 2017-2018 Stream Inc")
                         .setNegativeText("OK")
                         .setNegativeColor(R.color.positive)

diff --git a/app/src/main/java/stream/rocketnotes/WidgetReviewViewholder.java b/app/src/main/java/stream/rocketnotes/WidgetReviewViewholder.java
@@ -111,7 +111,7 @@ public void onClick(View view) {
                         try {
                             context.startActivity(intent);
                         } catch (android.content.ActivityNotFoundException ex) {
-                            intent.setData(Uri.parse(String.format("https://play.google.com/store/apps/details?id=%s", context.getString(R.string.app_package))));
+                            intent.setData(Uri.parse(String.format("https://play.google.com/store/apps/details?id=%s", BuildConfig.APPLICATION_ID)));
                             context.startActivity(intent);
                         }
                     } else if (PermissionUtils.isAppInstalled(context, "com.amazon.venezia")) {
@@ -123,7 +123,7 @@ public void onClick(View view) {
                             context.startActivity(intent);
                         }
                     } else {
-                        intent.setData(Uri.parse(String.format("https://play.google.com/store/apps/details?id=%s", context.getString(R.string.app_package))));
+                        intent.setData(Uri.parse(String.format("https://play.google.com/store/apps/details?id=%s", BuildConfig.APPLICATION_ID)));
                         context.startActivity(intent);
                     }
                 }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,5 @@
 <resources>
     <string name="app_name">Rocket Notes</string>
-    <string name="app_version">v1.4.0</string>
-    <string name="app_package">stream.rocketnotes</string>
 
     <!-- Settings Page -->
     <string name="loading">Loading&#8230;</string>