Reset FAB state when gallery list changes
This commit is contained in:
1 parent
9a9f2a8d70
commit
1230022d17
3 files changed
+9
-5
No files matched your search
@@ -228,6 +228,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
|
||||
fun switchLabel(label: String?) {
|
||||
Settings.recentDownloadLabel.value = label
|
||||
filterState = filterState.copy(label = label)
|
||||
fabHidden = false
|
||||
}
|
||||
|
||||
LaunchedEffect(filterState) {
|
||||
|
||||
@@ -104,6 +104,8 @@ fun AnimatedVisibilityScope.FavouritesScreen(navigator: DestinationsNavigator, v
|
||||
var urlBuilder by viewModel.urlBuilder
|
||||
var searchBarExpanded by rememberSaveable { mutableStateOf(false) }
|
||||
var searchBarOffsetY by remember { mutableIntStateOf(0) }
|
||||
var fabExpanded by remember { mutableStateOf(false) }
|
||||
var fabHidden by remember { mutableStateOf(false) }
|
||||
|
||||
// Derived State
|
||||
val keyword = urlBuilder.keyword
|
||||
@@ -163,6 +165,7 @@ fun AnimatedVisibilityScope.FavouritesScreen(navigator: DestinationsNavigator, v
|
||||
val newCat = index - 2
|
||||
refresh(FavListUrlBuilder(newCat))
|
||||
Settings.recentFavCat = newCat
|
||||
fabHidden = false
|
||||
launch { sheetState.close() }
|
||||
},
|
||||
colors = listItemOnDrawerColor(urlBuilder.favCat == index - 2),
|
||||
@@ -171,8 +174,6 @@ fun AnimatedVisibilityScope.FavouritesScreen(navigator: DestinationsNavigator, v
|
||||
}
|
||||
}
|
||||
|
||||
var fabExpanded by remember { mutableStateOf(false) }
|
||||
var fabHidden by remember { mutableStateOf(false) }
|
||||
val checkedInfoMap = remember { mutableStateMapOf<Long, BaseGalleryInfo>() }
|
||||
val selectMode = checkedInfoMap.isNotEmpty()
|
||||
DrawerHandle(!selectMode && !searchBarExpanded)
|
||||
|
||||
@@ -160,6 +160,9 @@ fun AnimatedVisibilityScope.GalleryListScreen(
|
||||
var urlBuilder by viewModel.urlBuilder
|
||||
var searchBarExpanded by rememberSaveable { mutableStateOf(false) }
|
||||
var searchBarOffsetY by remember { mutableIntStateOf(0) }
|
||||
var fabExpanded by remember { mutableStateOf(false) }
|
||||
var fabHidden by remember { mutableStateOf(false) }
|
||||
|
||||
val animateItems by Settings.animateItems.collectAsState()
|
||||
|
||||
var category by rememberMutableStateInDataStore("SearchCategory") { EhUtils.ALL_CATEGORY }
|
||||
@@ -220,6 +223,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(
|
||||
Settings.recentToplist = keyword
|
||||
urlBuilder = ListUrlBuilder(MODE_TOPLIST, mKeyword = keyword)
|
||||
data.refresh()
|
||||
fabHidden = false
|
||||
launch { sheetState.close() }
|
||||
},
|
||||
headlineContent = {
|
||||
@@ -374,6 +378,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(
|
||||
language = languageFilter
|
||||
}
|
||||
data.refresh()
|
||||
fabHidden = false
|
||||
}
|
||||
launch { sheetState.close() }
|
||||
},
|
||||
@@ -425,9 +430,6 @@ fun AnimatedVisibilityScope.GalleryListScreen(
|
||||
}
|
||||
}
|
||||
|
||||
var fabExpanded by remember { mutableStateOf(false) }
|
||||
var fabHidden by remember { mutableStateOf(false) }
|
||||
|
||||
val openGalleryKeyword = stringResource(R.string.gallery_list_search_bar_open_gallery)
|
||||
abstract class UrlSuggestion : Suggestion() {
|
||||
override val keyword = openGalleryKeyword
|
||||
|
||||
Reference in new issue
Block a user