Merge develop into master

.github/workflows/codeball.yml

@@ -0,0 +1,21 @@
+name: Codeball
+on:
+  pull_request: {}
+  pull_request_review_comment:
+    types: [created, edited]
+
+jobs:
+  codeball_job:
+    runs-on: ubuntu-latest
+    name: Codeball
+    steps:
+      # Run Codeball on all new Pull Requests and Review Comments! 🚀
+      # For customizations and more documentation, see https://github.com/sturdy-dev/codeball-action
+      - name: Codeball
+        uses: sturdy-dev/codeball-action@v2
+        with:
+          approvePullRequests: "true"
+          labelPullRequestsWhenApproved: "true"
+          labelPullRequestsWhenReviewNeeded: "false"
+          failJobsWhenReviewNeeded: "false"
+          codeSuggestionsFromComments: "true"          

app/build.gradle

@@ -7,23 +7,27 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.example.associate.training"
         minSdk 21
-        targetSdk 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         // For androidx.renderscript.
         renderscriptTargetApi 11
         renderscriptSupportModeEnabled true
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "com.example.associate.training.InstrumentationTestRunner"
     }
     buildFeatures {
         viewBinding true
         dataBinding true
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.2"
     }
     buildTypes {
         release {
@@ -36,58 +40,75 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '18'
     }
+    namespace 'com.example.associate.training'
 }
 
 dependencies {
-    // ViewModel
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    // WorkInfo, WorkManager
-    implementation "androidx.work:work-runtime-ktx:2.7.1"
+// AndroidX Libraries
+    implementation "androidx.core:core-ktx:1.7.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "com.google.android.material:material:1.6.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
+    // Compose
+    def compose_ui_version = '1.4.0'
+    implementation "androidx.compose.ui:ui:$compose_ui_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
+    implementation 'androidx.activity:activity-compose:1.7.0'
+    implementation 'androidx.compose.material:material:1.4.0'
 
-    // androidx.navigation, NavController
+    // Navigation
+    def nav_version = "2.4.2"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+    androidTestImplementation "androidx.navigation:navigation-testing:$nav_version"
+
+    // ViewModel and Lifecycle
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+    implementation "androidx.activity:activity-ktx:1.4.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
 
-    // Room libraries
+    //
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+
+    // WorkManager
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
+
+    // Room and DataStore
+    def room_version = "2.5.1"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
-
-    // optional - Kotlin Extensions and Coroutines support for Room
     implementation "androidx.room:room-ktx:$room_version"
-    // Image Loader
+    implementation "androidx.datastore:datastore-preferences:1.0.0"
+
+    // Image Loading
     implementation "io.coil-kt:coil:2.1.0"
 
-    // Moshi
+    // JSON Parsing
+    def moshi_version = "1.12.0"
     implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
-    // Retrofit with Moshi Converter
-    implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    // Gson
-    implementation 'com.google.code.gson:gson:2.8.9'
-
-    // DataStore
-    implementation "androidx.datastore:datastore-preferences:1.0.0"
-    // LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
-
-    // Testing-only dependencies
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.navigation:navigation-testing:2.4.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation "androidx.test:core:$test_core_version"
-    androidTestImplementation "androidx.test:runner:$test_core_version"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
-    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
+    implementation "com.squareup.retrofit2:converter-moshi:2.9.0"
+    implementation "com.google.code.gson:gson:2.8.9"
 
-    androidTestImplementation 'androidx.navigation:navigation-testing:2.4.2'
+    // Dependency Injection
+    def koin_version = "3.1.2"
+    implementation "io.insert-koin:koin-android:$koin_version"
+    testImplementation "io.insert-koin:koin-test:$koin_version"
+    androidTestImplementation "io.insert-koin:koin-test:$koin_version"
+    testImplementation "io.insert-koin:koin-test-junit4:$koin_version"
 
-    debugImplementation 'androidx.fragment:fragment-testing:1.4.1'
+    // glide
+    implementation 'com.github.bumptech.glide:glide:4.13.2'
+    // Testing Dependencies
+    def junit_version = "4.13.2"
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test:core:1.4.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:3.4.0"
+    debugImplementation "androidx.fragment:fragment-testing:1.4.1"
 
 }

app/src/androidTest/java/com/example/associate/training/MediaActivityTest.kt

