项目升级及修正

README.md

@@ -36,3 +36,9 @@
 学习更多的Android技术知识，请关注我的微信公众号：
 
 <img src="https://raw.githubusercontent.com/guolindev/booksource/master/qrcode.jpg" width="250" />
+
+# 主要修改
+1.升级各种组件的版本，修正编译错误、编译警告  
+2.修正一些过时的写法，如ViewModel的初始化、Fragment的onActivityCreated  
+3.去掉过时的kotlin-android-extensions插件，直接使用DataBinding获取控件  
+4.替换android.preference.PreferenceManager为androidx.preference.PreferenceManager

app/build.gradle

@@ -1,17 +1,14 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
-
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdk 33
     defaultConfig {
         applicationId "com.coolweather.coolweatherjetpack"
-        minSdkVersion 15
-        targetSdkVersion 28
+        minSdk 15
+        //noinspection EditedTargetSdkVersion
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,25 +22,25 @@ android {
     dataBinding {
         enabled true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    namespace "com.coolweather.coolweatherjetpack"
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-alpha03"
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    implementation 'org.litepal.android:kotlin:3.0.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'//已包括Lifecycle
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'org.litepal.guolindev:core:3.2.3' //这个需要jcenter
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
-    implementation 'com.github.bumptech.glide:glide:3.7.0'
-    def lifecycle_version = "2.0.0"
-    // ViewModel and LiveData
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools" package="com.coolweather.coolweatherjetpack">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.coolweather.coolweatherjetpack">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name=".CoolWeatherApplication"
         android:allowBackup="false"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:networkSecurityConfig="@xml/network_security_config"
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
-        <activity android:name=".ui.MainActivity">
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.weather.WeatherActivity"/>
+        <activity android:name=".ui.weather.WeatherActivity" />
     </application>
 
 </manifest>

app/src/main/java/com/coolweather/coolweatherjetpack/data/db/PlaceDao.kt

@@ -14,19 +14,19 @@ class PlaceDao {
     fun getCountyList(cityId: Int): MutableList<County> = LitePal.where("cityId = ?", cityId.toString()).find(County::class.java)
 
     fun saveProvinceList(provinceList: List<Province>?) {
-        if (provinceList != null && provinceList.isNotEmpty()) {
+        if (!provinceList.isNullOrEmpty()) {
             LitePal.saveAll(provinceList)
         }
     }
 
     fun saveCityList(cityList: List<City>?) {
-        if (cityList != null && cityList.isNotEmpty()) {
+        if (!cityList.isNullOrEmpty()) {
             LitePal.saveAll(cityList)
         }
     }
 
     fun saveCountyList(countyList: List<County>?) {
-        if (countyList != null && countyList.isNotEmpty()) {
+        if (!countyList.isNullOrEmpty()) {
             LitePal.saveAll(countyList)
         }
     }

app/src/main/java/com/coolweather/coolweatherjetpack/data/db/WeatherDao.kt

@@ -1,7 +1,7 @@
 package com.coolweather.coolweatherjetpack.data.db
 
 import android.content.SharedPreferences
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import com.coolweather.coolweatherjetpack.CoolWeatherApplication
 import com.coolweather.coolweatherjetpack.data.model.weather.Weather
 import com.google.gson.Gson

app/src/main/java/com/coolweather/coolweatherjetpack/ui/MainActivity.kt

@@ -1,21 +1,20 @@
 package com.coolweather.coolweatherjetpack.ui
 
-import androidx.lifecycle.ViewModelProviders
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import com.coolweather.coolweatherjetpack.R
 import com.coolweather.coolweatherjetpack.util.InjectorUtil
 import com.coolweather.coolweatherjetpack.ui.weather.WeatherActivity
 import android.content.Intent
-import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.ViewModelProvider
 import com.coolweather.coolweatherjetpack.ui.area.ChooseAreaFragment
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        val viewModel = ViewModelProviders.of(this, InjectorUtil.getMainModelFactory()).get(MainViewModel::class.java)
+        val viewModel = ViewModelProvider(viewModelStore, InjectorUtil.getMainModelFactory()).get(MainViewModel::class.java)
         if (viewModel.isWeatherCached()) {
             val intent = Intent(this, WeatherActivity::class.java)
             startActivity(intent)

app/src/main/java/com/coolweather/coolweatherjetpack/ui/MainModelFactory.kt

@@ -7,7 +7,7 @@ import com.coolweather.coolweatherjetpack.data.WeatherRepository
 class MainModelFactory(private val repository: WeatherRepository) : ViewModelProvider.NewInstanceFactory() {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
         return MainViewModel(repository) as T
     }
 }

app/src/main/java/com/coolweather/coolweatherjetpack/ui/area/ChooseAreaFragment.kt

@@ -1,6 +1,7 @@
 package com.coolweather.coolweatherjetpack.ui.area
 
 import android.app.ProgressDialog
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,63 +10,70 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModelProvider
 import com.coolweather.coolweatherjetpack.R
-import com.coolweather.coolweatherjetpack.databinding.ChooseAreaBindingImpl
+import com.coolweather.coolweatherjetpack.databinding.ChooseAreaBinding
 import com.coolweather.coolweatherjetpack.ui.MainActivity
 import com.coolweather.coolweatherjetpack.ui.weather.WeatherActivity
 import com.coolweather.coolweatherjetpack.util.InjectorUtil
-import kotlinx.android.synthetic.main.activity_weather.*
-import kotlinx.android.synthetic.main.choose_area.*
 
 class ChooseAreaFragment : Fragment() {
 
-    private val viewModel by lazy { ViewModelProviders.of(this, InjectorUtil.getChooseAreaModelFactory()).get(ChooseAreaViewModel::class.java) }
+    private val viewModel by lazy { ViewModelProvider(this, InjectorUtil.getChooseAreaModelFactory()).get(ChooseAreaViewModel::class.java) }
     private var progressDialog: ProgressDialog? = null
+    private var binding: ChooseAreaBinding? = null
     private lateinit var adapter: ArrayAdapter<String>
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.choose_area, container, false)
-        val binding = DataBindingUtil.bind<ChooseAreaBindingImpl>(view)
+        binding = DataBindingUtil.bind(view)
         binding?.viewModel = viewModel
+        adapter = ChooseAreaAdapter(requireContext(), R.layout.simple_item, viewModel.dataList)
+        binding?.listView?.adapter = adapter
         return view
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        adapter = ChooseAreaAdapter(context!!, R.layout.simple_item, viewModel.dataList)
-        listView.adapter = adapter
-        observe()
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        requireActivity().lifecycle.addObserver(object : DefaultLifecycleObserver {
+            override fun onCreate(owner: LifecycleOwner) {
+                observe()
+
+                owner.lifecycle.removeObserver(this)
+            }
+        })
     }
 
     private fun observe() {
-        viewModel.currentLevel.observe(this, Observer { level ->
+        viewModel.currentLevel.observe(this) { level ->
             when (level) {
                 LEVEL_PROVINCE -> {
-                    titleText.text = "中国"
-                    backButton.visibility = View.GONE
+                    binding?.titleText?.text = "中国"
+                    binding?.backButton?.visibility = View.GONE
                 }
                 LEVEL_CITY -> {
-                    titleText.text = viewModel.selectedProvince?.provinceName
-                    backButton.visibility = View.VISIBLE
+                    binding?.titleText?.text = viewModel.selectedProvince?.provinceName
+                    binding?.backButton?.visibility = View.VISIBLE
                 }
                 LEVEL_COUNTY -> {
-                    titleText.text = viewModel.selectedCity?.cityName
-                    backButton.visibility = View.VISIBLE
+                    binding?.titleText?.text = viewModel.selectedCity?.cityName
+                    binding?.backButton?.visibility = View.VISIBLE
                 }
             }
-        })
-        viewModel.dataChanged.observe(this, Observer {
+        }
+        viewModel.dataChanged.observe(this) {
             adapter.notifyDataSetChanged()
-            listView.setSelection(0)
+            binding?.listView?.setSelection(0)
             closeProgressDialog()
-        })
-        viewModel.isLoading.observe(this, Observer { isLoading ->
+        }
+        viewModel.isLoading.observe(this) { isLoading ->
             if (isLoading) showProgressDialog()
             else closeProgressDialog()
-        })
-        viewModel.areaSelected.observe(this, Observer { selected ->
+        }
+        viewModel.areaSelected.observe(this) { selected ->
             if (selected && viewModel.selectedCounty != null) {
                 if (activity is MainActivity) {
                     val intent = Intent(activity, WeatherActivity::class.java)
@@ -74,13 +82,13 @@ class ChooseAreaFragment : Fragment() {
                     activity?.finish()
                 } else if (activity is WeatherActivity) {
                     val weatherActivity = activity as WeatherActivity
-                    weatherActivity.drawerLayout.closeDrawers()
+                    weatherActivity.binding.drawerLayout.closeDrawers()
                     weatherActivity.viewModel.weatherId = viewModel.selectedCounty!!.weatherId
                     weatherActivity.viewModel.refreshWeather()
                 }
                 viewModel.areaSelected.value = false
             }
-        })
+        }
         if (viewModel.dataList.isEmpty()) {
             viewModel.getProvinces()
         }

app/src/main/java/com/coolweather/coolweatherjetpack/ui/area/ChooseAreaModelFactory.kt

@@ -7,7 +7,7 @@ import com.coolweather.coolweatherjetpack.data.PlaceRepository
 class ChooseAreaModelFactory(private val repository: PlaceRepository) : ViewModelProvider.NewInstanceFactory() {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
         return ChooseAreaViewModel(repository) as T
     }
 }

app/src/main/java/com/coolweather/coolweatherjetpack/ui/weather/WeatherActivity.kt

@@ -7,18 +7,16 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import com.coolweather.coolweatherjetpack.R
 import com.coolweather.coolweatherjetpack.databinding.ActivityWeatherBinding
 import com.coolweather.coolweatherjetpack.util.InjectorUtil
-import kotlinx.android.synthetic.main.activity_weather.*
-import kotlinx.android.synthetic.main.title.*
 
 class WeatherActivity : AppCompatActivity() {
 
-    val viewModel by lazy { ViewModelProviders.of(this, InjectorUtil.getWeatherModelFactory()).get(WeatherViewModel::class.java) }
+    val viewModel by lazy { ViewModelProvider(viewModelStore, InjectorUtil.getWeatherModelFactory()).get(WeatherViewModel::class.java) }
 
-    private val binding by lazy { DataBindingUtil.setContentView<ActivityWeatherBinding>(this, R.layout.activity_weather) }
+    val binding: ActivityWeatherBinding by lazy { DataBindingUtil.setContentView(this, R.layout.activity_weather) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -33,12 +31,12 @@ class WeatherActivity : AppCompatActivity() {
         viewModel.weatherId = if (viewModel.isWeatherCached()) {
             viewModel.getCachedWeather().basic.weatherId
         } else {
-            intent.getStringExtra("weather_id")
+            intent.getStringExtra("weather_id")!!
         }
-        navButton.setOnClickListener {
-            drawerLayout.openDrawer(GravityCompat.START)
+        binding.title.navButton.setOnClickListener {
+            binding.drawerLayout.openDrawer(GravityCompat.START)
         }
-        viewModel.getWeather()
+        viewModel.getWeatherFromRepository()
     }
 
 }

app/src/main/java/com/coolweather/coolweatherjetpack/ui/weather/WeatherModelFactory.kt

@@ -7,7 +7,7 @@ import com.coolweather.coolweatherjetpack.data.WeatherRepository
 class WeatherModelFactory(private val repository: WeatherRepository) : ViewModelProvider.NewInstanceFactory() {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
         return WeatherViewModel(repository) as T
     }
 }

app/src/main/java/com/coolweather/coolweatherjetpack/ui/weather/WeatherViewModel.kt

@@ -21,7 +21,7 @@ class WeatherViewModel(private val repository: WeatherRepository) : ViewModel()
 
     var weatherId = ""
 
-    fun getWeather() {
+    fun getWeatherFromRepository() {
         launch ({
             weather.value = repository.getWeather(weatherId)
             weatherInitialized.value = true

app/src/main/java/com/coolweather/coolweatherjetpack/util/BindingAdapters.kt

@@ -11,17 +11,17 @@ import com.coolweather.coolweatherjetpack.R
 import com.coolweather.coolweatherjetpack.data.model.weather.Weather
 import com.coolweather.coolweatherjetpack.databinding.ForecastItemBinding
 
-@BindingAdapter("bind:loadBingPic")
+@BindingAdapter("loadBingPic")
 fun ImageView.loadBingPic(url: String?) {
     if (url != null) Glide.with(context).load(url).into(this)
 }
 
-@BindingAdapter("bind:colorSchemeResources")
+@BindingAdapter("colorSchemeResources")
 fun SwipeRefreshLayout.colorSchemeResources(resId: Int) {
     setColorSchemeResources(resId)
 }
 
-@BindingAdapter("bind:showForecast")
+@BindingAdapter("showForecast")
 fun LinearLayout.showForecast(weather: Weather?) = weather?.let {
     removeAllViews()
     for (forecast in it.forecastList) {