Resolved merge conflicts during merge with upstream/refactor

Author: yihang-lab

.gitignore

@@ -10,6 +10,7 @@ captures/
 *.class
 app/debug/
 app/release/
+.kotlin/
 
 # vscode / eclipse files
 *.classpath
@@ -18,3 +19,6 @@ app/release/
 bin/
 .vscode/
 *.code-workspace
+
+# logs
+*.log

app/build.gradle

@@ -1,14 +1,19 @@
 import com.android.tools.profgen.ArtProfileKt
 import com.android.tools.profgen.ArtProfileSerializer
 import com.android.tools.profgen.DexFile
+import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 
 plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "kotlin-kapt"
-    id "kotlin-parcelize"
-    id "checkstyle"
-    id "org.sonarqube" version "4.0.0.2929"
+    alias libs.plugins.android.application
+    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
+    alias libs.plugins.kotlin.kapt
+    alias libs.plugins.kotlin.parcelize
+    alias libs.plugins.kotlinx.serialization
+    alias libs.plugins.checkstyle
+    alias libs.plugins.sonarqube
+    alias libs.plugins.hilt
+    alias libs.plugins.aboutlibraries
 }
 
 android {
@@ -103,6 +108,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        compose true
         buildConfig true
     }
 
@@ -117,23 +123,6 @@ android {
     }
 }
 
