Fix: Replace Timber with Log, fix ActivityListAdapter and AppListAdapter errors

Author: risunCode

app/src/main/java/com/appcontrolx/presentation/viewmodel/AppListViewModel.kt

@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import android.util.Log
 import javax.inject.Inject
 
 sealed class AppListUiState {
@@ -36,11 +36,11 @@ class AppListViewModel @Inject constructor(
                 result.fold(
                     onSuccess = { apps ->
                         _uiState.value = AppListUiState.Success(apps)
-                        Timber.d("Loaded ${apps.size} user apps")
+                        Log.d(TAG, "Loaded ${apps.size} user apps")
                     },
                     onFailure = { error ->
                         _uiState.value = AppListUiState.Error(error.message ?: "Unknown error")
-                        Timber.e(error, "Failed to load user apps")
+                        Log.e(TAG, "Failed to load user apps", error)
                     }
                 )
             }
@@ -54,11 +54,11 @@ class AppListViewModel @Inject constructor(
                 result.fold(
                     onSuccess = { apps ->
                         _uiState.value = AppListUiState.Success(apps)
-                        Timber.d("Loaded ${apps.size} system apps")
+                        Log.d(TAG, "Loaded ${apps.size} system apps")
                     },
                     onFailure = { error ->
                         _uiState.value = AppListUiState.Error(error.message ?: "Unknown error")
-                        Timber.e(error, "Failed to load system apps")
+                        Log.e(TAG, "Failed to load system apps", error)
                     }
                 )
             }
@@ -88,9 +88,9 @@ class AppListViewModel @Inject constructor(
             val result = repository.freezeApp(packageName)
             onComplete(result)
             if (result.isSuccess) {
-                Timber.d("App frozen: $packageName")
+                Log.d(TAG, "App frozen: $packageName")
             } else {
-                Timber.e("Failed to freeze app: $packageName")
+                Log.e(TAG, "Failed to freeze app: $packageName")
             }
         }
     }
@@ -100,10 +100,14 @@ class AppListViewModel @Inject constructor(
             val result = repository.unfreezeApp(packageName)
             onComplete(result)
             if (result.isSuccess) {
-                Timber.d("App unfrozen: $packageName")
+                Log.d(TAG, "App unfrozen: $packageName")
             } else {
-                Timber.e("Failed to unfreeze app: $packageName")
+                Log.e(TAG, "Failed to unfreeze app: $packageName")
             }
         }
     }
+    
+    companion object {
+        private const val TAG = "AppListViewModel"
+    }
 }

app/src/main/java/com/appcontrolx/ui/AboutFragment.kt

@@ -13,11 +13,11 @@ import androidx.lifecycle.lifecycleScope
 import com.appcontrolx.R
 import com.appcontrolx.databinding.FragmentAboutBinding
 import com.appcontrolx.service.PermissionBridge
+import android.util.Log
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import timber.log.Timber
 
 @AndroidEntryPoint
 class AboutFragment : Fragment() {
@@ -48,7 +48,7 @@ class AboutFragment : Fragment() {
             b.tvVersion.text = getString(R.string.about_version_format, 
                 packageInfo.versionName, packageInfo.longVersionCode)
         } catch (e: Exception) {
-            Timber.e(e, "Failed to get package info")
+            Log.e(TAG, "Failed to get package info", e)
         }
 
         // Current mode
@@ -118,10 +118,14 @@ class AboutFragment : Fragment() {
         try {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
         } catch (e: Exception) {
-            Timber.e(e, "Failed to open URL: $url")
+            Log.e(TAG, "Failed to open URL: $url", e)
         }
     }
 
+    companion object {
+        private const val TAG = "AboutFragment"
+    }
+    
     private fun shareApp() {
         val intent = Intent(Intent.ACTION_SEND).apply {
             type = "text/plain"

app/src/main/java/com/appcontrolx/ui/adapter/ActivityListAdapter.kt

@@ -30,16 +30,11 @@ class ActivityListAdapter(
     ) : RecyclerView.ViewHolder(binding.root) {
 
         fun bind(item: ActivityItem) {
-            // App icon
-            if (item.appIcon != null) {
-                binding.ivAppIcon.setImageDrawable(item.appIcon)
-                binding.ivAppIcon.visibility = View.VISIBLE
-            } else {
-                binding.ivAppIcon.visibility = View.GONE
-            }
+            // Hide app icon for simple activity list (icon is in parent group)
+            binding.ivAppIcon.visibility = View.GONE
 
-            binding.tvAppName.text = item.appName
-            binding.tvActivityName.text = item.activityName.substringAfterLast(".")
+            binding.tvAppName.text = item.shortName
+            binding.tvActivityName.text = item.shortName
             binding.tvFullName.text = item.activityName
 
             // Show exported badge

app/src/main/java/com/appcontrolx/ui/adapter/AppListAdapter.kt

@@ -115,7 +115,7 @@ class AppListAdapter(
                 cardApp.setOnClickListener {
                     if (isSelectionMode) {
                         toggleSelection(app.packageName)
-                        notifyItemChanged(bindingAdapterPosition)
+                        notifyItemChanged(adapterPosition)
                     } else {
                         onInfoClick(app)
                     }
@@ -128,7 +128,7 @@ class AppListAdapter(
                         startSelection(app.packageName)
                     } else {
                         toggleSelection(app.packageName)
-                        notifyItemChanged(bindingAdapterPosition)
+                        notifyItemChanged(adapterPosition)
                     }
                     true
                 }