KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(mobile): Home page app bar icons don't conform to theme change (#1409)

Browse Source 
* fix(mobile): Home page app bar icons don't conform to theme change

* Remove unsued code
This commit is contained in:
Alex
2023-01-24 12:23:06 -06:00
committed by GitHub
parent 0f1afff4c3
commit 8b7d7f1666
4 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/lib/modules/home/ui/immich_sliver_appbar.dart → mobile/lib/modules/home/ui/home_page_app_bar.dart
View File

@@ -10,8 +10,11 @@ import 'package:immich_mobile/shared/models/server_info_state.model.dart';
import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
class ImmichSliverAppBar extends ConsumerWidget {
const ImmichSliverAppBar({
class HomePageAppBar extends ConsumerWidget with PreferredSizeWidget {
@override
Size get preferredSize => const Size.fromHeight(kToolbarHeight);
const HomePageAppBar({
Key? key,
this.onPopBack,
}) : super(key: key);
@@ -25,11 +28,8 @@ class ImmichSliverAppBar extends ConsumerWidget {
ref.watch(authenticationProvider).deviceInfo.isAutoBackup;
final ServerInfoState serverInfoState = ref.watch(serverInfoProvider);
return SliverAppBar(
return AppBar(
centerTitle: true,
floating: true,
pinned: false,
snap: false,
backgroundColor: Theme.of(context).appBarTheme.backgroundColor,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(

45
mobile/lib/modules/home/views/home_page.dart
View File

@@ -11,7 +11,7 @@ import 'package:immich_mobile/modules/album/services/album.service.dart';
import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart';
import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
import 'package:immich_mobile/modules/home/ui/control_bottom_app_bar.dart';
import 'package:immich_mobile/modules/home/ui/immich_sliver_appbar.dart';
import 'package:immich_mobile/modules/home/ui/home_page_app_bar.dart';
import 'package:immich_mobile/modules/home/ui/profile_drawer/profile_drawer.dart';
import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
@@ -197,33 +197,19 @@ class HomePage extends HookConsumerWidget {
top: true,
child: Stack(
children: [
CustomScrollView(
slivers: [
if (!multiselectEnabled.state)
ImmichSliverAppBar(
onPopBack: reloadAllAsset,
ref.watch(assetProvider).renderList == null ||
ref.watch(assetProvider).allAssets.isEmpty
? buildLoadingIndicator()
: ImmichAssetGrid(
renderList: ref.watch(assetProvider).renderList!,
allAssets: ref.watch(assetProvider).allAssets,
assetsPerRow: appSettingService
.getSetting(AppSettingsEnum.tilesPerRow),
showStorageIndicator: appSettingService
.getSetting(AppSettingsEnum.storageIndicator),
listener: selectionListener,
selectionActive: selectionEnabledHook.value,
),
],
),
Padding(
padding: EdgeInsets.only(
top: selectionEnabledHook.value ? 0 : 60,
bottom: 0.0,
),
child: ref.watch(assetProvider).renderList == null ||
ref.watch(assetProvider).allAssets.isEmpty
? buildLoadingIndicator()
: ImmichAssetGrid(
renderList: ref.watch(assetProvider).renderList!,
allAssets: ref.watch(assetProvider).allAssets,
assetsPerRow: appSettingService
.getSetting(AppSettingsEnum.tilesPerRow),
showStorageIndicator: appSettingService
.getSetting(AppSettingsEnum.storageIndicator),
listener: selectionListener,
selectionActive: selectionEnabledHook.value,
),
),
if (selectionEnabledHook.value)
ControlBottomAppBar(
onShare: onShareAssets,
@@ -238,6 +224,11 @@ class HomePage extends HookConsumerWidget {
}
return Scaffold(
appBar: multiselectEnabled.state
? null
: HomePageAppBar(
onPopBack: reloadAllAsset,
),
drawer: const ProfileDrawer(),
body: buildBody(),
);