custom cancel text

Author: caikaidev

.idea/misc.xml

@@ -22,7 +22,7 @@ allprojects {
 
 ```
 dependencies {
-	compile 'com.github.fccaikai:BottomMenuTutorial:1.0.1'
+	compile 'com.github.fccaikai:BottomMenuTutorial:1.0.2'
 }
 ```
 
@@ -47,20 +47,27 @@ dependencies {
 <dependency>
 	<groupId>com.github.fccaikai</groupId>
 	<artifactId>BottomMenuTutorial</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 </dependency>
 ```
 
 ### Usage
 
 ```
 BottomDialog dialog = BottomDialog.newInstance("title",new String[]{"item1","item2"});
-        dialog.show(getChildFragmentManager(),"dialog");
-        //add item click listener
-        dialog.setListener(new BottomDialog.OnClickListener() {
-            @Override
-            public void click(int position) {
-                Toast.makeText(getContext(), "" + position, Toast.LENGTH_LONG).show();
-            }
+/**
+*
+* BottomDialog dialog = BottomDialog.newInstance("titleText","cancelText",new String[]{"item1","item2"});
+*
+* use public static BottomDialog newInstance(String titleText,String cancelText, String[] items)
+* set cancel text
+*/
+dialog.show(getChildFragmentManager(),"dialog");
+    //add item click listener
+    dialog.setListener(new BottomDialog.OnClickListener() {
+        @Override
+        public void click(int position) {
+            Toast.makeText(getContext(), "" + position, Toast.LENGTH_LONG).show();
+        }
  });
 ```

README.md

@@ -58,10 +58,17 @@ public void onClick(View view) {
 
     public void showDialogFragment(){
         Log.i(TAG,"showDialogFragment");
-//        BottomDialog bottomDialog = BottomDialog.newInstance();
-//        bottomDialog.show(getChildFragmentManager(),BottomDialog.class.getSimpleName());
 
         BottomDialog dialog = BottomDialog.newInstance("导航到这里去",new String[]{"高德地图","百度地图"});
+
+        /**
+         *
+         * BottomDialog dialog = BottomDialog.newInstance("titleText","cancelText",new String[]{"item1","item2"});
+         *
+         * use public static BottomDialog newInstance(String titleText,String cancelText, String[] items)
+         * set cancel text
+         */
+
         dialog.show(getChildFragmentManager(),"dialog");
         dialog.setListener(new BottomDialog.OnClickListener() {
             @Override

app/src/main/java/com/kcode/bottommenututorial/MainFragment.java

@@ -4,4 +4,5 @@
     <string name="show_bottom_sheet">show bottom sheet</string>
     <string name="hide_bottom_sheet_dialog">hide bottom sheet dialog</string>
     <string name="show_bottom_sheet_dialog">show bottom sheet dialog</string>
+    <string name="bottom_dialog_lib_cancel">取消啊</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -4,7 +4,6 @@
 >
 
     <application android:allowBackup="true"
-                 android:label="@string/app_name"
                  android:supportsRtl="true"
     >
 

bottomlib/src/main/AndroidManifest.xml

@@ -27,17 +27,23 @@
 
 public class BottomDialog extends DialogFragment {
 
-    public static BottomDialog newInstance(String title, String[] items) {
+    public static BottomDialog newInstance(String titleText, String[] items) {
+        return newInstance(titleText,null,items);
+    }
+
+    public static BottomDialog newInstance(String titleText,String cancelText, String[] items) {
 
         Bundle args = new Bundle();
-        args.putString("title", title);
+        args.putString("title", titleText);
+        args.putString("cancel",cancelText);
         args.putStringArray("items", items);
         BottomDialog fragment = new BottomDialog();
         fragment.setArguments(args);
         return fragment;
     }
 
     private String mTitle;
+    private String mCancel;
     private String[] items;
     private View mRootView;
     private OnClickListener mListener;
@@ -101,6 +107,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
 
         Button cancel = (Button) view.findViewById(R.id.cancel);
+        cancel.setText(mCancel);
         cancel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -112,6 +119,10 @@ public void onClick(View v) {
     private void initData() {
         mTitle = getArguments().getString("title");
         items = getArguments().getStringArray("items");
+        mCancel = getArguments().getString("cancel");
+        if (TextUtils.isEmpty(mCancel)) {
+            mCancel = getResources().getString(R.string.bottom_dialog_lib_cancel);
+        }
     }
 
     @Override

bottomlib/src/main/java/com/kcode/bottomlib/BottomDialog.java

@@ -40,7 +40,7 @@
         android:layout_height="46dp"
         android:layout_marginTop="20dp"
         android:background="@drawable/seletcor_bottom_lib_button"
-        android:text="@string/cancel"
+        android:text="@string/bottom_dialog_lib_cancel"
         android:textSize="18sp"/>
 
 </LinearLayout>

bottomlib/src/main/res/layout/bottom_lib_layout.xml

@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">BottomLib</string>
-    <string name="cancel">取消</string>
+    <string name="cancel">@string/bottom_dialog_lib_cancel</string>
+    <string name="bottom_dialog_lib_cancel">取消</string>
 </resources>