diff --git a/app/build.gradle b/app/build.gradle index 3d40d6d6..e50b5977 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ plugins { android { namespace "com.none.tom.exiferaser" - compileSdkVersion 34 + compileSdk 34 defaultConfig { applicationId "com.none.tom.exiferaser" @@ -42,23 +42,17 @@ android { viewBinding true } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - packagingOptions { - resources { - excludes += ["META-INF/AL2.0", "META-INF/LGPL2.1"] - } - } - testOptions { unitTests { includeAndroidResources = true } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { jvmTarget = "17" } diff --git a/app/src/main/java/com/none/tom/exiferaser/WindowSizeClass.kt b/app/src/main/java/com/none/tom/exiferaser/WindowSizeClass.kt index 480de119..8cc31315 100644 --- a/app/src/main/java/com/none/tom/exiferaser/WindowSizeClass.kt +++ b/app/src/main/java/com/none/tom/exiferaser/WindowSizeClass.kt @@ -53,14 +53,14 @@ sealed class WindowSizeClass : Parcelable { } @Parcelize - object Unspecified : WindowSizeClass() + data object Unspecified : WindowSizeClass() @Parcelize - object Compact : WindowSizeClass() + data object Compact : WindowSizeClass() @Parcelize - object Medium : WindowSizeClass() + data object Medium : WindowSizeClass() @Parcelize - object Expanded : WindowSizeClass() + data object Expanded : WindowSizeClass() } diff --git a/app/src/main/java/com/none/tom/exiferaser/main/business/MainSideEffect.kt b/app/src/main/java/com/none/tom/exiferaser/main/business/MainSideEffect.kt index f4df8306..6b2ae77b 100644 --- a/app/src/main/java/com/none/tom/exiferaser/main/business/MainSideEffect.kt +++ b/app/src/main/java/com/none/tom/exiferaser/main/business/MainSideEffect.kt @@ -50,7 +50,7 @@ sealed class MainSideEffect : Parcelable { ) : MainSideEffect() @Parcelize - object DeleteCameraImages : MainSideEffect() + data object DeleteCameraImages : MainSideEffect() @Parcelize data class ExternalPicturesDeleted( @@ -63,13 +63,13 @@ sealed class MainSideEffect : Parcelable { ) : MainSideEffect() @Parcelize - object FlexibleUpdateReadyToInstall : MainSideEffect() + data object FlexibleUpdateReadyToInstall : MainSideEffect() @Parcelize - object FlexibleUpdateFailed : MainSideEffect() + data object FlexibleUpdateFailed : MainSideEffect() @Parcelize - object ImageSourcesReadComplete : MainSideEffect() + data object ImageSourcesReadComplete : MainSideEffect() @Parcelize data class LaunchCamera( @@ -82,13 +82,13 @@ sealed class MainSideEffect : Parcelable { ) : MainSideEffect() @Parcelize - object NavigateToSelectionSavePath : MainSideEffect() + data object NavigateToSelectionSavePath : MainSideEffect() @Parcelize - object NavigateToSettings : MainSideEffect() + data object NavigateToSettings : MainSideEffect() @Parcelize - object NavigateToHelp : MainSideEffect() + data object NavigateToHelp : MainSideEffect() @Parcelize data class PasteImages( @@ -96,7 +96,7 @@ sealed class MainSideEffect : Parcelable { ) : MainSideEffect() @Parcelize - object PasteImagesNone : MainSideEffect() + data object PasteImagesNone : MainSideEffect() @Parcelize data class ReceivedImage( diff --git a/app/src/main/java/com/none/tom/exiferaser/selection/business/SelectionSideEffect.kt b/app/src/main/java/com/none/tom/exiferaser/selection/business/SelectionSideEffect.kt index ad570521..37d837a8 100644 --- a/app/src/main/java/com/none/tom/exiferaser/selection/business/SelectionSideEffect.kt +++ b/app/src/main/java/com/none/tom/exiferaser/selection/business/SelectionSideEffect.kt @@ -39,7 +39,7 @@ sealed class SelectionSideEffect : Parcelable { ) : SelectionSideEffect() @Parcelize - object SelectionHandled : SelectionSideEffect() + data object SelectionHandled : SelectionSideEffect() @Parcelize data class ShareImages( diff --git a/app/src/main/java/com/none/tom/exiferaser/selection/data/Result.kt b/app/src/main/java/com/none/tom/exiferaser/selection/data/Result.kt index 27e2390b..19a1fc6e 100644 --- a/app/src/main/java/com/none/tom/exiferaser/selection/data/Result.kt +++ b/app/src/main/java/com/none/tom/exiferaser/selection/data/Result.kt @@ -29,7 +29,7 @@ import kotlinx.parcelize.Parcelize sealed class Result : Parcelable { @Parcelize - object Empty : Result() + data object Empty : Result() @Parcelize data class Report( @@ -43,5 +43,5 @@ sealed class Result : Parcelable { ) : Result() @Parcelize - object HandledAll : Result() + data object HandledAll : Result() } diff --git a/app/src/main/java/com/none/tom/exiferaser/update/data/UpdatePriority.kt b/app/src/main/java/com/none/tom/exiferaser/update/data/UpdatePriority.kt index d9d9a7d6..a2dce4d5 100644 --- a/app/src/main/java/com/none/tom/exiferaser/update/data/UpdatePriority.kt +++ b/app/src/main/java/com/none/tom/exiferaser/update/data/UpdatePriority.kt @@ -26,11 +26,11 @@ import kotlinx.parcelize.Parcelize sealed class UpdatePriority : Parcelable { @Parcelize - object Low : UpdatePriority() + data object Low : UpdatePriority() @Parcelize - object Medium : UpdatePriority() + data object Medium : UpdatePriority() @Parcelize - object High : UpdatePriority() + data object High : UpdatePriority() } diff --git a/app/src/main/java/com/none/tom/exiferaser/update/data/UpdateResult.kt b/app/src/main/java/com/none/tom/exiferaser/update/data/UpdateResult.kt index b3b2a14c..72d68a41 100644 --- a/app/src/main/java/com/none/tom/exiferaser/update/data/UpdateResult.kt +++ b/app/src/main/java/com/none/tom/exiferaser/update/data/UpdateResult.kt @@ -29,10 +29,10 @@ import kotlinx.parcelize.Parcelize sealed class UpdateResult : Parcelable { @Parcelize - object NotAvailable : UpdateResult() + data object NotAvailable : UpdateResult() @Parcelize - object Available : UpdateResult() + data object Available : UpdateResult() @Parcelize data class InProgress( @@ -40,8 +40,8 @@ sealed class UpdateResult : Parcelable { ) : UpdateResult() @Parcelize - object ReadyToInstall : UpdateResult() + data object ReadyToInstall : UpdateResult() @Parcelize - object FailedToInstall : UpdateResult() + data object FailedToInstall : UpdateResult() } diff --git a/app/src/main/res/drawable/ic_shortcut_launch_camera_foreground.xml b/app/src/main/res/drawable/ic_shortcut_launch_camera_foreground.xml index be7cc4f3..ac397981 100644 --- a/app/src/main/res/drawable/ic_shortcut_launch_camera_foreground.xml +++ b/app/src/main/res/drawable/ic_shortcut_launch_camera_foreground.xml @@ -1,5 +1,4 @@