Migrate to compileSdk 34

- kotlin 1.5.31 -> 1.9.0
- compose 1.0.5 -> 1.5.0

Author: YvesCheung

api/build.gradle

@@ -2,13 +2,15 @@ apply plugin: 'com.android.library'
 apply from: '../gradle/android_extension.gradle'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 34
         consumerProguardFiles file('./proguard.pro')
     }
+
+    namespace 'com.pitaya.mobile.uinspector'
 }
 
 dependencies {

api/src/main/AndroidManifest.xml

@@ -1,12 +1,13 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pitaya.mobile.uinspector">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application>
         <service
-            android:name=".notification.UInspectorNotificationService"
+            android:name="com.pitaya.mobile.uinspector.notification.UInspectorNotificationService"
             android:foregroundServiceType="dataSync"
             android:exported="false" />
     </application>

api/src/main/java/com/pitaya/mobile/uinspector/state/UInspectorTargetViews.kt

@@ -45,13 +45,13 @@ class UInspectorTargetViews private constructor(
 
     private val attachState = object : View.OnAttachStateChangeListener {
 
-        override fun onViewDetachedFromWindow(v: View?) {
+        override fun onViewDetachedFromWindow(v: View) {
             onDetach.forEach { it.onChange() }
             clear()
             views.clear()
         }
 
-        override fun onViewAttachedToWindow(v: View?) {}
+        override fun onViewAttachedToWindow(v: View) {}
     }
 
     init {

api/src/main/java/com/pitaya/mobile/uinspector/ui/panel/fullscreen/UInspectorLegacyDialogFragment.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.RestrictTo
 import com.pitaya.mobile.uinspector.hierarchy.Layer
 import com.pitaya.mobile.uinspector.lifecycle.Disposable
 import com.pitaya.mobile.uinspector.ui.decoration.UInspectorDecoration
@@ -17,7 +18,8 @@ import com.pitaya.mobile.uinspector.ui.panel.popup.UInspectorChildPanelContainer
  * @author YvesCheung
  * 2020/12/30
  */
-internal class UInspectorLegacyDialogFragment : DialogFragment(), UInspectorPanel {
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+class UInspectorLegacyDialogFragment : DialogFragment(), UInspectorPanel {
 
     private val delegate = UInspectorPanelDelegate()
 

api/src/main/java/com/pitaya/mobile/uinspector/ui/panel/fullscreen/UInspectorMask.kt

@@ -69,12 +69,12 @@ internal class UInspectorMask(
                 return true
             }
 
-            override fun onSingleTapUp(e: MotionEvent?): Boolean {
+            override fun onSingleTapUp(e: MotionEvent): Boolean {
                 isSingleTap = true
                 return super.onSingleTapUp(e)
             }
 
-            override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {
+            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
                 val event = downEvent
                 val activity = tryGetActivity(context)
                 if (event != null && activity != null) {

api/src/main/java/com/pitaya/mobile/uinspector/ui/panel/popup/UInspectorPopupPanelContainerImpl.kt

@@ -13,14 +13,14 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
+import com.github.yvescheung.whisper.IntDef
+import com.google.android.material.tabs.TabLayout
 import com.pitaya.mobile.uinspector.R
 import com.pitaya.mobile.uinspector.UInspector
 import com.pitaya.mobile.uinspector.hierarchy.Layer
 import com.pitaya.mobile.uinspector.hierarchy.LayerFactoryPlugin
 import com.pitaya.mobile.uinspector.util.dpToPx
 import com.pitaya.mobile.uinspector.util.log
-import com.github.yvescheung.whisper.IntDef
-import kotlinx.android.synthetic.main.uinspector_popup_panel_container.view.*
 
 /**
  * @author YvesCheung
@@ -71,9 +71,9 @@ internal class UInspectorPopupPanelContainerImpl(val parent: ViewGroup) :
         val inspectorMask: View,
         children: List<UInspectorChildPanel>
     ) {
-        private val popupPanel = inspectorMask.popup_panel
-        private val viewPager = popupPanel.popup_panel_viewpager
-        private val tabLayout = popupPanel.popup_panel_tab
+        private val popupPanel: ViewGroup = inspectorMask.findViewById(R.id.popup_panel)
+        private val viewPager: ViewPager = popupPanel.findViewById(R.id.popup_panel_viewpager)
+        private val tabLayout: TabLayout = popupPanel.findViewById(R.id.popup_panel_tab)
 
         private val adapter = PanelAdapter(children)
 

app/build.gradle

@@ -2,21 +2,25 @@ apply plugin: 'com.android.application'
 apply from: '../gradle/android_extension.gradle'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.pitaya.mobile.uinspector.demo"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
         multiDexEnabled true
     }
 
+    namespace 'com.pitaya.mobile.uinspector.demo'
+
     buildFeatures {
         // Enables Jetpack Compose for this module
         compose true
+
+        buildConfig true
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pitaya.mobile.uinspector.demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

app/src/main/java/com/pitaya/mobile/uinspector/ui/home/HomeFragment.kt

@@ -11,8 +11,6 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView
 import com.pitaya.mobile.uinspector.demo.R
-import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.item_recycler_view.view.*
 
 class HomeFragment : Fragment() {
 
@@ -30,7 +28,7 @@ class HomeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         val data = mutableListOf<HomeItem>()
         val adapter = HomeAdapter(data)
-        home_recycler_view.adapter = adapter
+        view.findViewById<RecyclerView>(R.id.home_recycler_view).adapter = adapter
         homeViewModel.data.observe(viewLifecycleOwner, Observer {
             data.clear()
             data.addAll(it)
@@ -58,6 +56,8 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private class HomeVH(itemView: View, val textView: TextView = itemView.recycler_text) :
-        RecyclerView.ViewHolder(itemView)
+    private class HomeVH(
+        itemView: View,
+        val textView: TextView = itemView.findViewById(R.id.recycler_text)
+    ) : RecyclerView.ViewHolder(itemView)
 }

app/src/main/java/com/pitaya/mobile/uinspector/ui/optional/ImageLoaderActivity.kt

@@ -5,8 +5,8 @@ import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import com.bumptech.glide.Glide
+import com.facebook.drawee.view.SimpleDraweeView
 import com.pitaya.mobile.uinspector.demo.R
-import kotlinx.android.synthetic.main.activity_image_loader.*
 
 /**
  * @author YvesCheung
@@ -22,9 +22,9 @@ class ImageLoaderActivity : Activity() {
             .load("https://raw.githubusercontent.com/YvesCheung/UInspector/2.x/art/uinspector.png")
             .error(ColorDrawable(Color.GREEN))
             .placeholder(ColorDrawable(Color.parseColor("#ff0099cc")))
-            .into(glide_imageview)
+            .into(findViewById(R.id.glide_imageview))
 
-        fresco_imageview.setImageURI(
+        findViewById<SimpleDraweeView>(R.id.fresco_imageview).setImageURI(
             "https://raw.githubusercontent.com/YvesCheung/UInspector/2.x/art/uinspector.png"
         )
     }