Merge pull request #211 from jakepurple13/develop

Develop
jakepurple13 · Sep 14, 2021 · c5fd903 · c5fd903
2 parents 471b586 + c90fe11
commit c5fd903
Show file tree

Hide file tree

Showing 29 changed files with 519 additions and 887 deletions.
diff --git a/.github/workflows/build_check.yaml b/.github/workflows/build_check.yaml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: apk
-          path: animeworld/build/outputs/apk/debug/animeworld-debug.apk 
+          path: animeworld/build/outputs/apk/debug/animeworld-debug.apk
       - name: Upload APK
         uses: actions/upload-artifact@v1
         with:

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/AllFragment.kt b/UIViews/src/main/java/com/programmersbox/uiviews/AllFragment.kt
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/BaseFragment.kt b/UIViews/src/main/java/com/programmersbox/uiviews/BaseFragment.kt
@@ -41,5 +41,20 @@ abstract class BaseFragment : Fragment() {
         }
     }
 
+    abstract fun viewCreated(view: View, savedInstanceState: Bundle?)
+}
+
+abstract class BaseFragmentCompose : Fragment() {
+
+    private var hasInitializedRootView = false
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        if (!hasInitializedRootView) {
+            hasInitializedRootView = true
+            viewCreated(view, savedInstanceState)
+        }
+    }
+
     abstract fun viewCreated(view: View, savedInstanceState: Bundle?)
 }
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/BaseListFragment.kt b/UIViews/src/main/java/com/programmersbox/uiviews/BaseListFragment.kt
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/GenericInfo.kt b/UIViews/src/main/java/com/programmersbox/uiviews/GenericInfo.kt
@@ -1,18 +1,18 @@
 package com.programmersbox.uiviews
 
 import android.content.Context
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
-import androidx.recyclerview.widget.RecyclerView
+import com.programmersbox.favoritesdatabase.DbModel
 import com.programmersbox.models.ApiService
 import com.programmersbox.models.ChapterModel
+import com.programmersbox.models.ItemModel
 import com.programmersbox.sharedutils.AppUpdate
 
 interface GenericInfo {
 
     val apkString: AppUpdate.AppUpdates.() -> String?
 
-    fun createAdapter(context: Context, baseListFragment: BaseListFragment): ItemListAdapter<RecyclerView.ViewHolder>
-    fun createLayoutManager(context: Context): RecyclerView.LayoutManager
     fun chapterOnClick(model: ChapterModel, allChapters: List<ChapterModel>, context: Context)
     fun sourceList(): List<ApiService>
     fun searchList(): List<ApiService> = sourceList()
@@ -23,4 +23,12 @@ interface GenericInfo {
     @Composable
     fun ComposeShimmerItem()
 
+    @Composable
+    fun ItemListView(
+        list: List<ItemModel>,
+        favorites: List<DbModel>,
+        listState: LazyListState,
+        onClick: (ItemModel) -> Unit
+    )
+
 }
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/GlobalSearchFragment.kt b/UIViews/src/main/java/com/programmersbox/uiviews/GlobalSearchFragment.kt
@@ -6,7 +6,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -22,7 +25,7 @@ import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.CloudOff
-import androidx.compose.material.icons.filled.VerticalAlignTop
+import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.runtime.rxjava2.subscribeAsState
@@ -99,6 +102,7 @@ class GlobalSearchFragment : Fragment() {
                     var searchText by rememberSaveable { mutableStateOf(args.searchFor) }
                     val focusManager = LocalFocusManager.current
                     val listState = rememberLazyListState()
+                    val showButton by remember { derivedStateOf { listState.firstVisibleItemIndex > 0 } }
                     val scope = rememberCoroutineScope()
                     val swipeRefreshState = rememberSwipeRefreshState(isRefreshing = false)
                     val list by searchPublisher.subscribeAsState(initial = emptyList())
@@ -206,9 +210,15 @@ class GlobalSearchFragment : Fragment() {
                     ) {
                         Scaffold(
                             floatingActionButton = {
-                                FloatingActionButton(
-                                    onClick = { scope.launch { listState.animateScrollToItem(0) } }
-                                ) { Icon(Icons.Default.VerticalAlignTop, null) }
+                                AnimatedVisibility(
+                                    visible = showButton && searchText.isNotEmpty(),
+                                    enter = slideInVertically({ it / 2 }),
+                                    exit = slideOutVertically({ it / 2 })
+                                ) {
+                                    FloatingActionButton(
+                                        onClick = { scope.launch { listState.animateScrollToItem(0) } }
+                                    ) { Icon(Icons.Default.KeyboardArrowUp, null) }
+                                }
                             },
                             floatingActionButtonPosition = FabPosition.End
                         ) {
@@ -227,7 +237,7 @@ class GlobalSearchFragment : Fragment() {
                                                 SearchCoverCard(
                                                     model = m,
                                                     placeHolder = AppCompatResources.getDrawable(LocalContext.current, mainLogo.logoId)
-                                                ) { findNavController().navigate(GlobalSearchFragmentDirections.showDetails(m)) }
+                                                ) { findNavController().navigate(GlobalNavDirections.showDetails(m)) }
                                             }
                                         }
                                     }
@@ -251,20 +261,6 @@ class GlobalSearchFragment : Fragment() {
                             }
                         }
                     }
-
-                    /*LaunchedEffect(key1 = searchText) {
-                        snapshotFlow { searchText }
-                            .debounce(1000)
-                            .distinctUntilChanged()
-                            .collect { s ->
-                                println("Searching for $s")
-                                searchForItems(
-                                    searchText = searchText,
-                                    onSubscribe = { swipeRefreshState.isRefreshing = true },
-                                    subscribe = { swipeRefreshState.isRefreshing = false }
-                                )
-                            }
-                    }*/
                 }
             }
         }

diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/ItemListAdapter.kt b/UIViews/src/main/java/com/programmersbox/uiviews/ItemListAdapter.kt