Support Appcompat and alert dialogs in the support library

- resolves #42
PSDev · Jun 8, 2015 · 93333b8 · 93333b8
1 parent 8a9fe35
commit 93333b8
Show file tree

Hide file tree

Showing 14 changed files with 525 additions and 257 deletions.
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -16,12 +16,12 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="1007000"
-    android:versionName="1.7.0-SNAPSHOT"
+    android:versionCode="1008000"
+    android:versionName="1.8.0-SNAPSHOT"
     package="de.psdev.licensesdialog">
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="21" />
+        android:targetSdkVersion="22" />
     <application />
 </manifest>
diff --git a/library/pom.xml b/library/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.psdev.licensesdialog</groupId>
         <artifactId>parent</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>licensesdialog</artifactId>
@@ -36,6 +36,12 @@
             <artifactId>support-v4</artifactId>
             <type>aar</type>
         </dependency>
+        <dependency>
+            <groupId>com.android.support</groupId>
+            <artifactId>appcompat-v7</artifactId>
+            <type>aar</type>
+            <optional>true</optional>
+        </dependency>
 
         <!-- Nullable support -->
         <dependency>

diff --git a/library/project.properties b/library/project.properties
diff --git a/library/src/main/java/de/psdev/licensesdialog/LicensesDialog.java b/library/src/main/java/de/psdev/licensesdialog/LicensesDialog.java
@@ -43,9 +43,12 @@ public class LicensesDialog {
     private final int mThemeResourceId;
     private final int mDividerColor;
 
-    //
     private DialogInterface.OnDismissListener mOnDismissListener;
 
+    // ==========================================================================================================================
+    // Constructor
+    // ==========================================================================================================================
+
     private LicensesDialog(final Context context, final String licensesText, final String titleText, final String closeText, final int themeResourceId,
                            final int dividerColor) {
         mContext = context;
@@ -56,6 +59,10 @@ private LicensesDialog(final Context context, final String licensesText, final S
         mDividerColor = dividerColor;
     }
 
+    // ==========================================================================================================================
+    // Public API
+    // ==========================================================================================================================
+
     public LicensesDialog setOnDismissListener(final DialogInterface.OnDismissListener onDismissListener) {
         mOnDismissListener = onDismissListener;
         return this;
@@ -103,13 +110,63 @@ public void onShow(final DialogInterface dialogInterface) {
         return dialog;
     }
 
+    public Dialog createAppCompat() {
+        //Get resources
+        final WebView webView = new WebView(mContext);
+        webView.loadDataWithBaseURL(null, mLicensesText, "text/html", "utf-8", null);
+        final android.support.v7.app.AlertDialog.Builder builder;
+        if (mThemeResourceId != 0) {
+            builder = new android.support.v7.app.AlertDialog.Builder(new ContextThemeWrapper(mContext, mThemeResourceId));
+        } else {
+            builder = new android.support.v7.app.AlertDialog.Builder(mContext);
+        }
+        builder.setTitle(mTitleText)
+            .setView(webView)
+            .setPositiveButton(mCloseText, new Dialog.OnClickListener() {
+                public void onClick(final DialogInterface dialogInterface, final int i) {
+                    dialogInterface.dismiss();
+                }
+            });
+        final android.support.v7.app.AlertDialog dialog = builder.create();
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(final DialogInterface dialog) {
+                if (mOnDismissListener != null) {
+                    mOnDismissListener.onDismiss(dialog);
+                }
+            }
+        });
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(final DialogInterface dialogInterface) {
+                if (mDividerColor != 0) {
+                    // Set title divider color
+                    final int titleDividerId = mContext.getResources().getIdentifier("titleDivider", "id", "android");
+                    final View titleDivider = dialog.findViewById(titleDividerId);
+                    if (titleDivider != null) {
+                        titleDivider.setBackgroundColor(mDividerColor);
+                    }
+                }
+            }
+        });
+        return dialog;
+    }
+
     public Dialog show() {
         final Dialog dialog = create();
         dialog.show();
         return dialog;
     }
 
-    //
+    public Dialog showAppCompat() {
+        final Dialog dialog = createAppCompat();
+        dialog.show();
+        return dialog;
+    }
+
+    // ==========================================================================================================================
+    // Private API
+    // ==========================================================================================================================
 
     private static Notices getNotices(final Context context, final int rawNoticesResourceId) {
         try {
@@ -144,7 +201,9 @@ private static Notices getSingleNoticeNotices(final Notice notice) {
         return notices;
     }
 
+    // ==========================================================================================================================
     // Inner classes
+    // ==========================================================================================================================
 
     public static final class Builder {