Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/features/home/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ class _HomeState extends ConsumerState<Home> {

WidgetsBinding.instance.addPostFrameCallback((_) {
final appSetting = ref.read(appSettingProvider);
if(!appSetting.onboardingCompleted){
appLogger.info("User has not completed onboarding, navigating to Onboarding Screen");
if (!appSetting.onboardingCompleted) {
appLogger.info(
"User has not completed onboarding, navigating to Onboarding Screen");
appRouter.push(const Onboarding());
return;
}
Expand Down Expand Up @@ -150,8 +151,10 @@ class _HomeState extends ConsumerState<Home> {
if (!isUserPro) ...{
if (serverType == ServerLocationType.privateServer)
InfoRow(text: 'private_server_usage_message'.i18n)
else if (PlatformUtils.isIOS)
const SizedBox.shrink()
else
DataUsage(),
const DataUsage(),
},
SizedBox(height: 8),
_buildSetting(ref),
Expand Down
6 changes: 5 additions & 1 deletion lib/features/onboarding/onboarding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class _OnboardingState extends ConsumerState<Onboarding> {
],
),
slide2(context),
slide3(context),
if (!PlatformUtils.isIOS) slide3(context),
],
),
),
Expand All @@ -112,6 +112,10 @@ class _OnboardingState extends ConsumerState<Onboarding> {
pageIndex.value == 0 ? 'get_started'.i18n : 'continue'.i18n,
isTaller: true,
onPressed: () {
if (PlatformUtils.isIOS && pageIndex.value == 1) {
onboardingCompleted();
return;
}
if (pageIndex.value == 2) {
onboardingCompleted();
return;
Expand Down
4 changes: 1 addition & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ Future<void> _configureLocalTimeZone() async {
return;
}
tz.initializeTimeZones();
// if (Platform.isWindows) {
// return;
// }

final timeZoneName = await FlutterTimezone.getLocalTimezone();
tz.setLocalLocation(tz.getLocation(timeZoneName.identifier));
}
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 9.0.3+89
version: 9.0.3+90

environment:
sdk: ^3.6.0
Expand Down
Loading