Aidan Follestad 10 years ago
parent
commit
91dec8e552

+ 6 - 6
library/src/main/res/layout/md_dialog.xml

@@ -1,21 +1,21 @@
 <LinearLayout
     android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:id="@+id/mainFrame"
         android:orientation="vertical"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1">
 
         <LinearLayout
             android:id="@+id/titleFrame"
             android:orientation="horizontal"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:paddingLeft="@dimen/md_dialog_frame_margin"
@@ -33,7 +33,7 @@
 
             <TextView
                 android:id="@+id/title"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/md_title_textsize"
                 tools:text="Title" />
@@ -81,7 +81,7 @@
 
         <FrameLayout
             android:id="@+id/customViewFrame"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
     </LinearLayout>

+ 1 - 0
sample/build.gradle

@@ -19,4 +19,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
+    compile 'com.android.support:recyclerview-v7:21.0.3'
 }

+ 1 - 1
sample/src/main/assets/webview.html

@@ -6,7 +6,7 @@
 
 <p>This is an <b>example</b> <i>HTML file</i> loaded from assets.</p>
 
-<p>Key changes in this release:
+<p>Key changes in this release:</p>
 <ul>
     <li>Feature A</li>
     <li>Feature B</li>

+ 76 - 0
sample/src/main/java/com/afollestad/materialdialogssample/ColorChooserAdapter.java

@@ -0,0 +1,76 @@
+package com.afollestad.materialdialogssample;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.os.Build;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * @author Aidan Follestad (afollestad)
+ */
+public class ColorChooserAdapter extends RecyclerView.Adapter<ColorChooserAdapter.ViewHolder> implements View.OnClickListener {
+
+    private Callback mCallback;
+    private int[] mColors;
+
+    @Override
+    public void onClick(View v) {
+        if (mCallback != null) {
+            Integer index = (Integer) v.getTag();
+            mCallback.onColorSelected(index, mColors[index]);
+        }
+    }
+
+    public static interface Callback {
+        void onColorSelected(int index, int primary);
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+
+        public View mView;
+        public View mColorView;
+
+        public ViewHolder(View v) {
+            super(v);
+            mView = v;
+            mColorView = v.findViewById(R.id.color);
+        }
+    }
+
+    public ColorChooserAdapter(Context context, Callback callback) {
+        mCallback = callback;
+        TypedArray ta = context.getResources().obtainTypedArray(R.array.material_colors_500);
+        mColors = new int[ta.length()];
+        for (int i = 0; i < ta.length(); i++)
+            mColors[i] = ta.getColor(i, 0);
+        ta.recycle();
+    }
+
+    @Override
+    public ColorChooserAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_colorchooser, null);
+        return new ViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        holder.mView.setTag(position);
+        holder.mView.setOnClickListener(this);
+
+        ShapeDrawable circle = new ShapeDrawable(new OvalShape());
+        circle.getPaint().setColor(mColors[position]);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+            holder.mColorView.setBackground(circle);
+        else holder.mColorView.setBackgroundDrawable(circle);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mColors.length;
+    }
+}

+ 51 - 0
sample/src/main/java/com/afollestad/materialdialogssample/ColorChooserDialog.java

@@ -0,0 +1,51 @@
+package com.afollestad.materialdialogssample;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.os.Bundle;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+import com.afollestad.materialdialogs.MaterialDialog;
+
+/**
+ * @author Aidan Follestad (afollestad)
+ */
+public class ColorChooserDialog extends DialogFragment implements ColorChooserAdapter.Callback {
+
+    private Callback mCallback;
+
+    @Override
+    public void onColorSelected(int index, int primary) {
+        mCallback.onColorSelection(primary);
+    }
+
+    public static interface Callback {
+        void onColorSelection(int primary);
+    }
+
+    public ColorChooserDialog() {
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        MaterialDialog dialog = new MaterialDialog.Builder(getActivity())
+                .title(R.string.color_chooser)
+                .autoDismiss(false)
+                .customView(R.layout.dialog_color_chooser, false)
+                .positiveText(R.string.choose)
+                .build();
+        RecyclerView list = (RecyclerView) dialog.getCustomView().findViewById(R.id.list);
+        if (list != null) {
+            list.setLayoutManager(new GridLayoutManager(getActivity(), getResources().getInteger(R.integer.color_chooser_columns)));
+            list.setAdapter(new ColorChooserAdapter(getActivity(), this));
+        }
+        return dialog;
+    }
+
+    public void show(Activity context, Callback callback) {
+        mCallback = callback;
+        show(context.getFragmentManager(), "COLOR_SELECTOR");
+    }
+}

