Browse Source

update 0.0.17 ver.

kongzue 4 years ago
parent
commit
0780a6dd7d

+ 5 - 0
.idea/jarRepositories.xml

@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://dl.bintray.com/myzchh/maven" />
+    </remote-repository>
   </component>
 </project>

+ 3 - 3
DialogX/build.gradle

@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/DialogX' //项目在github主页地址
 def gitUrl = 'https://github.com/kongzue/DialogX.git'   //Git仓库的地址
 
 group = "com.kongzue.dialogx"
-version = "0.0.16"
+version = "0.0.17"
 
 android {
     compileSdkVersion 30
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 16
-        versionName "0.0.16"
+        versionCode 17
+        versionName "0.0.17"
 
         consumerProguardFiles "consumer-rules.pro"
 

+ 8 - 1
DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -405,10 +405,17 @@ public class BottomDialog extends BaseDialog {
                 if (isNull(cancelText)) {
                     boxCancel.setVisibility(View.GONE);
                 } else {
-                    showText(btnCancel, cancelText);
                     boxCancel.setVisibility(View.VISIBLE);
                 }
             }
+            if (btnCancel != null) {
+                if (isNull(cancelText)) {
+                    btnCancel.setVisibility(View.GONE);
+                } else {
+                    showText(btnCancel, cancelText);
+                    btnCancel.setVisibility(View.VISIBLE);
+                }
+            }
         }
         
         @Override

+ 3 - 3
DialogXIOSStyle/build.gradle

@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/DialogX' //项目在github主页地址
 def gitUrl = 'https://github.com/kongzue/DialogX.git'   //Git仓库的地址
 
 group = "com.kongzue.dialogx.style.ios"
-version = "0.0.16"
+version = "0.0.17"
 
 android {
     compileSdkVersion 30
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 16
-        versionName "0.0.16"
+        versionCode 17
+        versionName "0.0.17"
     }
 
     buildTypes {

+ 3 - 3
DialogXKongzueStyle/build.gradle

@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/DialogX' //项目在github主页地址
 def gitUrl = 'https://github.com/kongzue/DialogX.git'   //Git仓库的地址
 
 group = "com.kongzue.dialogx.style.kongzue"
-version = "0.0.16"
+version = "0.0.17"
 
 android {
     compileSdkVersion 30
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 16
-        versionName "0.0.16"
+        versionCode 17
+        versionName "0.0.17"
     }
 
     buildTypes {

+ 3 - 3
DialogXMIUIStyle/build.gradle

@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/DialogX' //项目在github主页地址
 def gitUrl = 'https://github.com/kongzue/DialogX.git'   //Git仓库的地址
 
 group = "com.kongzue.dialogx.style.miui"
-version = "0.0.16"
+version = "0.0.17"
 
 android {
     compileSdkVersion 30
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 16
-        versionName "0.0.16"
+        versionCode 17
+        versionName "0.0.17"
 
     }
 

+ 0 - 1
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui.xml

@@ -89,7 +89,6 @@
                     android:layout_marginHorizontal="26dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="20dp"
-                    android:layout_weight="1"
                     android:background="@drawable/button_dialogx_miui_gray"
                     android:clickable="true"
                     android:gravity="center"

+ 0 - 1
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui_dark.xml

@@ -89,7 +89,6 @@
                     android:layout_marginHorizontal="26dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="20dp"
-                    android:layout_weight="1"
                     android:background="@drawable/button_dialogx_miui_gray_night"
                     android:clickable="true"
                     android:gravity="center"

+ 2 - 2
README.md

@@ -106,7 +106,7 @@ DialogX 采用了主体分离结构,主框架仅包含 Material 设计风格
 想要在您的项目引入 DialogX,您需要在 app 的 build.gradle 文件中找到 `dependencies{}` 代码块,并在其中加入以下语句:
 
 ```
-implementation 'com.kongzue.dialogx:DialogX:0.0.16'
+implementation 'com.kongzue.dialogx:DialogX:0.0.17'
 ```
 
 若有需要,也可以手动配置 Maven:
@@ -115,7 +115,7 @@ implementation 'com.kongzue.dialogx:DialogX:0.0.16'
 <dependency>
   <groupId>com.kongzue.dialogx</groupId>
   <artifactId>DialogX</artifactId>
-  <version>0.0.16</version>
+  <version>0.0.17</version>
   <type>pom</type>
 </dependency>
 ```

+ 7 - 7
app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.kongzue.dialogxdemo"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 14
-        versionName "0.0.14"
+        versionCode 17
+        versionName "0.0.17"
 
         renderscriptTargetApi 21
         renderscriptSupportModeEnabled true    // Enable RS support
@@ -21,7 +21,7 @@ android {
         }
     }
 }
-repositories{
+repositories {
     flatDir {
         dirs 'libs'
     }
@@ -31,9 +31,9 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.kongzue.baseframeworkx:baseframework:6.7.6'
 
-//    implementation(name: 'DialogX-release', ext: 'aar')
-    implementation(name: 'DialogXIOSStyle-release', ext: 'aar')
-    implementation(name: 'DialogXKongzueStyle-release', ext: 'aar')
-    implementation(name: 'DialogXMIUIStyle-release', ext: 'aar')
+    implementation 'com.kongzue.dialogx.style.ios:DialogXIOSStyle:0.0.16'
+    implementation 'com.kongzue.dialogx.style.kongzue:DialogXKongzueStyle:0.0.16'
+    implementation 'com.kongzue.dialogx.style.miui:DialogXMIUIStyle:0.0.16'
+
     implementation project(path: ':DialogX')
 }

+ 2 - 2
app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 14,
-      "versionName": "0.0.14",
+      "versionCode": 17,
+      "versionName": "0.0.17",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

+ 3 - 0
build.gradle

@@ -18,6 +18,9 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven{
+            url 'https://dl.bintray.com/myzchh/maven'
+        }
     }
 }