diff --git a/Samples/Flix/FlixLibrary/.gitignore b/Samples/Flix/FlixLibrary/.gitignore index 42afabfd..796b96d1 100644 --- a/Samples/Flix/FlixLibrary/.gitignore +++ b/Samples/Flix/FlixLibrary/.gitignore @@ -1 +1 @@ -/build \ No newline at end of file +/build diff --git a/Samples/Flix/FlixLibrary/build.gradle b/Samples/Flix/FlixLibrary/build.gradle index 1d485527..bba33eb3 100644 --- a/Samples/Flix/FlixLibrary/build.gradle +++ b/Samples/Flix/FlixLibrary/build.gradle @@ -1,9 +1,10 @@ buildscript { dependencies { - classpath "dev.testify:plugin:2.0.0-rc02" + classpath "dev.testify:plugin:${versions.testify}" } ext { versions = [ + 'testify': '2.0.0', 'compose': [ 'compilerExt': '1.4.7', 'core' : '1.4.3', @@ -17,7 +18,6 @@ buildscript { plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' - id 'org.jetbrains.kotlin.plugin.serialization' id 'kotlin-kapt' id 'com.google.dagger.hilt.android' } @@ -33,7 +33,6 @@ android { targetSdk 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" vectorDrawables { useSupportLibrary true @@ -43,7 +42,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } compileOptions { @@ -76,52 +74,24 @@ testify { } dependencies { - - androidTestImplementation "dev.testify:testify-compose:2.0.0-rc02" - androidTestImplementation "androidx.test:rules:1.5.0" - androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.3" - - implementation "com.google.dagger:dagger:2.48.1" kapt "com.google.dagger:dagger-compiler:2.46.1" + kapt "com.google.dagger:hilt-compiler:2.44" - // Core Android - implementation 'androidx.core:core-ktx:1.10.1' - implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1" - - // UI Layer def composeBom = platform('androidx.compose:compose-bom:2022.12.00') implementation composeBom - implementation 'androidx.compose.material3:material3:1.1.0' - implementation 'androidx.compose.ui:ui-tooling-preview' - implementation 'androidx.activity:activity-compose:1.7.1' - implementation("io.coil-kt:coil-compose:2.2.2") - implementation "com.google.accompanist:accompanist-systemuicontroller:0.29.0-alpha" - debugImplementation 'androidx.compose.ui:ui-tooling' - androidTestImplementation composeBom - - // Dependency injection - implementation "com.google.dagger:hilt-android:2.44" - kapt "com.google.dagger:hilt-compiler:2.44" - - // Navigation - implementation "androidx.navigation:navigation-compose:2.6.0" implementation "androidx.hilt:hilt-navigation-compose:1.0.0" - - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0") - + implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1" implementation "androidx.test.espresso.idling:idling-concurrent:3.6.0-alpha01" - - // Network Stack + implementation "com.google.dagger:hilt-android:2.44" + implementation 'androidx.compose.material3:material3:1.1.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'io.ktor:ktor-client-android:1.5.0' - implementation 'io.ktor:ktor-client-serialization:1.5.0' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0' - implementation 'io.ktor:ktor-client-logging-jvm:1.5.0' - - // Test Support - testImplementation 'junit:junit:4.13.2' + implementation("io.coil-kt:coil-compose:2.2.2") - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation "androidx.test:rules:1.5.0" + androidTestImplementation composeBom androidTestImplementation "androidx.compose.ui:ui-test-junit4:${versions.compose.ui}" + androidTestImplementation "androidx.test:rules:1.5.0" + androidTestImplementation "dev.testify:testify-compose:${versions.testify}" + androidTestImplementation 'androidx.test.ext:junit:1.1.5' } \ No newline at end of file diff --git a/Samples/Flix/FlixLibrary/consumer-rules.pro b/Samples/Flix/FlixLibrary/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/Samples/Flix/FlixLibrary/proguard-rules.pro b/Samples/Flix/FlixLibrary/proguard-rules.pro deleted file mode 100644 index 481bb434..00000000 --- a/Samples/Flix/FlixLibrary/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/test/TestImageLoader.kt b/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/test/TestImageLoader.kt index cf8eac27..34fad35a 100644 --- a/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/test/TestImageLoader.kt +++ b/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/test/TestImageLoader.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.test import androidx.test.espresso.idling.concurrent.IdlingThreadPoolExecutor diff --git a/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/ui/cast/CastDetailScreenshotTest.kt b/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/ui/cast/CastDetailScreenshotTest.kt index fbf7311f..1c424a70 100644 --- a/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/ui/cast/CastDetailScreenshotTest.kt +++ b/Samples/Flix/FlixLibrary/src/androidTest/java/dev/testify/samples/flix/ui/cast/CastDetailScreenshotTest.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.cast import androidx.compose.foundation.layout.Box diff --git a/Samples/Flix/FlixLibrary/src/debug/AndroidManifest.xml b/Samples/Flix/FlixLibrary/src/debug/AndroidManifest.xml index a5918e68..568741e5 100644 --- a/Samples/Flix/FlixLibrary/src/debug/AndroidManifest.xml +++ b/Samples/Flix/FlixLibrary/src/debug/AndroidManifest.xml @@ -1,4 +1,2 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/Samples/Flix/FlixLibrary/src/main/AndroidManifest.xml b/Samples/Flix/FlixLibrary/src/main/AndroidManifest.xml index 0e2fcc48..e6819934 100644 --- a/Samples/Flix/FlixLibrary/src/main/AndroidManifest.xml +++ b/Samples/Flix/FlixLibrary/src/main/AndroidManifest.xml @@ -7,4 +7,4 @@ android:name="dev.testify.ComposableTestActivity" android:theme="@style/Theme.AppCompat.NoActionBar" /> - \ No newline at end of file + diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/model/FlixPerson.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/model/FlixPerson.kt index 7e43b234..990f3d1d 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/model/FlixPerson.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/model/FlixPerson.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.data.model import dev.testify.samples.flix.ui.common.util.ImagePromise diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/RestApiSpec.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/RestApiSpec.kt index c6d4a810..4ed56ff7 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/RestApiSpec.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/RestApiSpec.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.data.remote.tmdb open class RestApiSpec( diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbApiConfiguration.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbApiConfiguration.kt index 6b06a46e..d1a6d13e 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbApiConfiguration.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbApiConfiguration.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.data.remote.tmdb interface TheMovieDbApiConfiguration { diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbConfigurationApi.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbConfigurationApi.kt index ffd383d3..d12ae3f1 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbConfigurationApi.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbConfigurationApi.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.data.remote.tmdb interface TheMovieDbConfigurationApi { diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbUrlResolver.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbUrlResolver.kt index be76db6a..3699a6d4 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbUrlResolver.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/TheMovieDbUrlResolver.kt @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Modified work copyright (c) 2023 ndtp + * Modified work copyright (c) 2024 ndtp * Original work copyright (c) 2023 Andrew Carmichael * * Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/entity/Person.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/entity/Person.kt index e04b98ac..852184a6 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/entity/Person.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/remote/tmdb/entity/Person.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.data.remote.tmdb.entity import kotlinx.serialization.SerialName diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/translator/PersonToFlixPerson.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/translator/PersonToFlixPerson.kt index 99aa1c04..99d1ade0 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/translator/PersonToFlixPerson.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/data/translator/PersonToFlixPerson.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.data.translator import dev.testify.samples.flix.data.model.FlixPerson diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/repository/CastMemberRepository.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/repository/CastMemberRepository.kt index 3374624e..b1abc106 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/repository/CastMemberRepository.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/repository/CastMemberRepository.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.repository import android.util.Log diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseContract.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseContract.kt index 13c68f87..c8194f98 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseContract.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseContract.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.base interface BaseEvent diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewExtensions.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewExtensions.kt index e79c87cd..cd40d1c9 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewExtensions.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewExtensions.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.base import android.os.Bundle diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewModel.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewModel.kt index 1ad1305e..2d061336 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewModel.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/base/BaseViewModel.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.base import android.util.Log diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailContract.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailContract.kt index 4f470a59..f15908e0 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailContract.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailContract.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.cast import dev.testify.samples.flix.data.model.FlixPerson diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailView.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailView.kt index 221eac3e..dc742692 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailView.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailView.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.cast import androidx.compose.animation.animateContentSize @@ -45,7 +68,7 @@ import dev.testify.samples.flix.ui.cast.CastDetailState.Error import dev.testify.samples.flix.ui.cast.CastDetailState.Loaded import dev.testify.samples.flix.ui.cast.CastDetailState.Loading import dev.testify.samples.flix.ui.cast.CastDetailState.Uninitialized -import dev.testify.samples.flix.ui.common.composeables.AsynchronousImage +import dev.testify.samples.flix.ui.common.AsynchronousImage import dev.testify.samples.flix.ui.theme.Spacing @Composable diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailViewModel.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailViewModel.kt index b541f866..6dafea56 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailViewModel.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/cast/CastDetailViewModel.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.cast import androidx.lifecycle.viewModelScope diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/AsynchronousImage.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/AsynchronousImage.kt index ca79fc56..cef24c2b 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/AsynchronousImage.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/AsynchronousImage.kt @@ -1,6 +1,28 @@ -package dev.testify.samples.flix.ui.common.composeables +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package dev.testify.samples.flix.ui.common -import android.util.Log import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -34,9 +56,6 @@ fun AsynchronousImage( filterQuality: FilterQuality = DrawScope.DefaultFilterQuality, ) { val imageLoader: ImageLoader = LocalContext.current.imageLoader - - Log.d("JETTE", "using loader $imageLoader") - AsyncImage( model = model, contentDescription = contentDescription, diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/util/ImagePromise.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/util/ImagePromise.kt index 8949d8d4..f4932ede 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/util/ImagePromise.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/common/util/ImagePromise.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.common.util interface ImagePromise { diff --git a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/theme/Spacing.kt b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/theme/Spacing.kt index f84fffc4..427c0251 100644 --- a/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/theme/Spacing.kt +++ b/Samples/Flix/FlixLibrary/src/main/java/dev/testify/samples/flix/ui/theme/Spacing.kt @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2024 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package dev.testify.samples.flix.ui.theme import androidx.compose.ui.unit.dp diff --git a/Samples/Flix/FlixLibrary/src/main/res/drawable/outline_photo_camera_24.xml b/Samples/Flix/FlixLibrary/src/main/res/drawable/outline_photo_camera_24.xml index 67c36b8c..978572c1 100644 --- a/Samples/Flix/FlixLibrary/src/main/res/drawable/outline_photo_camera_24.xml +++ b/Samples/Flix/FlixLibrary/src/main/res/drawable/outline_photo_camera_24.xml @@ -1,9 +1,3 @@ - - + + diff --git a/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CastMemberScreenshotTest.kt b/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CastMemberScreenshotTest.kt index a262b9aa..6dbdcaa6 100644 --- a/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CastMemberScreenshotTest.kt +++ b/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CastMemberScreenshotTest.kt @@ -2,8 +2,8 @@ package dev.testify.samples.flix.ui.common.composables import dev.testify.ComposableScreenshotRule import dev.testify.annotation.ScreenshotInstrumentation -import dev.testify.samples.flix.ui.cast.CastMember -import dev.testify.samples.flix.ui.cast.CastMemberPresentationModel +import dev.testify.samples.flix.ui.common.composeables.CastMember +import dev.testify.samples.flix.ui.common.composeables.CastMemberPresentationModel import dev.testify.samples.flix.ui.common.util.imagePromise import org.junit.Rule import org.junit.Test diff --git a/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CreditStripScreenshotTest.kt b/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CreditStripScreenshotTest.kt index 78d23a0d..a71cdf1c 100644 --- a/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CreditStripScreenshotTest.kt +++ b/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/common/composables/CreditStripScreenshotTest.kt @@ -2,7 +2,7 @@ package dev.testify.samples.flix.ui.common.composables import dev.testify.ComposableScreenshotRule import dev.testify.annotation.ScreenshotInstrumentation -import dev.testify.samples.flix.ui.cast.CastMemberPresentationModel +import dev.testify.samples.flix.ui.common.composeables.CastMemberPresentationModel import dev.testify.samples.flix.ui.common.composeables.CreditStrip import org.junit.Rule import org.junit.Test diff --git a/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/moviedetails/MovieDetailsScreenshotTest.kt b/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/moviedetails/MovieDetailsScreenshotTest.kt index 1d6da0bb..805aa5e6 100644 --- a/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/moviedetails/MovieDetailsScreenshotTest.kt +++ b/Samples/Flix/src/androidTest/java/dev/testify/samples/flix/ui/moviedetails/MovieDetailsScreenshotTest.kt @@ -4,7 +4,7 @@ import dev.testify.ComposableScreenshotRule import dev.testify.annotation.ScreenshotInstrumentation import dev.testify.samples.flix.presentation.moviedetails.model.MovieDetailsPresentationModel import dev.testify.samples.flix.presentation.moviedetails.viewmodel.MovieDetailsViewState -import dev.testify.samples.flix.ui.cast.CastMemberPresentationModel +import dev.testify.samples.flix.ui.common.composeables.CastMemberPresentationModel import org.junit.Rule import org.junit.Test diff --git a/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/MovieDetailsPresentationModel.kt b/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/MovieDetailsPresentationModel.kt index d5d725ac..efab216a 100644 --- a/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/MovieDetailsPresentationModel.kt +++ b/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/MovieDetailsPresentationModel.kt @@ -25,7 +25,7 @@ package dev.testify.samples.flix.presentation.moviedetails.model -import dev.testify.samples.flix.ui.cast.CastMemberPresentationModel +import dev.testify.samples.flix.ui.common.composeables.CastMemberPresentationModel data class MovieDetailsPresentationModel( val id: Int, diff --git a/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/mapper/MovieDetailsDomainModelToPresentationMapper.kt b/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/mapper/MovieDetailsDomainModelToPresentationMapper.kt index 5c677494..23a6f785 100644 --- a/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/mapper/MovieDetailsDomainModelToPresentationMapper.kt +++ b/Samples/Flix/src/main/java/dev/testify/samples/flix/presentation/moviedetails/model/mapper/MovieDetailsDomainModelToPresentationMapper.kt @@ -32,7 +32,7 @@ import dev.testify.samples.flix.domain.model.MovieCreditsDomainModel import dev.testify.samples.flix.domain.model.MovieDetailsDomainModel import dev.testify.samples.flix.domain.model.MovieDomainModel import dev.testify.samples.flix.presentation.moviedetails.model.MovieDetailsPresentationModel -import dev.testify.samples.flix.ui.cast.CastMemberPresentationModel +import dev.testify.samples.flix.ui.common.composeables.CastMemberPresentationModel import dev.testify.samples.flix.ui.common.util.toImagePromise import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime diff --git a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CastMember.kt b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CastMember.kt index 7a764201..dc9f5272 100644 --- a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CastMember.kt +++ b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CastMember.kt @@ -1,4 +1,4 @@ -package dev.testify.samples.flix.ui.cast +package dev.testify.samples.flix.ui.common.composeables import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -17,11 +17,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import dev.testify.samples.flix.library.R -import dev.testify.samples.flix.ui.common.composeables.AsynchronousImage +import dev.testify.samples.flix.ui.common.AsynchronousImage import dev.testify.samples.flix.ui.common.util.ImagePromise import dev.testify.samples.flix.ui.theme.Spacing -// TODO: Revert? data class CastMemberPresentationModel( val id: Int, val name: String, diff --git a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CreditStrip.kt b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CreditStrip.kt index 1d626dc4..cb3d3a76 100644 --- a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CreditStrip.kt +++ b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/CreditStrip.kt @@ -29,8 +29,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import dev.testify.samples.flix.R -import dev.testify.samples.flix.ui.cast.CastMember -import dev.testify.samples.flix.ui.cast.CastMemberPresentationModel @Composable fun CreditStrip( diff --git a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MoviePoster.kt b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MoviePoster.kt index fd8728bb..c513d08d 100644 --- a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MoviePoster.kt +++ b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MoviePoster.kt @@ -38,6 +38,7 @@ import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import dev.testify.samples.flix.R +import dev.testify.samples.flix.ui.common.AsynchronousImage @Composable fun MoviePoster( diff --git a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MovieThumbnail.kt b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MovieThumbnail.kt index 3dc0de2e..7f5a9b2d 100644 --- a/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MovieThumbnail.kt +++ b/Samples/Flix/src/main/java/dev/testify/samples/flix/ui/common/composeables/MovieThumbnail.kt @@ -38,6 +38,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp import dev.testify.samples.flix.application.foundation.ui.action.ViewAction import dev.testify.samples.flix.presentation.common.model.MoviePresentationModel +import dev.testify.samples.flix.ui.common.AsynchronousImage @Composable fun LoadingMovieThumbnail(