Remove duplicate CommonActivityAction

anod · Mar 4, 2024 · 4aabfef · 4aabfef
1 parent 23d47a3
commit 4aabfef
Show file tree

Hide file tree

Showing 27 changed files with 26 additions and 64 deletions.
diff --git a/app/src/main/java/com/anod/appwatcher/compose/CommonActivityAction.kt b/app/src/main/java/com/anod/appwatcher/compose/CommonActivityAction.kt
diff --git a/app/src/main/java/com/anod/appwatcher/compose/MainDetailsScreen.kt b/app/src/main/java/com/anod/appwatcher/compose/MainDetailsScreen.kt
@@ -47,7 +47,7 @@ fun MainDetailScreen(
 
 @Preview(device = Devices.FOLDABLE)
 @Composable
-fun MainDetailScreen() {
+fun MainDetailScreenPreview() {
     AppTheme {
         MainDetailScreen(
                 wideLayout = HingeDeviceLayout(isWideLayout = true, hinge = Rect(0, 0, 80, 0)),

diff --git a/app/src/main/java/com/anod/appwatcher/compose/SearchTopBar.kt b/app/src/main/java/com/anod/appwatcher/compose/SearchTopBar.kt
@@ -188,8 +188,6 @@ fun SearchTopBar(
     )
 }
 
-
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun TopBarSearchField(
     query: String = "",

diff --git a/app/src/main/java/com/anod/appwatcher/details/DetailsPanel.kt b/app/src/main/java/com/anod/appwatcher/details/DetailsPanel.kt
@@ -91,7 +91,6 @@ import com.anod.appwatcher.R
 import com.anod.appwatcher.compose.AppInfoIcon
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BackArrowIconButton
-import com.anod.appwatcher.compose.CommonActivityAction
 import com.anod.appwatcher.compose.DeleteNotice
 import com.anod.appwatcher.compose.DropdownMenuAction
 import com.anod.appwatcher.compose.InstalledSignIcon
@@ -113,6 +112,7 @@ import com.anod.appwatcher.utils.StoreIntent
 import info.anodsplace.applog.AppLog
 import info.anodsplace.compose.placeholder
 import info.anodsplace.compose.toAnnotatedString
+import info.anodsplace.framework.content.CommonActivityAction
 import info.anodsplace.framework.text.Html
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf

diff --git a/app/src/main/java/com/anod/appwatcher/details/DetailsViewModel.kt b/app/src/main/java/com/anod/appwatcher/details/DetailsViewModel.kt
@@ -20,7 +20,7 @@ import androidx.palette.graphics.Palette
 import com.anod.appwatcher.R
 import com.anod.appwatcher.accounts.AuthTokenBlocking
 import com.anod.appwatcher.accounts.AuthTokenStartIntent
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppListTable
 import com.anod.appwatcher.database.AppTagsTable
 import com.anod.appwatcher.database.AppsDatabase

diff --git a/app/src/main/java/com/anod/appwatcher/history/HistoryComposeAcitvity.kt b/app/src/main/java/com/anod/appwatcher/history/HistoryComposeAcitvity.kt
@@ -16,10 +16,10 @@ import com.anod.appwatcher.R
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BaseComposeActivity
 import com.anod.appwatcher.compose.MainDetailScreen
-import com.anod.appwatcher.compose.onCommonActivityAction
 import com.anod.appwatcher.details.DetailsDialog
 import com.anod.appwatcher.utils.prefs
 import com.anod.appwatcher.watchlist.DetailContent
+import info.anodsplace.framework.content.onCommonActivityAction
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 

diff --git a/app/src/main/java/com/anod/appwatcher/history/HistoryListScreen.kt b/app/src/main/java/com/anod/appwatcher/history/HistoryListScreen.kt
@@ -36,7 +36,7 @@ import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import com.anod.appwatcher.R
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.compose.SearchTopBar
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.search.ListItem

diff --git a/app/src/main/java/com/anod/appwatcher/history/HistoryListViewModel.kt b/app/src/main/java/com/anod/appwatcher/history/HistoryListViewModel.kt
@@ -12,7 +12,7 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.filter
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.database.observePackages

diff --git a/app/src/main/java/com/anod/appwatcher/installed/InstalledActivity.kt b/app/src/main/java/com/anod/appwatcher/installed/InstalledActivity.kt
@@ -15,7 +15,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BaseComposeActivity
 import com.anod.appwatcher.compose.MainDetailScreen
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import com.anod.appwatcher.details.DetailsDialog
 import com.anod.appwatcher.model.Filters
 import com.anod.appwatcher.preferences.Preferences

diff --git a/app/src/main/java/com/anod/appwatcher/installed/InstalledListViewModel.kt b/app/src/main/java/com/anod/appwatcher/installed/InstalledListViewModel.kt
@@ -11,7 +11,7 @@ import com.anod.appwatcher.R
 import com.anod.appwatcher.accounts.AuthTokenBlocking
 import com.anod.appwatcher.accounts.CheckTokenError
 import com.anod.appwatcher.accounts.CheckTokenResult
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.utils.BaseFlowViewModel
 import com.anod.appwatcher.utils.PackageChangedReceiver

diff --git a/app/src/main/java/com/anod/appwatcher/preferences/SettingsActivity.kt b/app/src/main/java/com/anod/appwatcher/preferences/SettingsActivity.kt
@@ -29,7 +29,7 @@ import com.anod.appwatcher.backup.gdrive.GDriveSignIn
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BaseComposeActivity
 import com.anod.appwatcher.compose.MainDetailScreen
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import com.anod.appwatcher.utils.prefs
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.jakewharton.processphoenix.ProcessPhoenix

diff --git a/app/src/main/java/com/anod/appwatcher/preferences/SettingsViewModel.kt b/app/src/main/java/com/anod/appwatcher/preferences/SettingsViewModel.kt
@@ -15,7 +15,7 @@ import com.anod.appwatcher.backup.ExportBackupTask
 import com.anod.appwatcher.backup.ImportBackupTask
 import com.anod.appwatcher.backup.gdrive.GDriveSync
 import com.anod.appwatcher.backup.gdrive.UploadServiceContentObserver
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.Cleanup
 import com.anod.appwatcher.sync.SchedulesHistoryActivity

diff --git a/app/src/main/java/com/anod/appwatcher/search/SearchComposeActivity.kt b/app/src/main/java/com/anod/appwatcher/search/SearchComposeActivity.kt
@@ -12,7 +12,7 @@ import com.anod.appwatcher.accounts.AccountSelectionResult
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BaseComposeActivity
 import com.anod.appwatcher.compose.MainDetailScreen
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import com.anod.appwatcher.details.DetailsDialog
 import com.anod.appwatcher.watchlist.DetailContent
 import info.anodsplace.framework.app.HingeDeviceLayout

diff --git a/app/src/main/java/com/anod/appwatcher/search/SearchResultsScreen.kt b/app/src/main/java/com/anod/appwatcher/search/SearchResultsScreen.kt
@@ -41,7 +41,7 @@ import androidx.paging.compose.itemKey
 import coil.ImageLoader
 import com.anod.appwatcher.R
 import com.anod.appwatcher.compose.AppTheme
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.compose.SearchTopBar
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.tags.TagSelectionDialog

diff --git a/app/src/main/java/com/anod/appwatcher/search/SearchViewModel.kt b/app/src/main/java/com/anod/appwatcher/search/SearchViewModel.kt
@@ -21,7 +21,7 @@ import com.anod.appwatcher.accounts.AuthTokenBlocking
 import com.anod.appwatcher.accounts.AuthTokenStartIntent
 import com.anod.appwatcher.accounts.CheckTokenError
 import com.anod.appwatcher.accounts.CheckTokenResult
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.database.observePackages

diff --git a/app/src/main/java/com/anod/appwatcher/sync/SchedulesHistoryActivity.kt b/app/src/main/java/com/anod/appwatcher/sync/SchedulesHistoryActivity.kt
@@ -28,8 +28,8 @@ import com.anod.appwatcher.R
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BackArrowIconButton
 import com.anod.appwatcher.compose.BaseComposeActivity
-import com.anod.appwatcher.compose.CommonActivityAction
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.entities.Failed
 import com.anod.appwatcher.database.entities.New

diff --git a/app/src/main/java/com/anod/appwatcher/tags/TagWatchListComposeActivity.kt b/app/src/main/java/com/anod/appwatcher/tags/TagWatchListComposeActivity.kt
@@ -16,7 +16,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BaseComposeActivity
 import com.anod.appwatcher.compose.MainDetailScreen
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import com.anod.appwatcher.database.entities.Tag
 import com.anod.appwatcher.details.DetailsDialog
 import com.anod.appwatcher.model.Filters

diff --git a/app/src/main/java/com/anod/appwatcher/tags/TagsSelectionViewModel.kt b/app/src/main/java/com/anod/appwatcher/tags/TagsSelectionViewModel.kt
@@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.CreationExtras
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppTagsTable
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.entities.Tag

diff --git a/app/src/main/java/com/anod/appwatcher/userLog/UserLogActivity.kt b/app/src/main/java/com/anod/appwatcher/userLog/UserLogActivity.kt
@@ -7,7 +7,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.lifecycleScope
 import com.anod.appwatcher.compose.BaseComposeActivity
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import kotlinx.coroutines.launch
 
 /**

diff --git a/app/src/main/java/com/anod/appwatcher/userLog/UserLogViewModel.kt b/app/src/main/java/com/anod/appwatcher/userLog/UserLogViewModel.kt
@@ -2,7 +2,7 @@ package com.anod.appwatcher.userLog
 
 import android.content.Intent
 import androidx.compose.runtime.Immutable
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.utils.BaseFlowViewModel
 
 @Immutable

diff --git a/app/src/main/java/com/anod/appwatcher/watchlist/DetailContent.kt b/app/src/main/java/com/anod/appwatcher/watchlist/DetailContent.kt
@@ -9,7 +9,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import com.anod.appwatcher.R
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.details.DetailsPanel
 

diff --git a/app/src/main/java/com/anod/appwatcher/watchlist/MainActivity.kt b/app/src/main/java/com/anod/appwatcher/watchlist/MainActivity.kt
@@ -24,7 +24,7 @@ import com.anod.appwatcher.accounts.AccountSelectionDialog
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BaseComposeActivity
 import com.anod.appwatcher.compose.MainDetailScreen
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import com.anod.appwatcher.database.entities.Tag
 import com.anod.appwatcher.details.DetailsDialog
 import com.anod.appwatcher.history.HistoryListActivity

diff --git a/app/src/main/java/com/anod/appwatcher/watchlist/MainViewModel.kt b/app/src/main/java/com/anod/appwatcher/watchlist/MainViewModel.kt
@@ -11,7 +11,7 @@ import com.anod.appwatcher.R
 import com.anod.appwatcher.accounts.AccountSelectionResult
 import com.anod.appwatcher.accounts.AuthTokenBlocking
 import com.anod.appwatcher.accounts.AuthTokenStartIntent
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.entities.Tag
 import com.anod.appwatcher.preferences.Preferences

diff --git a/app/src/main/java/com/anod/appwatcher/watchlist/WatchListStateViewModel.kt b/app/src/main/java/com/anod/appwatcher/watchlist/WatchListStateViewModel.kt
@@ -22,7 +22,7 @@ import com.anod.appwatcher.AppWatcherActivity
 import com.anod.appwatcher.MarketSearchActivity
 import com.anod.appwatcher.R
 import com.anod.appwatcher.accounts.AuthTokenBlocking
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppListTable
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.entities.App

diff --git a/app/src/main/java/com/anod/appwatcher/wishlist/WishlistComposeAcitvity.kt b/app/src/main/java/com/anod/appwatcher/wishlist/WishlistComposeAcitvity.kt
@@ -14,7 +14,7 @@ import com.anod.appwatcher.R
 import com.anod.appwatcher.compose.AppTheme
 import com.anod.appwatcher.compose.BaseComposeActivity
 import com.anod.appwatcher.compose.MainDetailScreen
-import com.anod.appwatcher.compose.onCommonActivityAction
+import info.anodsplace.framework.content.onCommonActivityAction
 import com.anod.appwatcher.details.DetailsDialog
 import com.anod.appwatcher.utils.prefs
 import com.anod.appwatcher.watchlist.DetailContent

diff --git a/app/src/main/java/com/anod/appwatcher/wishlist/WishlistScreen.kt b/app/src/main/java/com/anod/appwatcher/wishlist/WishlistScreen.kt
@@ -37,7 +37,7 @@ import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import com.anod.appwatcher.R
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.compose.SearchTopBar
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.search.ListItem

diff --git a/app/src/main/java/com/anod/appwatcher/wishlist/WishlistViewModel.kt b/app/src/main/java/com/anod/appwatcher/wishlist/WishlistViewModel.kt
@@ -12,7 +12,7 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.filter
-import com.anod.appwatcher.compose.CommonActivityAction
+import info.anodsplace.framework.content.CommonActivityAction
 import com.anod.appwatcher.database.AppsDatabase
 import com.anod.appwatcher.database.entities.App
 import com.anod.appwatcher.database.observePackages