From 8ef6dbff09e6ad565c9257e6d1ba1a2ac1116a17 Mon Sep 17 00:00:00 2001
From: yechao <best_yc@163.com>
Date: Sat, 16 Oct 2021 21:27:09 +0800
Subject: [PATCH] convert to viewBinding

---
 .idea/compiler.xml                            | 18 +-------------
 .idea/gradle.xml                              |  4 ++--
 .idea/misc.xml                                | 20 +++++++++++++---
 .idea/modules.xml                             | 12 ++++------
 .idea/runConfigurations.xml                   | 12 ----------
 app/build.gradle                              | 10 +++++---
 .../main/java/com/yechaoa/app/MainActivity.kt | 24 ++++++++++---------
 7 files changed, 44 insertions(+), 56 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index da9ced6..f4d9014 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
-        <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="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0da921d..f9c7370 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.515625" />
+      </map>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="12">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
@@ -18,12 +25,15 @@
           <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
           <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
           <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="11">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -35,11 +45,15 @@
           <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
           <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
           <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c2279c4..ee8c0cc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,14 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/AndroidProject-YUtils.iml" filepath="$PROJECT_DIR$/.idea/modules/AndroidProject-YUtils.iml" group="YUtils" />
-      <module fileurl="file://$PROJECT_DIR$/YUtils.iml" filepath="$PROJECT_DIR$/YUtils.iml" group="YUtils" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/YUtils-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/YUtils-app.iml" group="YUtils/app" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutils/YUtils-yutils.iml" filepath="$PROJECT_DIR$/.idea/modules/yutils/YUtils-yutils.iml" group="YUtils/yutils" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutilskt/YUtils-yutilskt.iml" filepath="$PROJECT_DIR$/.idea/modules/yutilskt/YUtils-yutilskt.iml" group="YUtils/yutilskt" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="YUtils/app" />
-      <module fileurl="file://$PROJECT_DIR$/yutils/yutils.iml" filepath="$PROJECT_DIR$/yutils/yutils.iml" group="YUtils/yutils" />
-      <module fileurl="file://$PROJECT_DIR$/yutilskt/yutilskt.iml" filepath="$PROJECT_DIR$/yutilskt/yutilskt.iml" group="YUtils/yutilskt" />
+      <module fileurl="file://$PROJECT_DIR$/YUtils.iml" filepath="$PROJECT_DIR$/YUtils.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/YUtils.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/YUtils.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutils/YUtils.yutils.iml" filepath="$PROJECT_DIR$/.idea/modules/yutils/YUtils.yutils.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutilskt/YUtils.yutilskt.iml" filepath="$PROJECT_DIR$/.idea/modules/yutilskt/YUtils.yutilskt.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <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 19484a0..0b4615e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+
 android {
     compileSdkVersion 30
 
@@ -21,6 +21,10 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
 }
 
 dependencies {
@@ -28,11 +32,11 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    implementation "com.google.android.material:material:1.2.1"
+    implementation "com.google.android.material:material:1.3.0"
 
     implementation project(':yutils')
     implementation project(':yutilskt')
diff --git a/app/src/main/java/com/yechaoa/app/MainActivity.kt b/app/src/main/java/com/yechaoa/app/MainActivity.kt
index b7f5952..6b05b56 100644
--- a/app/src/main/java/com/yechaoa/app/MainActivity.kt
+++ b/app/src/main/java/com/yechaoa/app/MainActivity.kt
@@ -1,24 +1,26 @@
 package com.yechaoa.app
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.widget.TextView
-import com.google.android.material.snackbar.Snackbar
+import androidx.appcompat.app.AppCompatActivity
+import com.yechaoa.app.databinding.ActivityMainBinding
 import com.yechaoa.yutilskt.*
-import kotlinx.android.synthetic.main.activity_main.*
 
 
 class MainActivity : AppCompatActivity() {
 
+    private lateinit var mBinding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        mBinding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(mBinding.root)
 
         findViewById<TextView>(R.id.text_view).setOnClickListener {
             YUtils.showLoading(this, "加载中")
         }
 
-        btn_log.setOnClickListener {
+        mBinding.btnLog.setOnClickListener {
             LogUtil.d(getString(R.string.large_text))
         }
 
@@ -29,22 +31,22 @@ class MainActivity : AppCompatActivity() {
             set.add("-----" + array[i])
         }
 
-        button.setOnClickListener {
+        mBinding.button.setOnClickListener {
             SpUtil.setStringSet("testStringSet", set)
             //SpUtil.getBoolean("111",true)
         }
 
-        button2.setOnClickListener {
+        mBinding.button2.setOnClickListener {
             val stringSet = SpUtil.getStringSet("testStringSet")
             LogUtil.i(stringSet.toString())
         }
 
-        showLoading.setOnClickListener {
+        mBinding.showLoading.setOnClickListener {
             YUtils.showLoading(this, "test")
             LogUtil.i("" + YUtils.loadingIsShowing())
         }
 
-        hideLoading.setOnClickListener {
+        mBinding.hideLoading.setOnClickListener {
             ToastUtil.show("取消loading")
             YUtils.hideLoading()
             LogUtil.i("" + YUtils.loadingIsShowing())
@@ -54,12 +56,12 @@ class MainActivity : AppCompatActivity() {
 //        ActivityUtil.start(MainActivity::class.java)
 //        ActivityUtil.finish(this)
 
-        btn_display.setOnClickListener {
+        mBinding.btnDisplay.setOnClickListener {
             LogUtil.i("" + DisplayUtil.getStatusBarHeight() + "---" + DisplayUtil.getScreenHeight())
             LogUtil.i("" + DisplayUtil.getActionBarHeight() + "---" + DisplayUtil.getNavBarHeight())
         }
 
-        btn_sim.setOnClickListener {
+        mBinding.btnSim.setOnClickListener {
             ToastUtil.show(if (YUtils.hasSim()) "有sim卡" else "无sim卡")
         }
     }