1.转kotlin

2.使用BottomSheetDialog做载体
3.优化demo

Author: jaaksi

app/build.gradle

@@ -1,36 +1,51 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-  compileSdkVersion 28
-//  buildToolsVersion '27.0.3'
+    compileSdkVersion 31
 
-  defaultConfig {
-    applicationId "org.jaaksi.pickerview.demo"
-    minSdkVersion 15
-    targetSdkVersion 28
-    versionCode 2
-    versionName "1.0.1"
-    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    defaultConfig {
+        applicationId "org.jaaksi.pickerview.demo"
+        minSdkVersion 15
+        targetSdkVersion 31
+        versionCode 2
+        versionName "1.0.1"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-  }
 
-  lintOptions {
-    checkReleaseBuilds false
-    abortOnError false
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
-  }
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
-  implementation fileTree(include: ['*.jar'], dir: 'libs')
-  implementation 'com.android.support:appcompat-v7:28.0.0'
-//  implementation project(':pickerview')
-  implementation 'com.android.support:support-v4:28.0.0'
-  implementation 'org.jaaksi:pickerview:3.0.2'
-  implementation 'com.google.code.gson:gson:2.8.5'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':pickerview')
+//    implementation 'org.jaaksi:pickerview:3.0.2'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation "androidx.core:core-ktx:1.8.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }

app/proguard-rules.pro

@@ -19,3 +19,22 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+# Gson
+-keepattributes Signature
+-keepattributes *Annotation*
+-dontwarn sun.misc.**
+-keep class com.google.gson.stream.** { *; }
+-keep class com.google.gson.examples.android.model.** { *; }
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+-keep class **$Properties { *; }
+
+# keep 被添加@keep的类
+-keep @androidx.annotation.Keep class **
+
+# BaseActivity中使用反射获取ViewBinding，则需要配置混淆
+-keep class * implements androidx.viewbinding.ViewBinding {
+    *;
+}

app/src/main/AndroidManifest.xml

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.jaaksi.pickerview.demo">
+    package="org.jaaksi.pickerview.demo">
 
-  <application
-    android:name=".MyApplication"
-    android:allowBackup="true"
-    android:icon="@drawable/ic_launcher"
-    android:label="@string/app_name"
-    android:supportsRtl="true"
-    android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+    <application
+        android:name=".MyApplication"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 
 </manifest>