refactor app to utilize new compose activity

Author: Idadelveloper

app/src/main/AndroidManifest.xml

@@ -95,10 +95,6 @@
             android:exported="false"
             android:label="@string/settings" />
 
-        <activity
-            android:name=".settings.SettingsV2Activity"
-            android:exported="true"
-            android:label="@string/settings" />
 
         <activity
             android:name=".about.AboutActivity"
@@ -133,10 +129,6 @@
             android:label="@string/general_error"
             android:theme="@android:style/Theme.NoDisplay" />
 
-        <activity
-            android:name=".error.ErrorActivity"
-            android:exported="false" />
-
         <!-- giga get related -->
         <activity
             android:name=".download.DownloadActivity"

app/src/main/java/org/schabi/newpipe/BaseActivity.kt

@@ -14,7 +14,6 @@ import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.core.content.IntentCompat
 import androidx.navigation3.runtime.NavKey
 import dagger.hilt.android.AndroidEntryPoint
 import org.schabi.newpipe.error.ErrorInfo
@@ -28,11 +27,11 @@ import org.schabi.newpipe.ui.theme.AppTheme
  * via Intent with extras specifying which screen to display.
  */
 @AndroidEntryPoint
-class ComposeActivity: ComponentActivity() {
+class ComposeActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
-            navigationBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
         )
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
@@ -50,13 +49,10 @@ class ComposeActivity: ComponentActivity() {
 
     private fun resolveStartDestination(intent: Intent): NavKey {
         return when (intent.getStringExtra(EXTRA_SCREEN)) {
-            SCREEN_ERROR -> {
-                val errorInfo = IntentCompat.getParcelableExtra(
-                    intent, EXTRA_ERROR_INFO, ErrorInfo::class.java
-                ) ?: throw IllegalArgumentException("ErrorInfo is required for error screen")
-                Screen.Error(errorInfo)
-            }
+            SCREEN_ERROR -> Screen.Error
+
             SCREEN_SETTINGS -> Screen.Settings.Home
+
             else -> throw IllegalArgumentException(
                 "Unknown screen: ${intent.getStringExtra(EXTRA_SCREEN)}"
             )
@@ -70,15 +66,18 @@ class ComposeActivity: ComponentActivity() {
         const val SCREEN_ERROR = "error"
         const val SCREEN_SETTINGS = "settings"
 
-        /**
-         * Creates an intent to launch the error report screen.
-         */
         fun errorIntent(context: Context, errorInfo: ErrorInfo): Intent {
             return Intent(context, ComposeActivity::class.java).apply {
                 putExtra(EXTRA_SCREEN, SCREEN_ERROR)
                 putExtra(EXTRA_ERROR_INFO, errorInfo)
                 addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             }
         }
+
+        fun settingsIntent(context: Context): Intent {
+            return Intent(context, ComposeActivity::class.java).apply {
+                putExtra(EXTRA_SCREEN, SCREEN_SETTINGS)
+            }
+        }
     }
-}
+}

app/src/main/java/org/schabi/newpipe/ComposeActivity.kt

@@ -9,7 +9,6 @@ import com.google.android.exoplayer2.upstream.HttpDataSource
 import com.google.android.exoplayer2.upstream.Loader
 import java.net.UnknownHostException
 import kotlinx.parcelize.Parcelize
-import kotlinx.serialization.Serializable
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.Info
 import org.schabi.newpipe.extractor.ServiceList
@@ -36,7 +35,6 @@ import org.schabi.newpipe.util.text.getText
  * An error has occurred in the app. This class contains plain old parcelable data that can be used
  * to report the error and to show it to the user along with correct action buttons.
  */
-@Serializable
 @Parcelize
 class ErrorInfo private constructor(
     val stackTraces: Array<String>,
@@ -143,7 +141,6 @@ class ErrorInfo private constructor(
     }
 
     companion object {
-        @Serializable
         @Parcelize
         class ErrorMessage(
             @StringRes

app/src/main/java/org/schabi/newpipe/error/ErrorActivity.kt

@@ -11,12 +11,12 @@ import android.os.Build
 import android.util.Log
 import androidx.core.net.toUri
 import com.grack.nanojson.JsonWriter
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
 import org.schabi.newpipe.BuildConfig
 import org.schabi.newpipe.R
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.external_communication.ShareUtils
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
 
 /**
  * Pure utility functions for building and sending error reports.
@@ -131,22 +131,17 @@ object ErrorReportHelper {
         ShareUtils.openUrlInApp(context, context.getString(R.string.privacy_policy_url))
     }
 
-    private fun getContentLanguage(context: Context): String =
-        Localization.getPreferredLocalization(context).localizationCode
+    private fun getContentLanguage(context: Context): String = Localization.getPreferredLocalization(context).localizationCode
 
-    private fun getContentCountry(context: Context): String =
-        Localization.getPreferredContentCountry(context).countryCode
+    private fun getContentCountry(context: Context): String = Localization.getPreferredContentCountry(context).countryCode
 
-    private fun getAppLanguage(): String =
-        Localization.getAppLocale().toString()
+    private fun getAppLanguage(): String = Localization.getAppLocale().toString()
 
     private fun getOsString(): String {
         val name = System.getProperty("os.name")!!
         val osBase = Build.VERSION.BASE_OS.ifEmpty { "Android" }
         return "$name $osBase ${Build.VERSION.RELEASE} - ${Build.VERSION.SDK_INT}"
     }
 
-    private fun getCurrentTimestamp(): String =
-        ZonedDateTime.now().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    private fun getCurrentTimestamp(): String = ZonedDateTime.now().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
 }
-