From b1516d6062de9dd9978d379577d50363a2786d52 Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Fri, 16 May 2025 14:22:40 +0300 Subject: [PATCH 1/2] fix(testflight): upd proj version --- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- ios/Runner/Info.plist | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 0cacc747..8da639e5 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -388,7 +388,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -538,7 +538,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -576,7 +576,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 13; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 52b35d63..8d318a79 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 12 + 13 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS From 083feec4efb53a1165aa2bda46fd70321190914d Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Fri, 16 May 2025 15:17:18 +0300 Subject: [PATCH 2/2] feat(Issue-446): start screen profileScreen -> feedScreen --- lib/core/app_router.dart | 2 +- lib/features/auth/presentation/bloc/auth_cubit.dart | 2 +- .../presentation/widgets/bottom_navigation_bar_widget.dart | 2 +- .../bloc/registration_cubit/registration_cubit.dart | 2 +- lib/features/welcome/presentation/pages/welcome_screen.dart | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart index 63ec1094..1803c603 100644 --- a/lib/core/app_router.dart +++ b/lib/core/app_router.dart @@ -138,7 +138,7 @@ class AppRouter { final sharedPreferences = await SharedPreferences.getInstance(); final welcomeScreenWasShowed = sharedPreferences.getBool('welcomeScreenWasShowed'); if (welcomeScreenWasShowed == true) { - return '/my-profile-screen'; + return '/feed-screen'; } else { return null; } diff --git a/lib/features/auth/presentation/bloc/auth_cubit.dart b/lib/features/auth/presentation/bloc/auth_cubit.dart index f96f0261..03d3c896 100644 --- a/lib/features/auth/presentation/bloc/auth_cubit.dart +++ b/lib/features/auth/presentation/bloc/auth_cubit.dart @@ -30,7 +30,7 @@ class AuthCubit extends Cubit { ); showSuccessToast('Успешный вход'); await TokenStorage.saveTokenInStorage(token); - AppRouter.navigatorKey.currentContext?.go('/my-profile-screen'); + AppRouter.navigatorKey.currentContext?.go('/feed-screen'); return true; } catch (e) { log(e.toString()); diff --git a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart index c0b5e16a..52b9b838 100644 --- a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart +++ b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart @@ -27,7 +27,7 @@ class BottomNavigationBarWidget extends StatefulWidget { } class _BottomNavigationBarWidgetState extends State { - int currentBottomNavBarIndex = 0; + int currentBottomNavBarIndex = 1; late final List pages; @override diff --git a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart index 9a1cb16d..33688c9c 100644 --- a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart +++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart @@ -57,7 +57,7 @@ class RegistrationCubit extends Cubit { ), ); await TokenStorage.saveTokenInStorage(token); - AppRouter.navigatorKey.currentContext?.go('/my-profile-screen'); + AppRouter.navigatorKey.currentContext?.go('/feed-screen'); } catch (e) { log(e.toString()); } diff --git a/lib/features/welcome/presentation/pages/welcome_screen.dart b/lib/features/welcome/presentation/pages/welcome_screen.dart index b36e9233..70a5904e 100644 --- a/lib/features/welcome/presentation/pages/welcome_screen.dart +++ b/lib/features/welcome/presentation/pages/welcome_screen.dart @@ -80,7 +80,7 @@ class _WelcomeScreenState extends State { onTap: () async { final sharedPreferences = await SharedPreferences.getInstance(); await sharedPreferences.setBool('welcomeScreenWasShowed', true); - goRouter.go('/my-profile-screen'); + goRouter.go('/feed-screen'); }, borderRadius: BorderRadius.circular(8), child: Ink(