@@ -0,0 +1,60 @@
+package com.example.associate.training
+
+import android.view.View
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.example.associate.training.media.MediaActivity
+import com.google.android.material.progressindicator.CircularProgressIndicator
+import org.hamcrest.Description
+import org.hamcrest.Matchers.allOf
+import org.hamcrest.TypeSafeMatcher
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MediaActivityTest {
+
+    @get:Rule
+    val activity = ActivityScenarioRule(MediaActivity::class.java)
+
+    @Test
+    fun testEncoding() {
+
+        val startTime = System.currentTimeMillis()
+        var clicked = false
+        val progressIndicator = onView(withId(R.id.progress_indicator))
+        val button = onView(withId(R.id.export_to_video))
+        while (!clicked && System.currentTimeMillis() - startTime < 10000) {
+            try {
+                button.check(matches(allOf(isClickable(), isDisplayed())))
+                button.perform(click())
+                // We need to wait for the progress indicator to be displayed because sometimes performing click is not working
+                progressIndicator.check(matches(object : TypeSafeMatcher<View>() {
+                    override fun describeTo(description: Description?) {
+                        description?.appendText("Indeterminate progress bar")
+                    }
+
+                    override fun matchesSafely(item: View?): Boolean {
+                        return item is CircularProgressIndicator && item.isIndeterminate
+                    }
+                }))
+                clicked = true
+            } catch (e: Throwable) {
+                Thread.sleep(100)
+            }
+        }
+
+        Thread.sleep(10000) // Wait for encoding to complete (adjust time as needed)
+
+        // Verify that the "Complete" Toast is displayed
+        onView(withId(R.id.content)).check(matches(withText("Complete")))
+
+    }
+
+}

app/src/androidTest/java/com/example/associate/training/ParcelableTest.kt

@@ -0,0 +1,95 @@
+package com.example.associate.training
+
+import android.os.Parcel
+import android.os.Parcelable
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * To have a custom model object which implements the interface Parcelable in order to pass objects between components
+ * (activities, fragments, services, etc…)
+ * See [medium](https://medium.com/@dbottillo/android-junit-parcelable-model-test-37a2f2ae18b1).
+ */
+@RunWith(AndroidJUnit4::class)
+class ParcelableTest {
+
+    @Test
+    fun object_equal() {
+        val book = Book("author", "title")
+
+        val parcel = Parcel.obtain()
+        book.writeToParcel(parcel, book.describeContents())
+        parcel.setDataPosition(0)
+
+        val createdFromParcel = Book.createFromParcel(parcel)
+        assertEquals("author", createdFromParcel.author)
+        assertEquals("title", createdFromParcel.title)
+    }
+
+    @Test
+    fun test_subclass() {
+        val book = SubBook("author", "title", true)
+
+        val parcel = Parcel.obtain()
+        book.writeToParcel(parcel, book.describeContents())
+        parcel.setDataPosition(0)
+
+        val createdFromParcel = SubBook.createFromParcel(parcel)
+        assertEquals("author", createdFromParcel.author)
+        assertEquals("title", createdFromParcel.title)
+        assertEquals(true, createdFromParcel.isAdult)
+    }
+}
+
+open class Book : Parcelable {
+    val author: String
+    val title: String
+
+    constructor(author: String, title: String) {
+        this.author = author
+        this.title = title
+    }
+
+    constructor(`in`: Parcel) {
+        author = `in`.readString().toString()
+        title = `in`.readString().toString()
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(author)
+        dest.writeString(title)
+    }
+
+    companion object CREATOR : Parcelable.Creator<Book> {
+        override fun createFromParcel(parcel: Parcel) = Book(parcel)
+        override fun newArray(size: Int): Array<Book?> = arrayOfNulls(size)
+    }
+}
+
+class SubBook : Book {
+    var isAdult: Boolean = false
+
+    constructor(author: String, title: String, isAdult: Boolean) : super(author, title) {
+        this.isAdult = isAdult
+    }
+
+    constructor(`in`: Parcel) : super(`in`) {
+        isAdult = `in`.readBoolean()
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        super.writeToParcel(dest, flags)
+        dest.writeBoolean(isAdult)
+    }
+
+    companion object CREATOR : Parcelable.Creator<SubBook> {
+        override fun createFromParcel(parcel: Parcel) = SubBook(parcel)
+        override fun newArray(size: Int): Array<SubBook?> = arrayOfNulls(size)
+    }
+}

app/src/androidTest/java/com/example/associate/training/core/InstrumentationTestRunner.kt

@@ -0,0 +1,15 @@
+package com.example.associate.training.core
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+
+class InstrumentationTestRunner : AndroidJUnitRunner() {
+    override fun newApplication(
+        classLoader: ClassLoader?,
+        className: String?,
+        context: Context?
+    ): Application {
+        return super.newApplication(classLoader, TestApplication::class.java.name, context)
+    }
+}