From 0f6e6bfb65eb8c5d1357441d5565581db8f10104 Mon Sep 17 00:00:00 2001 From: Kima Date: Sat, 27 May 2023 22:37:04 +0200 Subject: [PATCH] fixed account edit bugs --- .../ios/Runner.xcodeproj/project.pbxproj | 24 +++++++++---------- .../lib/screens/settings/settings_screen.dart | 11 +++++---- .../common/profile_image/profile_button.dart | 4 ++-- .../lib/pages/home/home_page.dart | 2 +- .../lib/ui/mobile/settings/nickname.dart | 4 ++-- .../lib/ui/mobile/settings/profile_pic.dart | 4 ++-- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj index b4bcb5a..08dfd60 100644 --- a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj +++ b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj @@ -478,7 +478,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 195; - DEVELOPMENT_TEAM = JWGEQSC9U7; + DEVELOPMENT_TEAM = 48XS7JAZB7; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = reFilc; @@ -488,7 +488,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 3.6.0; - PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -510,7 +510,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = JWGEQSC9U7; + DEVELOPMENT_TEAM = 48XS7JAZB7; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = livecard/Info.plist; @@ -526,7 +526,7 @@ MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -552,7 +552,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = JWGEQSC9U7; + DEVELOPMENT_TEAM = 48XS7JAZB7; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = livecard/Info.plist; @@ -567,7 +567,7 @@ ); MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -592,7 +592,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = JWGEQSC9U7; + DEVELOPMENT_TEAM = 48XS7JAZB7; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = livecard/Info.plist; @@ -607,7 +607,7 @@ ); MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -736,7 +736,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 195; - DEVELOPMENT_TEAM = JWGEQSC9U7; + DEVELOPMENT_TEAM = 48XS7JAZB7; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = reFilc; @@ -746,7 +746,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 3.6.0; - PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -764,7 +764,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 195; - DEVELOPMENT_TEAM = JWGEQSC9U7; + DEVELOPMENT_TEAM = 48XS7JAZB7; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = reFilc; @@ -774,7 +774,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 3.6.0; - PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/filcnaplo_desktop_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_desktop_ui/lib/screens/settings/settings_screen.dart index 7edd8f3..83504f6 100644 --- a/filcnaplo_desktop_ui/lib/screens/settings/settings_screen.dart +++ b/filcnaplo_desktop_ui/lib/screens/settings/settings_screen.dart @@ -36,7 +36,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_tabs/flutter_custom_tabs.dart' as tabs; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; -import 'package:filcnaplo/utils/color.dart'; import 'package:url_launcher/url_launcher.dart'; import 'settings_screen.i18n.dart'; import 'package:flutter/services.dart'; @@ -97,9 +96,11 @@ class _SettingsScreenState extends State Text(!settings.presentationMode ? account.username : "72469696969"), profileImage: ProfileImage( name: _firstName, - backgroundColor: !settings.presentationMode - ? ColorUtils.stringToColor(account.name) - : Theme.of(context).colorScheme.secondary, + backgroundColor: Theme.of(context) + .colorScheme + .primary, //!settings.presentationMode + //? ColorUtils.stringToColor(account.name) + //: Theme.of(context).colorScheme.secondary, role: account.role, ), onTap: () { @@ -124,7 +125,7 @@ class _SettingsScreenState extends State icon: Icon(FeatherIcons.grid, color: AppColors.of(context).teal), title: Text("open_dkt".i18n), ), - const UserMenuNickname(), + UserMenuNickname(u), // BottomSheetMenuItem( // onPressed: () {}, // icon: Icon(FeatherIcons.camera), diff --git a/filcnaplo_mobile_ui/lib/common/profile_image/profile_button.dart b/filcnaplo_mobile_ui/lib/common/profile_image/profile_button.dart index 59b59ae..32a1200 100755 --- a/filcnaplo_mobile_ui/lib/common/profile_image/profile_button.dart +++ b/filcnaplo_mobile_ui/lib/common/profile_image/profile_button.dart @@ -59,7 +59,7 @@ class ProfileButton extends StatelessWidget { : Theme.of(context).colorScheme.secondary, heroTag: child.heroTag, key: child.key, - name: !pMode ? child.name : "Béla", + name: !pMode ? child.name : "János", radius: child.radius, badge: child.badge, role: child.role, @@ -86,7 +86,7 @@ class ProfileButton extends StatelessWidget { ), ); }, - onDoubleTap: () { + onLongPress: () { if (account != null) { user.setUser(account!.id); restore().then((_) => user.setUser(account!.id)); diff --git a/filcnaplo_mobile_ui/lib/pages/home/home_page.dart b/filcnaplo_mobile_ui/lib/pages/home/home_page.dart index a96935c..a39991f 100755 --- a/filcnaplo_mobile_ui/lib/pages/home/home_page.dart +++ b/filcnaplo_mobile_ui/lib/pages/home/home_page.dart @@ -149,7 +149,7 @@ class _HomePageState extends State with TickerProviderStateMixin { if (!settings.presentationMode) { firstName = nameParts.length > 1 ? nameParts[1] : nameParts[0]; } else { - firstName = "Béla"; + firstName = "János"; } return Scaffold( diff --git a/filcnaplo_premium/lib/ui/mobile/settings/nickname.dart b/filcnaplo_premium/lib/ui/mobile/settings/nickname.dart index d8dcc15..865537d 100644 --- a/filcnaplo_premium/lib/ui/mobile/settings/nickname.dart +++ b/filcnaplo_premium/lib/ui/mobile/settings/nickname.dart @@ -14,7 +14,7 @@ import 'package:provider/provider.dart'; class UserMenuNickname extends StatelessWidget { late User u; - UserMenuNickname(User u, {Key? key}) : super(key: key); + UserMenuNickname(this.u, {Key? key}) : super(key: key); @override Widget build(BuildContext context) { @@ -39,7 +39,7 @@ class UserMenuNickname extends StatelessWidget { class UserNicknameEditor extends StatefulWidget { late User u; - UserNicknameEditor(User u, {Key? key}) : super(key: key); + UserNicknameEditor(this.u, {Key? key}) : super(key: key); @override State createState() => _UserNicknameEditorState(); diff --git a/filcnaplo_premium/lib/ui/mobile/settings/profile_pic.dart b/filcnaplo_premium/lib/ui/mobile/settings/profile_pic.dart index 1b4362d..1ce3dd2 100644 --- a/filcnaplo_premium/lib/ui/mobile/settings/profile_pic.dart +++ b/filcnaplo_premium/lib/ui/mobile/settings/profile_pic.dart @@ -19,7 +19,7 @@ import 'package:image_picker/image_picker.dart'; class UserMenuProfilePic extends StatelessWidget { late User u; - UserMenuProfilePic(User u, {Key? key}) : super(key: key); + UserMenuProfilePic(this.u, {Key? key}) : super(key: key); @override Widget build(BuildContext context) { @@ -43,7 +43,7 @@ class UserMenuProfilePic extends StatelessWidget { class UserProfilePicEditor extends StatefulWidget { late User u; - UserProfilePicEditor(User u, {Key? key}) : super(key: key); + UserProfilePicEditor(this.u, {Key? key}) : super(key: key); @override State createState() => _UserProfilePicEditorState();