Upgrade external libs

anod · Sep 17, 2021 · 26c2bd9 · 26c2bd9
1 parent 25c77df
commit 26c2bd9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/app/src/main/java/com/anod/appwatcher/installed/InstalledActivity.kt b/app/src/main/java/com/anod/appwatcher/installed/InstalledActivity.kt
@@ -13,7 +13,7 @@ import com.anod.appwatcher.details.DetailsFragment
 import com.anod.appwatcher.watchlist.AppDetailsRouter
 import info.anodsplace.framework.R
 import info.anodsplace.framework.app.CustomThemeColors
-import info.anodsplace.framework.app.FragmentFactory
+import info.anodsplace.framework.app.FragmentContainerFactory
 import info.anodsplace.framework.app.FragmentToolbarActivity
 
 @Keep
@@ -52,7 +52,7 @@ class InstalledActivity : FragmentToolbarActivity(), AppDetailsRouter {
     }
 
     companion object {
-        fun intent(context: Context, factory: FragmentFactory, themeRes: Int, themeColors: CustomThemeColors) =
+        fun intent(context: Context, factory: FragmentContainerFactory, themeRes: Int, themeColors: CustomThemeColors) =
                 intent(
                         context = context,
                         factory = factory,

diff --git a/app/src/main/java/com/anod/appwatcher/installed/InstalledFragment.kt b/app/src/main/java/com/anod/appwatcher/installed/InstalledFragment.kt
@@ -25,7 +25,7 @@ import com.anod.appwatcher.watchlist.*
 import info.anodsplace.applog.AppLog
 import info.anodsplace.framework.app.CustomThemeColors
 import info.anodsplace.framework.app.DialogSingleChoice
-import info.anodsplace.framework.app.FragmentFactory
+import info.anodsplace.framework.app.FragmentContainerFactory
 import info.anodsplace.framework.app.ToolbarActivity
 import info.anodsplace.framework.content.startActivitySafely
 import kotlinx.coroutines.flow.collect
@@ -286,7 +286,7 @@ class InstalledFragment : WatchListFragment(), ActionMode.Callback {
     class Factory(
             private val sortId: Int,
             private val showImportAction: Boolean
-    ) : FragmentFactory("recently-installed-$sortId-$showImportAction") {
+    ) : FragmentContainerFactory("recently-installed-$sortId-$showImportAction") {
 
         override fun create(): Fragment = InstalledFragment().also {
             it.arguments = Bundle().apply {

diff --git a/app/src/main/java/com/anod/appwatcher/tags/AppsTagListFragment.kt b/app/src/main/java/com/anod/appwatcher/tags/AppsTagListFragment.kt
@@ -8,7 +8,7 @@ import com.anod.appwatcher.R
 import com.anod.appwatcher.database.entities.Tag
 import com.anod.appwatcher.databinding.ListItemEmptyBinding
 import com.anod.appwatcher.watchlist.*
-import info.anodsplace.framework.app.FragmentFactory
+import info.anodsplace.framework.app.FragmentContainerFactory
 import kotlinx.coroutines.flow.MutableSharedFlow
 
 /**
@@ -59,7 +59,7 @@ class AppsTagListFragment : WatchListFragment() {
             private val sortId: Int,
             private val tag: Tag?,
             val title: String
-    ) : FragmentFactory("apps-tags-$filterId-$sortId-${tag?.hashCode()}") {
+    ) : FragmentContainerFactory("apps-tags-$filterId-$sortId-${tag?.hashCode()}") {
 
         override fun create(): Fragment = AppsTagListFragment().also {
             it.arguments = Bundle().apply {

diff --git a/app/src/main/java/com/anod/appwatcher/tags/TagsListFragment.kt b/app/src/main/java/com/anod/appwatcher/tags/TagsListFragment.kt
@@ -19,7 +19,7 @@ import com.anod.appwatcher.databinding.ActivityTagsEditorBinding
 import com.anod.appwatcher.model.AppInfo
 import com.anod.appwatcher.utils.Theme
 import info.anodsplace.framework.app.CustomThemeColors
-import info.anodsplace.framework.app.FragmentFactory
+import info.anodsplace.framework.app.FragmentContainerFactory
 import info.anodsplace.framework.app.FragmentToolbarActivity
 import info.anodsplace.graphics.DrawableTint
 import kotlinx.coroutines.flow.collectLatest
@@ -152,7 +152,7 @@ class TagsListFragment : Fragment(), View.OnClickListener {
     companion object {
         const val EXTRA_APP = "app"
 
-        class Factory : FragmentFactory("tags_list") {
+        class Factory : FragmentContainerFactory("tags_list") {
             override fun create() = TagsListFragment()
         }
 

diff --git a/app/src/main/java/com/anod/appwatcher/watchlist/WatchListActivity.kt b/app/src/main/java/com/anod/appwatcher/watchlist/WatchListActivity.kt
@@ -38,7 +38,7 @@ import com.anod.appwatcher.utils.EventFlow
 import com.anod.appwatcher.utils.Theme
 import info.anodsplace.applog.AppLog
 import info.anodsplace.framework.app.CustomThemeColors
-import info.anodsplace.framework.app.FragmentFactory
+import info.anodsplace.framework.app.FragmentContainerFactory
 import kotlinx.coroutines.flow.collectLatest
 
 sealed class ListState
@@ -260,7 +260,7 @@ abstract class WatchListActivity : DrawerActivity(), TextView.OnEditorActionList
         }
     }
 
-    class Adapter(private val factories: List<FragmentFactory>, activity: WatchListActivity) : FragmentStateAdapter(activity) {
+    class Adapter(private val factories: List<FragmentContainerFactory>, activity: WatchListActivity) : FragmentStateAdapter(activity) {
 
         override fun getItemCount(): Int = factories.size
 

diff --git a/app/src/main/java/com/anod/appwatcher/watchlist/WatchListFragment.kt b/app/src/main/java/com/anod/appwatcher/watchlist/WatchListFragment.kt
@@ -35,7 +35,7 @@ import com.anod.appwatcher.tags.AppsTagSelectDialog
 import com.anod.appwatcher.utils.EventFlow
 import info.anodsplace.applog.AppLog
 import info.anodsplace.framework.app.CustomThemeActivity
-import info.anodsplace.framework.app.FragmentFactory
+import info.anodsplace.framework.app.FragmentContainerFactory
 import info.anodsplace.framework.content.startActivitySafely
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collect
@@ -294,7 +294,7 @@ open class WatchListFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener
             private val filterId: Int,
             private val sortId: Int,
             private val tag: Tag?
-    ) : FragmentFactory("watch-list-$filterId-$sortId-${tag?.hashCode()}") {
+    ) : FragmentContainerFactory("watch-list-$filterId-$sortId-${tag?.hashCode()}") {
 
         override fun create(): Fragment = WatchListFragment().also {
             it.arguments = Bundle().apply {

diff --git a/app/src/main/java/com/anod/appwatcher/wishlist/WishlistFragment.kt b/app/src/main/java/com/anod/appwatcher/wishlist/WishlistFragment.kt
@@ -22,7 +22,7 @@ import com.anod.appwatcher.search.ResultsAdapterList
 import com.anod.appwatcher.tags.TagSnackbar
 import com.anod.appwatcher.utils.EventFlow
 import info.anodsplace.framework.app.CustomThemeColors
-import info.anodsplace.framework.app.FragmentFactory
+import info.anodsplace.framework.app.FragmentContainerFactory
 import info.anodsplace.framework.app.FragmentToolbarActivity
 import info.anodsplace.framework.view.Keyboard
 import kotlinx.coroutines.Job
@@ -188,7 +188,7 @@ class WishListFragment : Fragment() {
         const val EXTRA_ACCOUNT = "extra_account"
         const val EXTRA_AUTH_TOKEN = "extra_auth_token"
 
-        private class Factory : FragmentFactory("wishlist") {
+        private class Factory : FragmentContainerFactory("wishlist") {
             override fun create() = WishListFragment()
         }
 

diff --git a/lib b/lib
+10 −12		framework/src/main/kotlin/info/anodsplace/framework/app/FragmentContainerActivity.kt
+1 −1		framework/src/main/kotlin/info/anodsplace/framework/app/FragmentToolbarActivity.kt