Merge pull request #103 from hotchemi/revert-86-master

Revert "Updated gradle and switch to support AlertDialog"
hotchemi · Apr 10, 2016 · 5c26749 · 5c26749
2 parents ea0b4dd + f351fa9
commit 5c26749
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,17 +1,12 @@
-apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion '23.0.2'
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 23
     }
 }
 
-dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
-}
-
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/library/src/main/java/hotchemi/android/rate/AppRate.java b/library/src/main/java/hotchemi/android/rate/AppRate.java
@@ -173,11 +173,6 @@ public AppRate setStoreType(StoreType appstore) {
         return this;
     }
 
-    public AppRate setDialogStyle(int resourceId) {
-        options.setDialogStyle(resourceId);
-        return this;
-    }
-
     public void monitor() {
         if (isFirstLaunch(context)) {
             setInstallDate(context);

diff --git a/library/src/main/java/hotchemi/android/rate/DialogManager.java b/library/src/main/java/hotchemi/android/rate/DialogManager.java
@@ -1,10 +1,10 @@
 package hotchemi.android.rate;
 
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.support.v7.app.AlertDialog;
 import android.view.View;
 
 import static hotchemi.android.rate.IntentHelper.createIntentForAmazonAppstore;
@@ -19,7 +19,7 @@ private DialogManager() {
     }
 
     static Dialog create(final Context context, final DialogOptions options) {
-        AlertDialog.Builder builder = getDialogBuilder(context, options.getDialogStyleResId());
+        AlertDialog.Builder builder = getDialogBuilder(context);
         builder.setMessage(options.getMessageText(context));
 
         if (options.shouldShowTitle()) builder.setTitle(options.getTitleText(context));

diff --git a/library/src/main/java/hotchemi/android/rate/DialogOptions.java b/library/src/main/java/hotchemi/android/rate/DialogOptions.java
@@ -28,8 +28,6 @@ final class DialogOptions {
 
     private int textNegativeResId = R.string.rate_dialog_no;
 
-    private int dialogStyleResId = 0;
-
     private String titleText = null;
 
     private String messageText = null;
@@ -80,7 +78,7 @@ public StoreType getStoreType() {
         return storeType;
     }
 
-    public void setStoreType(StoreType appstore) {
+    public void setStoreType( StoreType appstore ) {
         storeType = appstore;
     }
 
@@ -194,12 +192,4 @@ public String getNegativeText(Context context) {
     public void setNegativeText(String negativeText) {
         this.negativeText = negativeText;
     }
-
-    public void setDialogStyle(int dialogStyleResId) {
-        this.dialogStyleResId = dialogStyleResId;
-    }
-
-    public int getDialogStyleResId() {
-        return this.dialogStyleResId;
-    }
 }
diff --git a/library/src/main/java/hotchemi/android/rate/Utils.java b/library/src/main/java/hotchemi/android/rate/Utils.java
@@ -1,9 +1,9 @@
 package hotchemi.android.rate;
 
 import android.annotation.SuppressLint;
+import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Build;
-import android.support.v7.app.AlertDialog;
 
 final class Utils {
 
@@ -18,18 +18,16 @@ static boolean isLollipop() {
         return Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP || Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP_MR1;
     }
 
-    static int getDialogTheme(int defaultStyle) {
-        // TODO: CustomLollipopDialogStyle parent could be switched to AppCompat
-        return defaultStyle == 0 && isLollipop() ? R.style.CustomLollipopDialogStyle : defaultStyle;
+    static int getDialogTheme() {
+        return isLollipop() ? R.style.CustomLollipopDialogStyle : 0;
     }
 
     @SuppressLint("NewApi")
-    static AlertDialog.Builder getDialogBuilder(Context context, int defaultStyle) {
+    static AlertDialog.Builder getDialogBuilder(Context context) {
         if (underHoneyComb()) {
-            // TODO: verify need for this with support.v7.app.AlertDialog
             return new AlertDialog.Builder(context);
         } else {
-            return new AlertDialog.Builder(context, getDialogTheme(defaultStyle));
+            return new AlertDialog.Builder(context, getDialogTheme());
         }
     }