diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index aae808f..124479b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..783dfac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="ext/src/main/res/layout/_xpopup_ext_city_picker.xml" value="0.29791666666666666" />
+        <entry key="ext/src/main/res/layout/_xpopup_ext_common_picker.xml" value="0.29791666666666666" />
+        <entry key="ext/src/main/res/layout/_xpopup_ext_time_picker.xml" value="0.29791666666666666" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index f08e465..60e0346 100644
--- 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")
 }
\ No newline at end of file
diff --git a/ext/build.gradle b/ext/build.gradle
index fe43559..ce0d765 100644
--- 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
index bc35b4d..71252d6 100755
--- 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
index 573e181..41c4400 100755
--- 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
index 874bc6a..0307726 100755
--- 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" />