From 30dddeac779a2662cbe8a52de2d747c3ce29abee Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 15 Oct 2024 00:30:42 +0200 Subject: [PATCH] Move optional code to plugins package --- .../{utils => plugins}/reviews/WriteReviewHelper.kt | 10 +++++----- .../{utils => plugins}/reviews/WriteReviewHelper.kt | 2 +- .../{utils => plugins}/reviews/IWriteReviewHelper.kt | 2 +- .../main/java/eu/depau/etchdroid/ui/AboutActivity.kt | 2 +- .../java/eu/depau/etchdroid/ui/ProgressActivity.kt | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) rename app/src/foss/java/eu/depau/etchdroid/{utils => plugins}/reviews/WriteReviewHelper.kt (60%) rename app/src/gplay/java/eu/depau/etchdroid/{utils => plugins}/reviews/WriteReviewHelper.kt (97%) rename app/src/main/java/eu/depau/etchdroid/{utils => plugins}/reviews/IWriteReviewHelper.kt (67%) diff --git a/app/src/foss/java/eu/depau/etchdroid/utils/reviews/WriteReviewHelper.kt b/app/src/foss/java/eu/depau/etchdroid/plugins/reviews/WriteReviewHelper.kt similarity index 60% rename from app/src/foss/java/eu/depau/etchdroid/utils/reviews/WriteReviewHelper.kt rename to app/src/foss/java/eu/depau/etchdroid/plugins/reviews/WriteReviewHelper.kt index 3ce1c29..743db51 100644 --- a/app/src/foss/java/eu/depau/etchdroid/utils/reviews/WriteReviewHelper.kt +++ b/app/src/foss/java/eu/depau/etchdroid/plugins/reviews/WriteReviewHelper.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils.reviews +package eu.depau.etchdroid.plugins.reviews import android.app.Activity import android.content.Intent @@ -10,10 +10,10 @@ class WriteReviewHelper(private val mActivity: Activity) : IWriteReviewHelper { override fun launchReviewFlow() { mActivity.startActivity( - Intent( - Intent.ACTION_VIEW, - Uri.parse("https://github.com/EtchDroid/EtchDroid/") - ) + Intent( + Intent.ACTION_VIEW, + Uri.parse("https://github.com/EtchDroid/EtchDroid/") + ) ) } } \ No newline at end of file diff --git a/app/src/gplay/java/eu/depau/etchdroid/utils/reviews/WriteReviewHelper.kt b/app/src/gplay/java/eu/depau/etchdroid/plugins/reviews/WriteReviewHelper.kt similarity index 97% rename from app/src/gplay/java/eu/depau/etchdroid/utils/reviews/WriteReviewHelper.kt rename to app/src/gplay/java/eu/depau/etchdroid/plugins/reviews/WriteReviewHelper.kt index eaec526..9994932 100644 --- a/app/src/gplay/java/eu/depau/etchdroid/utils/reviews/WriteReviewHelper.kt +++ b/app/src/gplay/java/eu/depau/etchdroid/plugins/reviews/WriteReviewHelper.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils.reviews +package eu.depau.etchdroid.plugins.reviews import android.app.Activity import android.content.Context diff --git a/app/src/main/java/eu/depau/etchdroid/utils/reviews/IWriteReviewHelper.kt b/app/src/main/java/eu/depau/etchdroid/plugins/reviews/IWriteReviewHelper.kt similarity index 67% rename from app/src/main/java/eu/depau/etchdroid/utils/reviews/IWriteReviewHelper.kt rename to app/src/main/java/eu/depau/etchdroid/plugins/reviews/IWriteReviewHelper.kt index 4d03a9e..bad99cc 100644 --- a/app/src/main/java/eu/depau/etchdroid/utils/reviews/IWriteReviewHelper.kt +++ b/app/src/main/java/eu/depau/etchdroid/plugins/reviews/IWriteReviewHelper.kt @@ -1,4 +1,4 @@ -package eu.depau.etchdroid.utils.reviews +package eu.depau.etchdroid.plugins.reviews interface IWriteReviewHelper { val isGPlayFlavor: Boolean diff --git a/app/src/main/java/eu/depau/etchdroid/ui/AboutActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/AboutActivity.kt index cfda8d9..5c2dd3e 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/AboutActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/AboutActivity.kt @@ -48,7 +48,7 @@ import eu.depau.etchdroid.R import eu.depau.etchdroid.ui.composables.MainView import eu.depau.etchdroid.ui.composables.coloredShadow import eu.depau.etchdroid.utils.ktexts.activity -import eu.depau.etchdroid.utils.reviews.WriteReviewHelper +import eu.depau.etchdroid.plugins.reviews.WriteReviewHelper class AboutActivity : ComponentActivity() { private val mViewModel: ThemeViewModel by viewModels() diff --git a/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt index 0dc5393..64df5dc 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/ProgressActivity.kt @@ -73,7 +73,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.LinkAnnotation @@ -126,7 +125,7 @@ import eu.depau.etchdroid.utils.ktexts.startForegroundServiceCompat import eu.depau.etchdroid.utils.ktexts.toHRSize import eu.depau.etchdroid.utils.ktexts.toast import eu.depau.etchdroid.utils.ktexts.usbDevice -import eu.depau.etchdroid.utils.reviews.WriteReviewHelper +import eu.depau.etchdroid.plugins.reviews.WriteReviewHelper import kotlinx.coroutines.delay import me.jahnen.libaums.libusbcommunication.LibusbError import me.jahnen.libaums.libusbcommunication.LibusbException