diff --git a/android/app/build.gradle b/android/app/build.gradle index 6aa30fd..6b9fc59 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -67,6 +67,7 @@ android { signingConfig signingConfigs.release } debug { + debuggable true } } diff --git a/changelogs/3.0.3.txt b/changelogs/3.0.3.txt new file mode 100644 index 0000000..d31e179 --- /dev/null +++ b/changelogs/3.0.3.txt @@ -0,0 +1 @@ +fix Translating Github addresses incorrectly #63 \ No newline at end of file diff --git a/ios/.gitignore b/ios/.gitignore deleted file mode 100644 index e96ef60..0000000 --- a/ios/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -*.mode1v3 -*.mode2v3 -*.moved-aside -*.pbxuser -*.perspectivev3 -**/*sync/ -.sconsign.dblite -.tags* -**/.vagrant/ -**/DerivedData/ -Icon? -**/Pods/ -**/.symlinks/ -profile -xcuserdata -**/.generated/ -Flutter/App.framework -Flutter/Flutter.framework -Flutter/Flutter.podspec -Flutter/Generated.xcconfig -Flutter/app.flx -Flutter/app.zip -Flutter/flutter_assets/ -Flutter/flutter_export_environment.sh -ServiceDefinitions.json -Runner/GeneratedPluginRegistrant.* - -# Exceptions to above rules. -!default.mode1v3 -!default.mode2v3 -!default.pbxuser -!default.perspectivev3 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist deleted file mode 100644 index 8c6e561..0000000 --- a/ios/Flutter/AppFrameworkInfo.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 12.0 - - diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig deleted file mode 100644 index ec97fc6..0000000 --- a/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" -#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig deleted file mode 100644 index c4855bf..0000000 --- a/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" -#include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile deleted file mode 100644 index 279576f..0000000 --- a/ios/Podfile +++ /dev/null @@ -1,41 +0,0 @@ -# Uncomment this line to define a global platform for your project -# platform :ios, '12.0' - -# CocoaPods analytics sends network stats synchronously affecting flutter build latency. -ENV['COCOAPODS_DISABLE_STATS'] = 'true' - -project 'Runner', { - 'Debug' => :debug, - 'Profile' => :release, - 'Release' => :release, -} - -def flutter_root - generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) - unless File.exist?(generated_xcode_build_settings_path) - raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" - end - - File.foreach(generated_xcode_build_settings_path) do |line| - matches = line.match(/FLUTTER_ROOT\=(.*)/) - return matches[1].strip if matches - end - raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" -end - -require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) - -flutter_ios_podfile_setup - -target 'Runner' do - use_frameworks! - use_modular_headers! - - flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) -end - -post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) - end -end diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index 200efa9..0000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,70 +0,0 @@ -PODS: - - Flutter (1.0.0) - - flutter_inappwebview_ios (0.0.1): - - Flutter - - flutter_inappwebview_ios/Core (= 0.0.1) - - OrderedSet (~> 5.0) - - flutter_inappwebview_ios/Core (0.0.1): - - Flutter - - OrderedSet (~> 5.0) - - OrderedSet (5.0.0) - - package_info_plus (0.4.5): - - Flutter - - receive_sharing_intent (1.8.0): - - Flutter - - share (0.0.1): - - Flutter - - shared_preferences_foundation (0.0.1): - - Flutter - - FlutterMacOS - - system_proxy (0.0.1): - - Flutter - - url_launcher_ios (0.0.1): - - Flutter - -DEPENDENCIES: - - Flutter (from `Flutter`) - - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) - - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`) - - share (from `.symlinks/plugins/share/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - system_proxy (from `.symlinks/plugins/system_proxy/ios`) - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - -SPEC REPOS: - trunk: - - OrderedSet - -EXTERNAL SOURCES: - Flutter: - :path: Flutter - flutter_inappwebview_ios: - :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" - package_info_plus: - :path: ".symlinks/plugins/package_info_plus/ios" - receive_sharing_intent: - :path: ".symlinks/plugins/receive_sharing_intent/ios" - share: - :path: ".symlinks/plugins/share/ios" - shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - system_proxy: - :path: ".symlinks/plugins/system_proxy/ios" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" - -SPEC CHECKSUMS: - Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0 - OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c - package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c - receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f - share: 0b2c3e82132f5888bccca3351c504d0003b3b410 - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44 - url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - -PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011 - -COCOAPODS: 1.15.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index b8fcc6f..0000000 --- a/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,554 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 65AA951A3F1714BA18690912 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA57274714D9719F872EC964 /* Pods_Runner.framework */; }; - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 9705A1C41CF9048500538489 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 1F6854BF94878216F374C0DC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; - 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9EEC3CEE771F6D7388AB4DF4 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - B06018C14A92AC83B33DD8AD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - DA57274714D9719F872EC964 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 65AA951A3F1714BA18690912 /* Pods_Runner.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 432BA0C0FFA8B35846B9A73F /* Frameworks */ = { - isa = PBXGroup; - children = ( - DA57274714D9719F872EC964 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 9740EEB31CF90195004384FC /* Generated.xcconfig */, - ); - name = Flutter; - sourceTree = ""; - }; - 97C146E51CF9000F007C117D = { - isa = PBXGroup; - children = ( - 9740EEB11CF90186004384FC /* Flutter */, - 97C146F01CF9000F007C117D /* Runner */, - 97C146EF1CF9000F007C117D /* Products */, - DF76BF37D9AB17CB97C097D3 /* Pods */, - 432BA0C0FFA8B35846B9A73F /* Frameworks */, - ); - sourceTree = ""; - }; - 97C146EF1CF9000F007C117D /* Products */ = { - isa = PBXGroup; - children = ( - 97C146EE1CF9000F007C117D /* Runner.app */, - ); - name = Products; - sourceTree = ""; - }; - 97C146F01CF9000F007C117D /* Runner */ = { - isa = PBXGroup; - children = ( - 97C146FA1CF9000F007C117D /* Main.storyboard */, - 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, - ); - path = Runner; - sourceTree = ""; - }; - DF76BF37D9AB17CB97C097D3 /* Pods */ = { - isa = PBXGroup; - children = ( - 1F6854BF94878216F374C0DC /* Pods-Runner.debug.xcconfig */, - 9EEC3CEE771F6D7388AB4DF4 /* Pods-Runner.release.xcconfig */, - B06018C14A92AC83B33DD8AD /* Pods-Runner.profile.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 97C146ED1CF9000F007C117D /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 445E31F4BF849FD7FCE61314 /* [CP] Check Pods Manifest.lock */, - 9740EEB61CF901F6004384FC /* Run Script */, - 97C146EA1CF9000F007C117D /* Sources */, - 97C146EB1CF9000F007C117D /* Frameworks */, - 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - A056F25EC2731EE95880450D /* [CP] Embed Pods Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Runner; - productName = Runner; - productReference = 97C146EE1CF9000F007C117D /* Runner.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 97C146E61CF9000F007C117D /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1510; - ORGANIZATIONNAME = ""; - TargetAttributes = { - 97C146ED1CF9000F007C117D = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 1100; - }; - }; - }; - buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 97C146E51CF9000F007C117D; - productRefGroup = 97C146EF1CF9000F007C117D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 97C146ED1CF9000F007C117D /* Runner */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 97C146EC1CF9000F007C117D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; - }; - 445E31F4BF849FD7FCE61314 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; - A056F25EC2731EE95880450D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 97C146EA1CF9000F007C117D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 97C146FA1CF9000F007C117D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C146FB1CF9000F007C117D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C147001CF9000F007C117D /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 249021D3217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Profile; - }; - 249021D4217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = H6F75GR6PJ; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.gmail.leetao94cn.rssaid; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Profile; - }; - 97C147031CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 97C147041CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = H6F75GR6PJ; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.gmail.leetao94cn.rssaid; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = H6F75GR6PJ; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.gmail.leetao94cn.rssaid; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147031CF9000F007C117D /* Debug */, - 97C147041CF9000F007C117D /* Release */, - 249021D3217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147061CF9000F007C117D /* Debug */, - 97C147071CF9000F007C117D /* Release */, - 249021D4217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 97C146E61CF9000F007C117D /* Project object */; -} diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index e67b280..0000000 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 21a3cc1..0000000 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift deleted file mode 100644 index 70693e4..0000000 --- a/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import UIKit -import Flutter - -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/App Store-1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/App Store-1024.png deleted file mode 100644 index a7d3f86..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/App Store-1024.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/CarPlay-60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/CarPlay-60@2x.png deleted file mode 100644 index 0f38360..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/CarPlay-60@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/CarPlay-60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/CarPlay-60@3x.png deleted file mode 100644 index 57e8e4b..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/CarPlay-60@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index ba59598..0000000 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1 +0,0 @@ -{"images":[{"size":"20x20","idiom":"iphone","filename":"iPhone Notification-20@2x.png","appearances":null,"scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"iPhone Notification-20@3x.png","appearances":null,"scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"iPhone Settings-29@2x.png","appearances":null,"scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"iPhone Settings-29@3x.png","appearances":null,"scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"iPhone Spotlight-40@2x.png","appearances":null,"scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"iPhone Spotlight-40@3x.png","appearances":null,"scale":"3x"},{"size":"60x60","idiom":"iphone","filename":"iPhone App-60@2x.png","appearances":null,"scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"iPhone App-60@3x.png","appearances":null,"scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"iPad Notifications-20.png","appearances":null,"scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"iPad Notifications-20@2x.png","appearances":null,"scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"iPad Settings-29.png","appearances":null,"scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"iPad Settings-29@2x.png","appearances":null,"scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"iPad Spotlight-40.png","appearances":null,"scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"iPad Spotlight-40@2x.png","appearances":null,"scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"iPad App-76.png","appearances":null,"scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"iPad App-76@2x.png","appearances":null,"scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"iPad Pro App-83.5@2x.png","appearances":null,"scale":"2x"},{"size":"60x60","idiom":"car","filename":"CarPlay-60@2x.png","appearances":null,"scale":"2x"},{"size":"60x60","idiom":"car","filename":"CarPlay-60@3x.png","appearances":null,"scale":"3x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"App Store-1024.png","appearances":null,"scale":"1x"}],"info":{"version":1,"author":"xcode"}} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad App-76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad App-76.png deleted file mode 100644 index b278257..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad App-76.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad App-76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad App-76@2x.png deleted file mode 100644 index 434301e..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad App-76@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Notifications-20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Notifications-20.png deleted file mode 100644 index 8408063..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Notifications-20.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Notifications-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Notifications-20@2x.png deleted file mode 100644 index ce70a66..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Notifications-20@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Pro App-83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Pro App-83.5@2x.png deleted file mode 100644 index e8ad894..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Pro App-83.5@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Settings-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Settings-29.png deleted file mode 100644 index 77186a3..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Settings-29.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Settings-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Settings-29@2x.png deleted file mode 100644 index d3381a1..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Settings-29@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Spotlight-40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Spotlight-40.png deleted file mode 100644 index ce70a66..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Spotlight-40.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Spotlight-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Spotlight-40@2x.png deleted file mode 100644 index 59d6a2f..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPad Spotlight-40@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone App-60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone App-60@2x.png deleted file mode 100644 index 0f38360..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone App-60@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone App-60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone App-60@3x.png deleted file mode 100644 index 57e8e4b..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone App-60@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Notification-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Notification-20@2x.png deleted file mode 100644 index ce70a66..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Notification-20@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Notification-20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Notification-20@3x.png deleted file mode 100644 index c7a7f1e..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Notification-20@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Settings-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Settings-29@2x.png deleted file mode 100644 index d3381a1..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Settings-29@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Settings-29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Settings-29@3x.png deleted file mode 100644 index cebab9d..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Settings-29@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight-40@2x.png deleted file mode 100644 index 59d6a2f..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight-40@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight-40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight-40@3x.png deleted file mode 100644 index 0f38360..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight-40@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100644 index 0bedcf2..0000000 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "LaunchImage.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100644 index 89c2725..0000000 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Launch Screen Assets - -You can customize the launch screen with your own desired assets by replacing the image files in this directory. - -You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index f2e259c..0000000 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100644 index f3c2851..0000000 --- a/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist deleted file mode 100644 index f8f1e0f..0000000 --- a/ios/Runner/Info.plist +++ /dev/null @@ -1,54 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLocalizations - - en - zh - - CFBundleName - RSSAid - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - - - diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 308a2a5..0000000 --- a/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" diff --git a/lib/models/rule.dart b/lib/models/rule.dart index da55458..b4ce6f1 100644 --- a/lib/models/rule.dart +++ b/lib/models/rule.dart @@ -6,9 +6,20 @@ class Rule { Rule({required this.title, required this.docs, required this.source, required this.target}); } +class PositionItem { + final int position; + final bool optional; + PositionItem({required this.position, required this.optional}); + + Map toJson() => { + "position": this.position, + "optional": this.optional + }; +} + class Position { final String origin; - final List replacePositions; + final Map replacePositions; final List strings; Position({required this.origin, required this.replacePositions, required this.strings}); } \ No newline at end of file diff --git a/lib/radar/rss_plus.dart b/lib/radar/rss_plus.dart index 710240a..1f53315 100644 --- a/lib/radar/rss_plus.dart +++ b/lib/radar/rss_plus.dart @@ -4,14 +4,9 @@ import 'package:html/parser.dart' show parse; import 'package:rssaid/common/common.dart'; import 'package:rssaid/models/radar.dart'; -import 'package:rssaid/radar/rules.dart'; class RssPlus { static Future> detecting(String url) async { - var specialRadar = Rules.detectUrl(url); - if (specialRadar != null) { - return specialRadar; - } return await detectByUrl(url); } diff --git a/lib/radar/rsshub.dart b/lib/radar/rsshub.dart index ac0b35a..a58e7aa 100644 --- a/lib/radar/rsshub.dart +++ b/lib/radar/rsshub.dart @@ -4,17 +4,15 @@ import 'package:rssaid/models/radar.dart'; import 'package:rssaid/radar/rule_type/page_info.dart'; import 'package:rssaid/radar/rule_type/rule.dart'; import 'package:rssaid/radar/source_parser.dart'; -import 'package:rssaid/shared_prefs.dart'; import 'package:tldts/core/index.dart'; import 'package:tldts/tldts.dart'; class RssHub { - final SharedPrefs prefs = SharedPrefs(); List getPageRSSHub(PageInfo pageInfo) { List radars = []; - String stringRules = prefs.rules; + String stringRules = pageInfo.rules; if (stringRules.isEmpty) { return radars; } diff --git a/lib/radar/rules.dart b/lib/radar/rules.dart index 04460fb..93244a8 100644 --- a/lib/radar/rules.dart +++ b/lib/radar/rules.dart @@ -1,5 +1,5 @@ import 'package:rssaid/models/radar.dart'; -import 'package:rssaid/radar/strategies/weiboStrategy.dart'; +import 'package:rssaid/radar/strategies/ruleStrategy.dart'; /// 对一些特殊网页进行适配 /// weibo 手机端： @@ -12,10 +12,10 @@ import 'package:rssaid/radar/strategies/weiboStrategy.dart'; class Rules { static List? detectUrl(String url) { try { - var ruleStrategy; - if (url.contains("weibo")) { - ruleStrategy = Weibo(); - } + RuleStrategy? ruleStrategy; + // if (url.contains("weibo")) { + // ruleStrategy = Weibo(); + // } if (ruleStrategy != null) { return ruleStrategy.detect(url); } diff --git a/lib/radar/source_parser.dart b/lib/radar/source_parser.dart index d1d7d0a..5cd8fc6 100644 --- a/lib/radar/source_parser.dart +++ b/lib/radar/source_parser.dart @@ -11,18 +11,36 @@ class SourceParser { static Position getPosition(String url) { List partUrls = url.split("/").sublist(1); - List positions = []; + Map replacePositions = {}; for (var i = 0; i < partUrls.length; i++) { - if (isValidPart(partUrls[i])) { - positions.add(i); + int isValidPartVal = isValidPart(partUrls[i]); + if (isValidPartVal < 0) { + continue; } + String key = partUrls[i]; + bool optional = false; + if (isValidPartVal == 2) { + optional = true; + key = partUrls[i].substring(0, partUrls[i].length - 1); + } + replacePositions[key] = PositionItem(position: i, optional: optional); } return Position( - origin: url, replacePositions: positions, strings: partUrls); + origin: url, replacePositions: replacePositions, strings: partUrls); } - static bool isValidPart(String part) { - return part.startsWith(":"); + // 1 validate 2 validate and optional + // -1 invalidate + static int isValidPart(String part) { + if (!part.startsWith(":")){ + return -1; + } + if (part.startsWith(":")) { + if (part.endsWith("?")) { + return 2; + } + } + return 1; } String removeDomain(String url) { @@ -46,7 +64,8 @@ class SourceParser { } for (var i= 0; i< sourceStringLen; i++) { - if (!sourcePosition.replacePositions.contains(i)) { + var key = sourceStrings[i]; + if (!sourcePosition.replacePositions.keys.contains(key)) { var notReplaceStr = sourceStrings[i]; if (notReplaceStr != urlStrings[i]) { return false; @@ -62,15 +81,16 @@ class SourceParser { var urlWithoutDomain = removeDomain(url); var urlStrings = urlWithoutDomain.split("/").sublist(1); - var isMatched = false; + Map? item; for (var sourcePosition in sourcePositions) { - isMatched = isMatch(sourcePosition, urlWithoutDomain); + var isMatched = isMatch(sourcePosition, urlWithoutDomain); if (isMatched) { + item = sourcePosition.replacePositions; break; } } - if (!isMatched) { + if (item == null) { return null; } @@ -82,9 +102,14 @@ class SourceParser { var originStrings = targetPosition.strings; - for (var i = 0; i < replacePositions.length; i++) { - var replacePosition = replacePositions[i]; - originStrings[replacePosition] = urlStrings[i]; + + for (var key in replacePositions.keys) { + if ((!(replacePositions[key]!.optional) && !item.containsKey(key)) || !item.containsKey(key)) { + return null; + } + int itemPosition = item[key]!.position; + int replacePosition = replacePositions[key]!.position; + originStrings[replacePosition] = urlStrings[itemPosition]; } return originStrings.join("/"); diff --git a/pubspec.yaml b/pubspec.yaml index 2d577d2..52bc502 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.0.2+12 +version: 3.0.3+13 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/test/radar/test_source_parser.dart b/test/radar/test_source_parser.dart index 0d4f9ad..96c84ec 100644 --- a/test/radar/test_source_parser.dart +++ b/test/radar/test_source_parser.dart @@ -1,3 +1,7 @@ +import 'dart:convert'; + +import 'package:rssaid/radar/rsshub.dart'; +import 'package:rssaid/radar/rule_type/page_info.dart'; import 'package:rssaid/radar/source_parser.dart'; import 'package:test/test.dart'; @@ -6,8 +10,197 @@ void main() { test('getPosition returns correct Position for valid URL', () { var parser = SourceParser( target: "/github/branches/:user/:repo", - url: 'https://github.com/DIYgod/RSSHub-Radar' - ); + url: 'https://github.com/DIYgod/RSSHub-Radar'); + }); + }); + + group("RssHub", () { + test("Translating Github addresses", () { + final RssHub rssHub = RssHub(); + Map githubRules = { + "github.com": { + "_name": "GitHub", + ".": [ + { + "title": "User Activities", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user" + ], + "target": "/github/activity/:user" + }, + { + "title": "Github Advisory Database RSS", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/advisories", + "/" + ], + "target": "/github/advisor/data/:type?/:category?" + }, + { + "title": "Repo Branches", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/branches", + "/:user/:repo" + ], + "target": "/github/branches/:user/:repo" + }, + { + "title": "Issue / Pull Request comments", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/:type", + "/:user/:repo/:type/:number" + ], + "target": "/github/comments/:user/:repo/:number?" + }, + { + "title": "Repo Contributors", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/graphs/contributors", + "/:user/:repo" + ], + "target": "/github/contributors/:user/:repo" + }, + { + "title": "Repo Discussions", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/discussions", + "/:user/:repo/discussions/:id", + "/:user/:repo" + ], + "target": "/github/discussion/:user/:repo" + }, + { + "title": "File Commits", + "docs": "https://docs.rsshub.app/routes/other", + "source": [ + "/:user/:repo/blob/:branch/*filepath" + ], + "target": "/github/file/:user/:repo/:branch/:filepath" + }, + { + "title": "User Followers", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user" + ], + "target": "/github/user/followers/:user" + }, + { + "title": "Repo Issues", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/issues", + "/:user/:repo/issues/:id", + "/:user/:repo" + ], + "target": "/github/issue/:user/:repo" + }, + { + "title": "Notifications", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/notifications" + ], + "target": "/github/notifications" + }, + { + "title": "Repo Pull Requests", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/pulls", + "/:user/:repo/pulls/:id", + "/:user/:repo" + ], + "target": "/github/pull/:user/:repo" + }, + { + "title": "Repo Pulse", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/pulse", + "/:user/:repo/pulse/:period" + ], + "target": "/github/pulse/:user/:repo/:period?" + }, + { + "title": "User Repo", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user" + ], + "target": "/github/repos/:user" + }, + { + "title": "Repo Stars", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/stargazers", + "/:user/:repo" + ], + "target": "/github/stars/:user/:repo" + }, + { + "title": "User Starred Repositories", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user" + ], + "target": "/github/starred_repos/:user" + }, + { + "title": "Topics", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/topics" + ], + "target": "/github/topics/:name/:qs?" + }, + { + "title": "Trending", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/trending" + ], + "target": "/github/trending/:since" + }, + { + "title": "Wiki History", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:user/:repo/wiki/:page/_history", + "/:user/:repo/wiki/:page", + "/:user/:repo/wiki/_history", + "/:user/:repo/wiki" + ], + "target": "/github/wiki/:user/:repo/:page" + } + ], + "gist": [ + { + "title": "Gist Commits", + "docs": "https://docs.rsshub.app/routes/programming", + "source": [ + "/:owner/:gistId/revisions", + "/:owner/:gistId/stargazers", + "/:owner/:gistId/forks", + "/:owner/:gistId" + ], + "target": "/github/gist/:gistId" + } + ] + } + }; + PageInfo pageInfo = new PageInfo( + url: "https://github.com/FlareSolverr/FlareSolverr/pull/1301", + rules: jsonEncode(githubRules)); + var radars = rssHub.getPageRSSHub(pageInfo); + radars.forEach((radar) => print(radar.path)); }); }); -} \ No newline at end of file +}