Merge pull request #124 from galadril/development-branch

Development branch
galadril · Dec 24, 2015 · d5799f2 · d5799f2
2 parents 7fee089 + 707a916
commit d5799f2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 43
-        versionName '0.1.159'
+        versionCode 45
+        versionName '0.1.200'
         multiDexEnabled true
     }
 
@@ -22,14 +22,14 @@ android {
 
     productFlavors {
         free {
-            applicationId 'nl.hnogames.domoticz.lite'
+            applicationId 'nl.hnogames.domoticz'
             resValue "string", "googleapikey", "$System.env.GOOGLE_API_KEY"
             resValue "string", "app_name_domoticz", 'Domoticz Lite'
             buildConfigField "boolean", "LITE_VERSION", "true"
         }
 
         paid {
-            applicationId 'nl.hnogames.domoticz'
+            applicationId 'nl.hnogames.domoticz.premium'
             resValue "string", "googleapikey", "$System.env.GOOGLE_API_KEY"
             resValue "string", "app_name_domoticz", 'Domoticz'
             buildConfigField "boolean", "LITE_VERSION", "false"

diff --git a/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java
@@ -127,9 +127,9 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        mSharedPrefs = new SharedPrefUtil(this);
         createLocationRequest();
         initSwitches();
-        mSharedPrefs = new SharedPrefUtil(this);
         createListView();
         initSwitches();
     }

diff --git a/app/src/main/java/nl/hnogames/domoticz/MainActivity.java b/app/src/main/java/nl/hnogames/domoticz/MainActivity.java
@@ -47,6 +47,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.tjeannin.apprate.AppRate;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -129,6 +131,8 @@ public void onError(Exception error) {
                 }
             });
 
+            new AppRate(this).setMinDaysUntilPrompt(2)
+                    .setMinLaunchesUntilPrompt(10).init();
         } else {
             Intent welcomeWizard = new Intent(this, WelcomeViewActivity.class);
             startActivityForResult(welcomeWizard, iWelcomeResultCode);

diff --git a/app/src/main/java/nl/hnogames/domoticz/Preference/Preference.java b/app/src/main/java/nl/hnogames/domoticz/Preference/Preference.java
@@ -128,7 +128,7 @@ public boolean onPreferenceChange(android.preference.Preference preference, Obje
             premiumPreference.setOnPreferenceClickListener(new android.preference.Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(android.preference.Preference preference) {
-                    String packageID = getActivity().getPackageName().replace(".lite","");
+                    String packageID = getActivity().getPackageName()+".premium";
                     try {
                         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + packageID)));
                     } catch (android.content.ActivityNotFoundException anfe) {

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -24,13 +24,13 @@ android {
 
     productFlavors {
         free {
-            applicationId 'nl.hnogames.domoticz.lite'
+            applicationId 'nl.hnogames.domoticz'
             resValue "string", "app_name_domoticz", 'Domoticz Lite'
             buildConfigField "boolean", "LITE_VERSION", "true"
         }
 
         paid {
-            applicationId 'nl.hnogames.domoticz'
+            applicationId 'nl.hnogames.domoticz.premium'
             resValue "string", "app_name_domoticz", 'Domoticz'
             buildConfigField "boolean", "LITE_VERSION", "false"
         }