+ 17 - 1
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -133,13 +133,20 @@ public class MainActivity extends ActionBarActivity implements FolderSelectorDia
             }
         });
 
-        findViewById(R.id.customView_noScroll).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.customView_webView).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showCustomWebView();
             }
         });
 
+        findViewById(R.id.customView_colorChooser).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showCustomColorChooser();
+            }
+        });
+
         findViewById(R.id.themed).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -400,6 +407,15 @@ public class MainActivity extends ActionBarActivity implements FolderSelectorDia
         dialog.show();
     }
 
+    private void showCustomColorChooser() {
+        new ColorChooserDialog().show(this, new ColorChooserDialog.Callback() {
+            @Override
+            public void onColorSelection(int primary) {
+
+            }
+        });
+    }
+
     private void showThemed() {
         new MaterialDialog.Builder(this)
                 .title(R.string.useGoogleLocationServices)

+ 9 - 2
sample/src/main/res/layout/activity_main.xml

@@ -108,10 +108,17 @@
             android:layout_marginTop="@dimen/sample_button_spacing" />
 
         <Button
-            android:id="@+id/customView_noScroll"
+            android:id="@+id/customView_webView"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:text="@string/customView_noScroll"
+            android:text="@string/customView_webView"
+            android:layout_marginTop="@dimen/sample_button_spacing" />
+
+        <Button
+            android:id="@+id/customView_colorChooser"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/customView_colorChooser"
             android:layout_marginTop="@dimen/sample_button_spacing" />
 
         <Button

+ 16 - 0
sample/src/main/res/layout/dialog_color_chooser.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/list"
+        android:scrollbars="vertical"
+        android:layout_width="256dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:clipToPadding="false" />
+
+</LinearLayout>

+ 15 - 0
sample/src/main/res/layout/list_item_colorchooser.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="4dp">
+
+    <View
+        android:id="@+id/color"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:background="#000"
+        android:layout_gravity="center" />
+
+</LinearLayout>

+ 6 - 0
sample/src/main/res/values-land/integers.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <integer name="color_chooser_columns">5</integer>
+
+</resources>

+ 27 - 0
sample/src/main/res/values/arrays.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <array name="material_colors_500">
+        <item>#F44336</item>
+        <item>#E91E63</item>
+        <item>#9C27B0</item>
+        <item>#673AB7</item>
+        <item>#3F51B5</item>
+        <item>#2196F3</item>
+        <item>#03A9F4</item>
+        <item>#00BCD4</item>
+        <item>#009688</item>
+        <item>#4CAF50</item>
+        <item>#8BC34A</item>
+        <item>#CDDC39</item>
+        <item>#FFEB3B</item>
+        <item>#FFC107</item>
+        <item>#FF9800</item>
+        <item>#FF5722</item>
+        <item>#795548</item>
+        <item>#9E9E9E</item>
+        <item>#607D8B</item>
+        <item>#424242</item>
+    </array>
+
+</resources>

+ 6 - 0
sample/src/main/res/values/integers.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <integer name="color_chooser_columns">4</integer>
+
+</resources>

+ 3 - 1
sample/src/main/res/values/strings.xml

@@ -53,9 +53,11 @@
     <string name="folder_chooser">Folder Chooser</string>
     <string name="showCancelDismissCallbacks">Show/Cancel/Dismiss Callbacks</string>
     <string name="changelog">Changelog</string>
-    <string name="customView_noScroll">Custom View (No ScrollView)</string>
+    <string name="customView_webView">Custom View No Scroll (Changelog)</string>
+    <string name="customView_colorChooser">Custom View No Scroll (Color Chooser)</string>
     <string name="ssid">SSID</string>
     <string name="ssidLit">Material Dialogs</string>
+    <string name="color_chooser">Color Chooser</string>
 
     <string-array name="socialNetworks">
         <item>Twitter</item>