system bottom navigation bar theme improvement.

design_3.0_TM_Module_snagsFix
Sikander Saleem 2 months ago
parent f3539f1471
commit e0ad359295

@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:http/http.dart'; import 'package:http/http.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
@ -9,6 +10,7 @@ import 'package:test_sa/controllers/api_routes/api_manager.dart';
import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/controllers/api_routes/urls.dart';
import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/enums/user_types.dart';
import 'package:test_sa/models/user.dart'; import 'package:test_sa/models/user.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import '../settings/app_settings.dart'; import '../settings/app_settings.dart';
@ -162,6 +164,12 @@ class SettingProvider extends ChangeNotifier {
_host = prefs.getString(ASettings.host) ?? URLs.host1; _host = prefs.getString(ASettings.host) ?? URLs.host1;
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
systemNavigationBarColor: _theme == "light" ? Colors.white : AppColor.neutral60,
systemNavigationBarIconBrightness: _theme == "light" ? Brightness.dark : Brightness.light,
));
isLoaded = true; isLoaded = true;
notifyListeners(); notifyListeners();
} }

@ -121,7 +121,10 @@ void main() async {
} else { } else {
await Firebase.initializeApp(); await Firebase.initializeApp();
} }
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(statusBarColor: Colors.transparent, systemNavigationBarColor: Colors.white)); SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(statusBarColor: Colors.transparent,
systemNavigationBarColor: Colors.white,
systemNavigationBarIconBrightness: Brightness.dark,
));
/// only portrait mode /// only portrait mode
SystemChrome.setPreferredOrientations([ SystemChrome.setPreferredOrientations([

@ -250,7 +250,7 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
AppTextFormField( AppTextFormField(
labelText: context.translation.travelingHours, labelText: context.translation.travelingHours,
controller: _travellingHoursController, controller: _travellingHoursController,
backgroundColor:AppColor.fieldBgColor(context), backgroundColor: AppColor.fieldBgColor(context),
showShadow: false, showShadow: false,
labelStyle: AppTextStyles.textFieldLabelStyle, labelStyle: AppTextStyles.textFieldLabelStyle,
suffixIcon: "clock".toSvgAsset(width: 20, color: context.isDark ? AppColor.neutral10 : null).paddingOnly(end: 16), suffixIcon: "clock".toSvgAsset(width: 20, color: context.isDark ? AppColor.neutral10 : null).paddingOnly(end: 16),
@ -281,7 +281,7 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
AppTextFormField( AppTextFormField(
initialValue: requestDetailProvider.activityMaintenanceHelperModel?.technicalComment, initialValue: requestDetailProvider.activityMaintenanceHelperModel?.technicalComment,
labelText: context.translation.technicalComment, labelText: context.translation.technicalComment,
backgroundColor:AppColor.fieldBgColor(context), backgroundColor: AppColor.fieldBgColor(context),
showShadow: false, showShadow: false,
labelStyle: AppTextStyles.textFieldLabelStyle, labelStyle: AppTextStyles.textFieldLabelStyle,
alignLabelWithHint: true, alignLabelWithHint: true,
@ -306,7 +306,6 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
}, },
), ),
// const AssistantEmployeeCard().toShadowContainer(context, paddingObject: const EdgeInsets.symmetric(horizontal: 16)).paddingOnly(start: 13, end: 14, top: 12), // const AssistantEmployeeCard().toShadowContainer(context, paddingObject: const EdgeInsets.symmetric(horizontal: 16)).paddingOnly(start: 13, end: 14, top: 12),
100.height,
], ],
), ),
), ),
@ -358,7 +357,7 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
], ],
) )
], ],
).toShimmer(isShow: snapshot.isLoading,context: context), ).toShimmer(isShow: snapshot.isLoading, context: context),
], ],
); );
}); });

@ -58,7 +58,8 @@ class _LandPageState extends State<LandPage> {
context: context, context: context,
useSafeArea: true, useSafeArea: true,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
builder: (context) => Container( builder: (context) => SafeArea(
child: Container(
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
@ -94,6 +95,7 @@ class _LandPageState extends State<LandPage> {
label: "Enable".addTranslation), label: "Enable".addTranslation),
], ],
)), )),
),
); );
} }
} }

@ -1,6 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_advanced_switch/flutter_advanced_switch.dart'; import 'package:flutter_advanced_switch/flutter_advanced_switch.dart';
import 'package:local_auth_darwin/local_auth_darwin.dart'; import 'package:local_auth_darwin/local_auth_darwin.dart';
@ -75,6 +76,11 @@ class _SettingsPageState extends State<SettingsPage> {
..addListener(() async { ..addListener(() async {
await _settingProvider!.setDarkTheme(_settingProvider!.theme == "light"); await _settingProvider!.setDarkTheme(_settingProvider!.theme == "light");
themeController!.value = _settingProvider!.theme == "light"; themeController!.value = _settingProvider!.theme == "light";
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
systemNavigationBarColor: _settingProvider!.theme == "light" ? Colors.white : AppColor.neutral60,
systemNavigationBarIconBrightness: _settingProvider!.theme == "light" ? Brightness.dark : Brightness.light,
));
}); });
// authController ??= ValueNotifier<bool>(_settingProvider.localAuth == "false") // authController ??= ValueNotifier<bool>(_settingProvider.localAuth == "false")

@ -45,7 +45,8 @@ class _SelectionBottomSheetState<T> extends State<SelectionBottomSheet<T>> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return SafeArea(
child: Container(
height: MediaQuery.of(context).size.height * .7, height: MediaQuery.of(context).size.height * .7,
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: const EdgeInsets.all(21), padding: const EdgeInsets.all(21),
@ -159,6 +160,7 @@ class _SelectionBottomSheetState<T> extends State<SelectionBottomSheet<T>> {
), ),
], ],
), ),
),
); );
} }
} }

Loading…
Cancel
Save