-ext {
-    checkstyleVersion = '10.12.1'
-
-    androidxLifecycleVersion = '2.6.2'
-    androidxRoomVersion = '2.6.1'
-    androidxWorkVersion = '2.8.1'
-
-    stateSaverVersion = '1.4.1'
-    exoPlayerVersion = '2.18.7'
-    googleAutoServiceVersion = '1.1.1'
-    groupieVersion = '2.10.1'
-    markwonVersion = '4.6.2'
-
-    leakCanaryVersion = '2.12'
-    stethoVersion = '1.6.0'
-}
-
 configurations {
     checkstyle
     ktlint
@@ -143,7 +132,7 @@ checkstyle {
     getConfigDirectory().set(rootProject.file("checkstyle"))
     ignoreFailures false
     showViolations true
-    toolVersion = checkstyleVersion
+    toolVersion = libs.versions.checkstyle.get()
 }
 
 tasks.register('runCheckstyle', Checkstyle) {
@@ -185,11 +174,13 @@ tasks.register('formatKtlint', JavaExec) {
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
 
+apply from: 'check-dependencies.gradle'
+
 afterEvaluate {
     if (!System.properties.containsKey('skipFormatKtlint')) {
         preDebugBuild.dependsOn formatKtlint
     }
-    preDebugBuild.dependsOn runCheckstyle, runKtlint
+    preDebugBuild.dependsOn runCheckstyle, runKtlint, checkDependenciesOrder
 }
 
 sonar {
@@ -200,125 +191,161 @@ sonar {
     }
 }
 
+kapt {
+    correctErrorTypes true
+}
+
+aboutLibraries {
+    // note: offline mode prevents the plugin from fetching licenses at build time, which would be
+    // harmful for reproducible builds
+    offlineMode = true
+    duplicationMode = DuplicateMode.MERGE
+}
+
 dependencies {
 /** Desugaring **/
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
+    coreLibraryDesugaring libs.desugar.jdk.libs.nio
 
 /** NewPipe libraries **/
-    // You can use a local version by uncommenting a few lines in settings.gradle
-    // Or you can use a commit you pushed to GitHub by just replacing TeamNewPipe with your GitHub
-    // name and the commit hash with the commit hash of the (pushed) commit you want to test
-    // This works thanks to JitPack: https://jitpack.io/
-    implementation 'com.github.TeamNewPipe:nanojson:e9d656ddb49a412a5a0a5d5ef20ca7ef09549996'
-    // WORKAROUND: if you get errors with the NewPipeExtractor dependency, replace `v0.24.3` with
-    // the corresponding commit hash, since JitPack sometimes deletes artifacts.
-    // If there’s already a git hash, just add more of it to the end (or remove a letter)
-    // to cause jitpack to regenerate the artifact.
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:0023b22095a2d62a60cdfc87f4b5cd85c8b266c3'
-    implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
+    implementation libs.teamnewpipe.nanojson
+    implementation libs.teamnewpipe.newpipe.extractor
+    implementation libs.teamnewpipe.nononsense.filepicker
 
 /** Checkstyle **/
-    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
-    ktlint 'com.pinterest:ktlint:0.45.2'
+    checkstyle libs.tools.checkstyle
+    ktlint libs.tools.ktlint
 
 /** Kotlin **/
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
+    implementation libs.kotlin.stdlib
 
 /** AndroidX **/
-    implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
-    implementation 'androidx.media:media:1.7.0'
-    implementation 'androidx.preference:preference:1.2.1'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation "androidx.room:room-runtime:${androidxRoomVersion}"
-    implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
-    kapt "androidx.room:room-compiler:${androidxRoomVersion}"
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    // Newer version specified to prevent accessibility regressions with RecyclerView, see:
-    // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
-    implementation "androidx.work:work-runtime-ktx:${androidxWorkVersion}"
-    implementation "androidx.work:work-rxjava3:${androidxWorkVersion}"
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation "androidx.webkit:webkit:1.9.0"
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.cardview
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.documentfile
+    implementation libs.androidx.fragment.compose
+    implementation libs.androidx.lifecycle.livedata
+    implementation libs.androidx.lifecycle.viewmodel
+    implementation libs.androidx.media
+    implementation libs.androidx.preference
+    implementation libs.androidx.recyclerview
+    implementation libs.androidx.room.runtime
+    implementation libs.androidx.room.rxjava3
+    kapt libs.androidx.room.compiler
+    implementation libs.androidx.swiperefreshlayout
+    implementation libs.androidx.work.runtime
+    implementation libs.androidx.work.rxjava3
+    implementation libs.androidx.material
+    implementation libs.androidx.webkit
 
 /** Third-party libraries **/
     // Instance state boilerplate elimination
-    implementation 'com.github.livefront:bridge:v2.0.2'
-    implementation "com.evernote:android-state:$stateSaverVersion"
-    kapt "com.evernote:android-state-processor:$stateSaverVersion"
+    implementation libs.livefront.bridge
+    implementation libs.android.state
+    kapt libs.android.state.processor
 
     // HTML parser
-    implementation "org.jsoup:jsoup:1.17.2"
+    implementation libs.jsoup
 
     // HTTP client
-    implementation "com.squareup.okhttp3:okhttp:4.12.0"
+    implementation libs.okhttp
 
     // Media player
-    implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-dash:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-database:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-datasource:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-hls:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:exoplayer-ui:${exoPlayerVersion}"
-    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
+    implementation libs.exoplayer.core
+    implementation libs.exoplayer.dash
+    implementation libs.exoplayer.database
+    implementation libs.exoplayer.datasource
+    implementation libs.exoplayer.hls
+    implementation libs.exoplayer.smoothstreaming
+    implementation libs.exoplayer.ui
+    implementation libs.extension.mediasession
 
     // Metadata generator for service descriptors
-    compileOnly "com.google.auto.service:auto-service-annotations:${googleAutoServiceVersion}"
-    kapt "com.google.auto.service:auto-service:${googleAutoServiceVersion}"
+    compileOnly libs.auto.service
+    kapt libs.auto.service.kapt
 
     // Manager for complex RecyclerView layouts
-    implementation "com.github.lisawray.groupie:groupie:${groupieVersion}"
-    implementation "com.github.lisawray.groupie:groupie-viewbinding:${groupieVersion}"
+    implementation libs.lisawray.groupie
+    implementation libs.lisawray.groupie.viewbinding
 
     // Image loading
-    //noinspection NewerVersionAvailable,GradleDependency --> 2.8 is the last version, not 2.71828!
-    implementation "com.squareup.picasso:picasso:2.8"
+    implementation libs.coil.compose
+    implementation libs.coil.network.okhttp
 
     // Markdown library for Android
-    implementation "io.noties.markwon:core:${markwonVersion}"
-    implementation "io.noties.markwon:linkify:${markwonVersion}"
+    implementation libs.markwon.core
+    implementation libs.markwon.linkify
 
     // Crash reporting
-    implementation "ch.acra:acra-core:5.11.3"
+    implementation libs.acra.core
 
     // Properly restarting
-    implementation 'com.jakewharton:process-phoenix:2.1.2'
+    implementation libs.process.phoenix
 
     // Reactive extensions for Java VM
-    implementation "io.reactivex.rxjava3:rxjava:3.1.8"
-    implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
+    implementation libs.rxjava3.rxjava
+    implementation libs.rxjava3.rxandroid
     // RxJava binding APIs for Android UI widgets
-    implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
+    implementation libs.rxbinding4.rxbinding
 
     // Date and time formatting
-    implementation "org.ocpsoft.prettytime:prettytime:5.0.8.Final"
+    implementation libs.prettytime
+
+    // Jetpack Compose
+    implementation(platform(libs.androidx.compose.bom))
+    implementation libs.androidx.compose.material3
+    implementation libs.androidx.compose.adaptive
+    implementation libs.androidx.activity.compose
+    implementation libs.androidx.compose.ui.tooling.preview
+    implementation libs.androidx.lifecycle.viewmodel.compose
+    implementation libs.androidx.compose.ui.text // Needed for parsing HTML to AnnotatedString
+    implementation libs.androidx.compose.material.icons.extended
+
+    // Jetpack Compose related dependencies
+    implementation libs.androidx.paging.compose
+    implementation libs.androidx.navigation.compose
+
+    // Coroutines interop
+    implementation libs.kotlinx.coroutines.rx3
+
+    // Library loading for About screen
+    implementation libs.aboutlibraries.compose.m3
+
+    // Hilt
+    implementation libs.hilt.android
+    kapt(libs.hilt.compiler)
+
+    // Scroll
+    implementation libs.lazycolumnscrollbar
+
+    // Kotlinx Serialization
+    implementation libs.kotlinx.serialization.json
 
 /** Debugging **/
     // Memory leak detection
-    debugImplementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}"
-    debugImplementation "com.squareup.leakcanary:plumber-android:${leakCanaryVersion}"
-    debugImplementation "com.squareup.leakcanary:leakcanary-android-core:${leakCanaryVersion}"
+    debugImplementation libs.leakcanary.object.watcher
+    debugImplementation libs.leakcanary.plumber.android
+    debugImplementation libs.leakcanary.android.core
     // Debug bridge for Android
-    debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
-    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
+    debugImplementation libs.stetho
+    debugImplementation libs.stetho.okhttp3
+
+    // Jetpack Compose
+    debugImplementation libs.androidx.compose.ui.tooling
 
 /** Testing **/
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.6.0'
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
+
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.runner
+    androidTestImplementation libs.androidx.room.testing
+    androidTestImplementation libs.assertj.core
+    androidTestImplementation platform(libs.androidx.compose.bom)
+    androidTestImplementation libs.androidx.compose.ui.test.junit4
+    debugImplementation libs.androidx.compose.ui.test.manifest
 
-    androidTestImplementation "androidx.test.ext:junit:1.1.5"
-    androidTestImplementation "androidx.test:runner:1.5.2"
-    androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
-    androidTestImplementation "org.assertj:assertj-core:3.24.2"
 }
 
 static String getGitWorkingBranch() {

app/check-dependencies.gradle

@@ -0,0 +1,48 @@
+tasks.register('checkDependenciesOrder') {
+    group = 'verification'
+    description = 'Checks that each section in libs.versions.toml is sorted alphabetically'
+
+    def tomlFile = file('../gradle/libs.versions.toml')
+
+    doLast {
+        if (!tomlFile.exists()) {
+            throw new GradleException('TOML file not found')
+        }
+
+        def lines = tomlFile.readLines()
+        def nonSortedBlocks = []
+        def currentBlock = []
+        def prevLine = ''
+        def prevIndex = 0
+
+        lines.eachWithIndex { line, lineIndex ->
+            if (line.trim() && !line.startsWith('#')) {
+                if (line.startsWith('[')) {
+                    prevLine = ''
+                } else {
+                    def currIndex = lineIndex + 1
+                    if (prevLine > line) {
+                        if (currentBlock && currentBlock[-1] == "${prevIndex}: ${prevLine}") {
+                            currentBlock.add("${currIndex}: ${line}")
+                        } else {
+                            if (!currentBlock.isEmpty()) {
+                                nonSortedBlocks.add(currentBlock)
+                                currentBlock = []
+                            }
+                            currentBlock.add("${prevIndex}: ${prevLine}")
+                            currentBlock.add("${currIndex}: ${line}")
+                        }
+                    }
+                    prevLine = line
+                    prevIndex = lineIndex + 1
+                }
+            }
+        }
+
+        if (!currentBlock.isEmpty()) {
+            nonSortedBlocks.add(currentBlock)
+            throw new GradleException("The following lines were not sorted:\n" +
+                    nonSortedBlocks.collect { it.join("\n") }.join("\n\n"))
+        }
+    }
+}