升级xpopup依赖，优化布局高度

junixapp · Oct 23, 2021 · 286e7ae · 286e7ae
1 parent c40744e
commit 286e7ae
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 27 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,11 +18,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.github.li-xiaojun:XPopup:2.2.25'
+    implementation 'com.github.li-xiaojun:XPopup:2.6.3'
     implementation project(":ext")
 }
diff --git a/ext/build.gradle b/ext/build.gradle
@@ -16,13 +16,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.github.li-xiaojun:XPopup:2.5.3'
+    implementation 'com.github.li-xiaojun:XPopup:2.6.3'
 //    implementation 'com.contrarywind:wheelview:4.1.0'
     implementation project(":wheelview")
 }
diff --git a/ext/src/main/res/layout/_xpopup_ext_city_picker.xml b/ext/src/main/res/layout/_xpopup_ext_city_picker.xml
@@ -5,14 +5,15 @@
     android:orientation="vertical">
 
     <LinearLayout
+        android:orientation="horizontal"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
         android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:orientation="horizontal">
-
+        android:layout_height="wrap_content">
         <TextView
             android:id="@+id/btnCancel"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingLeft="15dp"
             android:paddingRight="10dp"
@@ -29,7 +30,7 @@
         <TextView
             android:id="@+id/btnConfirm"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingLeft="10dp"
             android:paddingRight="15dp"

diff --git a/ext/src/main/res/layout/_xpopup_ext_common_picker.xml b/ext/src/main/res/layout/_xpopup_ext_common_picker.xml
@@ -6,13 +6,15 @@
 
     <LinearLayout
         android:orientation="horizontal"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
         android:layout_width="match_parent"
-        android:layout_height="40dp">
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/btnCancel"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingLeft="15dp"
             android:paddingRight="10dp"
@@ -33,7 +35,7 @@
             android:paddingRight="15dp"
             android:textColor="@color/_xpopup_dark_color"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:text="@string/xpopup_ok"
             android:textAllCaps="false"
             android:textSize="16sp" />

diff --git a/ext/src/main/res/layout/_xpopup_ext_time_picker.xml b/ext/src/main/res/layout/_xpopup_ext_time_picker.xml
@@ -6,13 +6,15 @@
 
     <LinearLayout
         android:orientation="horizontal"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
         android:layout_width="match_parent"
-        android:layout_height="40dp">
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/btnCancel"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingLeft="15dp"
             android:paddingRight="10dp"
@@ -33,7 +35,7 @@
             android:paddingRight="15dp"
             android:textColor="@color/_xpopup_dark_color"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:text="@string/xpopup_ok"
             android:textAllCaps="false"
             android:textSize="16sp" />