diff --git a/Makefile b/Makefile index c126b102..bc9f35b1 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +.ONESHELL: include dependencies.properties MKDIR := mkdir -p RM := rm -rf @@ -223,9 +224,11 @@ release: # Create a new tag for release. @echo "previous version was $$(git describe --tags $$(git rev-list --tags --max-count=1))" @echo "WARNING: This operation will creates version tag and push to github" @bash -c '\ - [ "404" == $$(curl -o /dev/null -I -s -w "%{http_code}" https://github.com/hiddify/hiddify-core/releases/download/v$(core.version)/hiddify-core-linux-amd64.tar.gz) ]&&{ echo "Core Not Found"; exit 1 ; }&&\ - cversion_string=`grep -e "^version:" pubspec.yaml | cut -d: -f2-`; \ + [ "404" == $$(curl -o /dev/null -I -s -w "%{http_code}" https://github.com/hiddify/hiddify-core/releases/download/v$(core.version)/hiddify-core-linux-amd64.tar.gz) ]&&{ echo "Core Not Found"; exit 1 ; } || \ + cversion_string=`grep -e "^version:" pubspec.yaml | cut -d: -f2-`;\ cstr_version=`echo "$${cversion_string}" | sed -n "s/[ ]*\\([0-9]\\+\\.[0-9]\\+\\.[0-9]\\+\\)+.*/\\1/p"`; \ + [ "$$cversion_string" == "" ] && { echo "getting old version error"; exit 1 ; } ||\ + cbuild_number=`echo "$${cversion_string}" | sed -n "s/.*+\\([0-9]\\+\\)/\\1/p"`; \ echo "Current Version Name:$${cstr_version} Build Number:$${cbuild_number}";\ read -p "new Version? (provide the next x.y.z semver) : " TAG && \ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b8a8d04f..ee2a096c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -775,7 +775,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = SingBoxPacketTunnel/SingBoxPacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2000120000; + CURRENT_PROJECT_VERSION = 20001; ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = armv7; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -794,7 +794,7 @@ "@executable_path/libcore/", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 2.0.12.0.0; + MARKETING_VERSION = 2.0.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "-lresolv"; @@ -826,7 +826,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = SingBoxPacketTunnel/SingBoxPacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2000120000; + CURRENT_PROJECT_VERSION = 20001; ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = armv7; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -845,7 +845,7 @@ "@executable_path/libcore/", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 2.0.12.0.0; + MARKETING_VERSION = 2.0.1; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-lresolv"; @@ -875,7 +875,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = SingBoxPacketTunnel/SingBoxPacketTunnel.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2000120000; + CURRENT_PROJECT_VERSION = 20001; ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = armv7; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -894,7 +894,7 @@ "@executable_path/libcore/", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 2.0.12.0.0; + MARKETING_VERSION = 2.0.1; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-lresolv"; @@ -943,7 +943,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20001"$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -978,7 +978,7 @@ BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 20001"$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 3JFTY5BP58; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphoneos*]" = armv7; @@ -1023,9 +1023,9 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 200011; + CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 2.0.11.0; + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.hiddify.ios.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -1041,9 +1041,9 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 200011; + CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 2.0.11.0; + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.hiddify.ios.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1057,9 +1057,9 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 200011; + CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 2.0.11.0; + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.hiddify.ios.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1099,7 +1099,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20001"$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1161,7 +1161,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20001"$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1198,7 +1198,7 @@ BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 20001"$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 3JFTY5BP58; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphoneos*]" = armv7; @@ -1247,7 +1247,7 @@ BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 20001"$(FLUTTER_BUILD_NUMBER)"; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 3JFTY5BP58; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphoneos*]" = armv7; diff --git a/lib/features/profile/details/json_editor.dart b/lib/features/profile/details/json_editor.dart index a38378b8..68794fa7 100644 --- a/lib/features/profile/details/json_editor.dart +++ b/lib/features/profile/details/json_editor.dart @@ -965,7 +965,7 @@ class _ReplaceTextWithFieldState extends State<_ReplaceTextWithField> { Widget wrapWithColoredBox(String keyName) { if (widget.isHighlighted) { return ColoredBox( - color: Colors.amber, + color: Theme.of(context).colorScheme.errorContainer, child: Text(keyName, style: _textStyle), ); } @@ -993,7 +993,7 @@ class _ReplaceTextWithFieldState extends State<_ReplaceTextWithField> { } else if (widget.initialValue is num) { _constraints = const BoxConstraints(minWidth: 20, maxWidth: 80); } else { - _constraints = const BoxConstraints(minWidth: 20, maxWidth: 200); + _constraints = const BoxConstraints(minWidth: 20, maxWidth: 400); } _focusNode.addListener(handleChange); @@ -1059,8 +1059,8 @@ class _ReplaceTextWithFieldState extends State<_ReplaceTextWithField> { }); _focusNode.requestFocus(); }, - mouseCursor: MaterialStateMouseCursor.textable, - child: widget.initialValue is String && _text.isEmpty ? const SizedBox(width: 200, height: 18) : wrapWithColoredBox(_text), + mouseCursor: WidgetStateMouseCursor.textable, + child: widget.initialValue is String && _text.isEmpty ? const SizedBox(width: 400, height: 18) : wrapWithColoredBox(_text), ); } } @@ -1229,6 +1229,7 @@ class _SearchField extends StatelessWidget { TextField( onChanged: onChanged, autocorrect: false, + autofocus: true, cursorWidth: 1, // style: _textStyle, cursorHeight: 12, diff --git a/lib/features/profile/details/profile_details_notifier.dart b/lib/features/profile/details/profile_details_notifier.dart index 6c86c47b..ca168a07 100644 --- a/lib/features/profile/details/profile_details_notifier.dart +++ b/lib/features/profile/details/profile_details_notifier.dart @@ -86,6 +86,10 @@ class ProfileDetailsNotifier extends _$ProfileDetailsNotifier with AppLogger { String? configContent, }) { if (state case AsyncData(:final value)) { + final configContentChanged = value.configContentChanged || value.configContent != configContent; + // if (!configContentChanged) { + // return; + // } state = AsyncData( value.copyWith( profile: value.profile.map( @@ -103,7 +107,7 @@ class ProfileDetailsNotifier extends _$ProfileDetailsNotifier with AppLogger { ), local: (lp) => lp.copyWith(name: name ?? lp.name), ), - configContentChanged: value.configContentChanged || value.configContent != configContent, + configContentChanged: configContentChanged, configContent: configContent ?? value.configContent, ), );