diff --git a/.gitignore b/.gitignore index 52c7d44..b9e3cca 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ git/ flutter_export_environment.sh .flutter-plugins-dependencies + +*.so \ No newline at end of file diff --git a/Makefile b/Makefile index 7363f41..1b4c563 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,12 @@ # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.PHONY: toolchain +.PHONY: toolchain clean + +clean: + -rm -f ./cyberwow/android/app/src/main/jniLibs/arm64-v8a/*.so + cd cyberwow && \ + flutter clean watch: find cyberwow/lib/ -name '*.dart' | \ @@ -37,6 +42,10 @@ run: cd cyberwow && \ flutter run --debug --pid-file /tmp/flutter.pid +run-release: + cd cyberwow && \ + flutter run --release --pid-file /tmp/flutter.pid + # clang -target aarch64-linux-android21 cyberwow/native/hello.c -o cyberwow/native/output/hello c: clang -target x86_64-linux-android21 cyberwow/native/hello.c -o cyberwow/native/output/x86_64/wownerod @@ -60,6 +69,10 @@ build: cd cyberwow && \ flutter build apk --target-platform android-arm64 +build-debug: + cd cyberwow && \ + flutter build apk --debug --target-platform android-arm64 + install: build cd cyberwow && \ flutter install diff --git a/README.md b/README.md index 4d5e7f9..a45172e 100644 --- a/README.md +++ b/README.md @@ -47,15 +47,20 @@ popd git clone https://github.com/wownero/cyberwow/ cd cyberwow -mkdir -p cyberwow/native/output/arm64 -mkdir -p cyberwow/native/output/x86_64 +mkdir -p cyberwow/android/app/src/main/jniLibs/arm64-v8a # Copy wownerod that we just built -cp $PATH_TO_WOWNEROD cyberwow/native/output/arm64/ -# Generate a dummy x86_64 bin -touch cyberwow/native/output/x86_64/wownerod +cp $PATH_TO_WOWNEROD \ +cyberwow/android/app/src/main/jniLibs/arm64-v8a/libwownerod.so make build ``` The resulting apk is `cyberwow/build/app/outputs/apk/release/app-release.apk`. + + +## How to use custom start up arguments + +Sending the arguments to an unopened CyberWOW app will cause `wownerod` to use them on start up, for example: + +`--add-exclusive-node 192.168.1.3` diff --git a/cyberwow/android/.gitignore b/cyberwow/android/.gitignore new file mode 100644 index 0000000..bc2100d --- /dev/null +++ b/cyberwow/android/.gitignore @@ -0,0 +1,7 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java diff --git a/cyberwow/android/app/build.gradle b/cyberwow/android/app/build.gradle index 28ae677..63160d1 100644 --- a/cyberwow/android/app/build.gradle +++ b/cyberwow/android/app/build.gradle @@ -22,10 +22,15 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 29 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } lintOptions { disable 'InvalidPackage' @@ -34,11 +39,10 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "org.wownero.cyberwow" - minSdkVersion 23 - targetSdkVersion 28 - versionCode 22 - versionName "0.7.0.0-i" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdkVersion 26 + targetSdkVersion 29 + versionCode 23 + versionName "0.7.0.0-j" } if(project.hasProperty("RELEASE_STORE_FILE")) { @@ -77,7 +81,5 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/cyberwow/android/app/src/main/AndroidManifest.xml b/cyberwow/android/app/src/main/AndroidManifest.xml index 583965b..2227897 100644 --- a/cyberwow/android/app/src/main/AndroidManifest.xml +++ b/cyberwow/android/app/src/main/AndroidManifest.xml @@ -1,34 +1,32 @@ - - - - - + + + + + + + + diff --git a/cyberwow/android/app/src/main/java/org/wownero/cyberwow/MainActivity.java b/cyberwow/android/app/src/main/java/org/wownero/cyberwow/MainActivity.java deleted file mode 100644 index 88eddb1..0000000 --- a/cyberwow/android/app/src/main/java/org/wownero/cyberwow/MainActivity.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.wownero.cyberwow; - -import android.os.Bundle; -import android.graphics.Color; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - getWindow().setNavigationBarColor(Color.BLACK); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/cyberwow/android/app/src/main/kotlin/org/wownero/cyberwow/MainActivity.kt b/cyberwow/android/app/src/main/kotlin/org/wownero/cyberwow/MainActivity.kt new file mode 100644 index 0000000..1a02d9d --- /dev/null +++ b/cyberwow/android/app/src/main/kotlin/org/wownero/cyberwow/MainActivity.kt @@ -0,0 +1,66 @@ +package org.wownero.cyberwow + +import androidx.annotation.NonNull; + +import io.flutter.embedding.android.FlutterActivity +import io.flutter.embedding.engine.FlutterEngine +import io.flutter.plugins.GeneratedPluginRegistrant +import io.flutter.plugin.common.ActivityLifecycleListener +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import io.flutter.plugin.common.MethodChannel.MethodCallHandler + +import android.content.Intent +import android.os.Bundle +import android.util.Log + +class MainActivity: FlutterActivity() { + private val CHANNEL = "send-intent" + private var initialIntentText:String = "" + private var initialIntentSet = false + private var _channel: MethodChannel? = null; + + override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine); + + val channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL); + _channel = channel; + + channel.setMethodCallHandler{ + call, result -> + if (call.method == "getInitialIntent") { + result.success(initialIntentText) + } else if (call.method == "getBinaryDir") { + result.success(getApplicationInfo().nativeLibraryDir) + } else { + result.notImplemented() + } + } + + + val intent = getIntent() + checkIntent(intent) + initialIntentSet = true + } + + internal fun handleSendText(intent:Intent) { + val text:String = intent.getStringExtra(Intent.EXTRA_TEXT) + if (initialIntentSet == false) { + initialIntentText = text + } + } + + internal fun checkIntent(intent: Intent) { + val _action = intent.getAction() + // Log.i("Main", "action: " + action) + + if (Intent.ACTION_SEND.equals(_action)) { + val _type = intent.getType() + // Log.i("Main", "type: " + type) + + if (_type == "text/plain") { + handleSendText(intent) // Handle text being sent + } + } + } +} diff --git a/cyberwow/android/build.gradle b/cyberwow/android/build.gradle index 1b33616..d82c176 100644 --- a/cyberwow/android/build.gradle +++ b/cyberwow/android/build.gradle @@ -1,11 +1,13 @@ buildscript { + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.5.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,4 +28,4 @@ subprojects { task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/cyberwow/android/gradle/wrapper/gradle-wrapper.properties b/cyberwow/android/gradle/wrapper/gradle-wrapper.properties index ecd5e10..e5b2f0f 100644 --- a/cyberwow/android/gradle/wrapper/gradle-wrapper.properties +++ b/cyberwow/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/cyberwow/ios/Flutter/AppFrameworkInfo.plist b/cyberwow/ios/Flutter/AppFrameworkInfo.plist deleted file mode 100644 index 9367d48..0000000 --- a/cyberwow/ios/Flutter/AppFrameworkInfo.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 8.0 - - diff --git a/cyberwow/ios/Flutter/Debug.xcconfig b/cyberwow/ios/Flutter/Debug.xcconfig deleted file mode 100644 index 592ceee..0000000 --- a/cyberwow/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/cyberwow/ios/Flutter/Release.xcconfig b/cyberwow/ios/Flutter/Release.xcconfig deleted file mode 100644 index 592ceee..0000000 --- a/cyberwow/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/cyberwow/ios/Runner.xcodeproj/project.pbxproj b/cyberwow/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index 0a5e498..0000000 --- a/cyberwow/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,506 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - 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 */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; - 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; - 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 = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, - ); - 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 = ""; }; - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; 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 = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; - 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 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 = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 3B80C3931E831B6300D905FE /* App.framework */, - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 9740EEB31CF90195004384FC /* Generated.xcconfig */, - ); - name = Flutter; - sourceTree = ""; - }; - 97C146E51CF9000F007C117D = { - isa = PBXGroup; - children = ( - 9740EEB11CF90186004384FC /* Flutter */, - 97C146F01CF9000F007C117D /* Runner */, - 97C146EF1CF9000F007C117D /* Products */, - CF3B75C9A7D2FA2A4C99F110 /* Frameworks */, - ); - sourceTree = ""; - }; - 97C146EF1CF9000F007C117D /* Products */ = { - isa = PBXGroup; - children = ( - 97C146EE1CF9000F007C117D /* Runner.app */, - ); - name = Products; - sourceTree = ""; - }; - 97C146F01CF9000F007C117D /* Runner */ = { - isa = PBXGroup; - children = ( - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, - 97C146FA1CF9000F007C117D /* Main.storyboard */, - 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, - ); - path = Runner; - sourceTree = ""; - }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 97C146F21CF9000F007C117D /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 97C146ED1CF9000F007C117D /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 9740EEB61CF901F6004384FC /* Run Script */, - 97C146EA1CF9000F007C117D /* Sources */, - 97C146EB1CF9000F007C117D /* Frameworks */, - 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - ); - 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 = 0910; - ORGANIZATIONNAME = "The Chromium Authors"; - TargetAttributes = { - 97C146ED1CF9000F007C117D = { - CreatedOnToolsVersion = 7.3.1; - }; - }; - }; - buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - 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 */, - 9740EEB41CF90195004384FC /* Debug.xcconfig 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; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; - }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - 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"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 97C146EA1CF9000F007C117D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, - 97C146F31CF9000F007C117D /* main.m 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; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - 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_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_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 = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = 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; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = S8QB4VV633; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.cyberwow; - PRODUCT_NAME = "$(TARGET_NAME)"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Profile; - }; - 97C147031CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - 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_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_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 = 8.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 97C147041CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - 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_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_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 = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.cyberwow; - PRODUCT_NAME = "$(TARGET_NAME)"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.cyberwow; - PRODUCT_NAME = "$(TARGET_NAME)"; - 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/cyberwow/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/cyberwow/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a1..0000000 --- a/cyberwow/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/cyberwow/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/cyberwow/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index 786d6aa..0000000 --- a/cyberwow/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cyberwow/ios/Runner.xcworkspace/contents.xcworkspacedata b/cyberwow/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a1..0000000 --- a/cyberwow/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/cyberwow/ios/Runner/AppDelegate.h b/cyberwow/ios/Runner/AppDelegate.h deleted file mode 100644 index 36e21bb..0000000 --- a/cyberwow/ios/Runner/AppDelegate.h +++ /dev/null @@ -1,6 +0,0 @@ -#import -#import - -@interface AppDelegate : FlutterAppDelegate - -@end diff --git a/cyberwow/ios/Runner/AppDelegate.m b/cyberwow/ios/Runner/AppDelegate.m deleted file mode 100644 index 59a72e9..0000000 --- a/cyberwow/ios/Runner/AppDelegate.m +++ /dev/null @@ -1,13 +0,0 @@ -#include "AppDelegate.h" -#include "GeneratedPluginRegistrant.h" - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [GeneratedPluginRegistrant registerWithRegistry:self]; - // Override point for customization after application launch. - return [super application:application didFinishLaunchingWithOptions:launchOptions]; -} - -@end diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d36b1fa..0000000 --- a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index 3d43d11..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 28c6bf0..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 2ccbfd9..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index f091b6b..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cde121..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index d0ef06e..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index dcdc230..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 2ccbfd9..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index c8f9ed8..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index a6d6b86..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index a6d6b86..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 75b2d16..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index c4df70d..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 6a84f41..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index d0e1f58..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100644 index 0bedcf2..0000000 --- a/cyberwow/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/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19ea..0000000 Binary files a/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and /dev/null differ diff --git a/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/cyberwow/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100644 index 89c2725..0000000 --- a/cyberwow/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/cyberwow/ios/Runner/Base.lproj/LaunchScreen.storyboard b/cyberwow/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index f2e259c..0000000 --- a/cyberwow/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cyberwow/ios/Runner/Base.lproj/Main.storyboard b/cyberwow/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100644 index f3c2851..0000000 --- a/cyberwow/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cyberwow/ios/Runner/Info.plist b/cyberwow/ios/Runner/Info.plist deleted file mode 100644 index e74fb40..0000000 --- a/cyberwow/ios/Runner/Info.plist +++ /dev/null @@ -1,45 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - cyberwow - 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 - - - diff --git a/cyberwow/ios/Runner/main.m b/cyberwow/ios/Runner/main.m deleted file mode 100644 index dff6597..0000000 --- a/cyberwow/ios/Runner/main.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import -#import "AppDelegate.h" - -int main(int argc, char* argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/cyberwow/lib/config.dart b/cyberwow/lib/config.dart index 19e9ab1..49635ab 100644 --- a/cyberwow/lib/config.dart +++ b/cyberwow/lib/config.dart @@ -36,4 +36,5 @@ const emuHost = '192.168.10.100'; const host = isEmu ? emuHost : '127.0.0.1'; const stdoutLineBufferSize = 100; +const bannerShownKey = 'banner-shown'; diff --git a/cyberwow/lib/config/cyberwow.dart b/cyberwow/lib/config/cyberwow.dart index 59ae822..d72f4c7 100644 --- a/cyberwow/lib/config/cyberwow.dart +++ b/cyberwow/lib/config/cyberwow.dart @@ -23,15 +23,16 @@ import 'package:flutter/material.dart'; import 'prototype.dart'; +const crtGreen = Color.fromRGBO(0, 255, 102, 1); + final _theme = ThemeData ( brightness: Brightness.dark, - primaryColor: Colors.green, + primaryColor: crtGreen, hintColor: Colors.yellow, - primarySwatch: Colors.green, - accentColor: Colors.green, - cursorColor: Colors.green, + accentColor: crtGreen, + cursorColor: crtGreen, scaffoldBackgroundColor: Colors.black, @@ -72,15 +73,15 @@ final _theme = ThemeData ), ).apply ( - bodyColor: Colors.green, - displayColor: Colors.green, + bodyColor: crtGreen, + displayColor: crtGreen, ), ); final config = CryptoConfig ( - 'wownerod', + 'libwownerod.so', 'wownerod', 'Follow the white rabbit.', 70, @@ -91,6 +92,11 @@ final config = CryptoConfig '--max-concurrency=1', '--fast-block-sync=1', '--block-sync-size=5', + '--no-igd', + '--check-updates=disabled', + '--disable-dns-checkpoints', + '--max-log-file-size=0', + '--p2p-use-ipv6', ], '[1337@cyberwow]: ', 6, diff --git a/cyberwow/lib/controller/process/deploy.dart b/cyberwow/lib/controller/process/deploy.dart deleted file mode 100644 index 180d421..0000000 --- a/cyberwow/lib/controller/process/deploy.dart +++ /dev/null @@ -1,49 +0,0 @@ -/* - -Copyright 2019 fuwa - -This file is part of CyberWOW. - -CyberWOW is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -CyberWOW is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with CyberWOW. If not, see . - -*/ - -import 'dart:io'; -import 'dart:async'; -import 'dart:convert'; - -import 'package:flutter/services.dart'; - -import '../helper.dart'; - -Stream deployBinary -( - final AssetBundle bundle, - final String path, - final String name -) async* { - final binData = await bundle.load(path); - final newPath = await getBinaryPath(name); - - yield 'output binary path: $newPath\n'; - - final inputBytes = binData.buffer.asUint8List(); - final outputFile = await new File(newPath).writeAsBytes(inputBytes); - - final chmodResult = await Process.run('chmod', ['u+x', newPath]); - yield chmodResult.stderr + '\n'; - - final outputStat = await outputFile.stat(); - yield outputStat.toString() + '\n'; -} diff --git a/cyberwow/lib/controller/process/run.dart b/cyberwow/lib/controller/process/run.dart index c0072bc..e74490f 100644 --- a/cyberwow/lib/controller/process/run.dart +++ b/cyberwow/lib/controller/process/run.dart @@ -29,6 +29,7 @@ import 'dart:convert'; import '../helper.dart'; import '../../config.dart' as config; import '../../logging.dart'; +import '../../logic/sensor/helper.dart' as helper; typedef ShouldExit = bool Function(); @@ -37,9 +38,10 @@ Stream runBinary final String name, { final Stream input, final ShouldExit shouldExit, + final List userArgs = const [], } ) async* { - final newPath = await getBinaryPath(name); + final binPath = await helper.getBinaryPath(name); final appDocDir = await getApplicationDocumentsDirectory(); final appDocPath = appDocDir.path; @@ -61,11 +63,11 @@ Stream runBinary [ "--data-dir", binDir.path, - ] + extraArgs + config.c.extraArgs; + ] + extraArgs + config.c.extraArgs + userArgs; log.info('args: ' + args.toString()); - final outputProcess = await Process.start(newPath, args); + final outputProcess = await Process.start(binPath, args); Future printInput() async { await for (final line in input) { diff --git a/cyberwow/lib/controller/refresh.dart b/cyberwow/lib/controller/refresh.dart index 9b9ed5f..855e70c 100644 --- a/cyberwow/lib/controller/refresh.dart +++ b/cyberwow/lib/controller/refresh.dart @@ -27,6 +27,7 @@ import 'rpc/rpc.dart' as rpc; import '../config.dart'; import '../logging.dart'; +import '../helper.dart'; typedef GetNotificationFunc = AppLifecycleState Function(); @@ -37,9 +38,10 @@ Stream pull(GetNotificationFunc getNotification, final String puller) asyn if (_appState == AppLifecycleState.resumed) { yield null; - await Future.delayed(const Duration(milliseconds: 1000), () => null); + await tick(); } else { - await Future.delayed(const Duration(seconds: 2), () => null); + await tick(); + await tick(); } } } diff --git a/cyberwow/lib/controller/rpc/rpcView.dart b/cyberwow/lib/controller/rpc/rpcView.dart index 50977e1..a92d5e6 100644 --- a/cyberwow/lib/controller/rpc/rpcView.dart +++ b/cyberwow/lib/controller/rpc/rpcView.dart @@ -29,7 +29,6 @@ Map getConnectionView(Map x) { [ 'address_type', 'connection_id', - 'host', 'ip', 'local_ip', 'localhost', @@ -88,7 +87,7 @@ Map getConnectionView(Map x) { final List keys = [ - 'address', + 'host', 'height', 'live_time', 'current_download', diff --git a/cyberwow/lib/helper.dart b/cyberwow/lib/helper.dart index 02881c0..4cc46cf 100644 --- a/cyberwow/lib/helper.dart +++ b/cyberwow/lib/helper.dart @@ -69,3 +69,5 @@ List asList(dynamic x) => x ?? []; List> asJsonArray(dynamic x) => x?.cast>() ?? []; Map asMap(dynamic x) => x ?? {}; + +Future tick() async => await Future.delayed(const Duration(seconds: 1)); diff --git a/cyberwow/lib/logic/sensor/helper.dart b/cyberwow/lib/logic/sensor/helper.dart new file mode 100644 index 0000000..49742e2 --- /dev/null +++ b/cyberwow/lib/logic/sensor/helper.dart @@ -0,0 +1,45 @@ +/* + +Copyright 2020 fuwa + +This file is part of CyberWOW. + +Wowllet is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Wowllet is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Wowllet. If not, see . + +*/ + +import 'dart:async'; +import 'dart:io'; + +import 'package:path_provider/path_provider.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; + +import '../../logging.dart'; + +const _methodChannel = const MethodChannel('send-intent'); + +Future getBinaryDir() async { + final _dir = await _methodChannel.invokeMethod('getBinaryDir'); + + final _binDir = Directory(_dir); + final _bins = _binDir.listSync(recursive: true); + + return _dir; +} + +Future getBinaryPath(final String name) async { + final _binaryDir = await getBinaryDir(); + return _binaryDir + '/' + name; +} diff --git a/cyberwow/lib/main.dart b/cyberwow/lib/main.dart index 08f36b4..02f5702 100644 --- a/cyberwow/lib/main.dart +++ b/cyberwow/lib/main.dart @@ -28,7 +28,6 @@ import 'dart:io'; import 'dart:async'; import 'config.dart' as config; -import 'controller/process/deploy.dart' as process; import 'controller/process/run.dart' as process; import 'logging.dart'; import 'state.dart' as state; @@ -69,6 +68,7 @@ class CyberWOW_Page extends StatefulWidget { class _CyberWOW_PageState extends State with WidgetsBindingObserver { // AppState _state = LoadingState("init..."); + static const _channel = const MethodChannel('send-intent'); state.AppState _state; AppLifecycleState _notification = AppLifecycleState.resumed; @@ -77,6 +77,12 @@ class _CyberWOW_PageState extends State with WidgetsBindingObserv final StreamController inputStreamController = StreamController(); + Future getInitialIntent() async { + final text = await _channel.invokeMethod('getInitialIntent'); + log.fine('getInitialIntent: ${text}'); + return text; + } + @override void didChangeAppLifecycleState(final AppLifecycleState state) { log.fine('app cycle: ${state}'); @@ -111,16 +117,27 @@ class _CyberWOW_PageState extends State with WidgetsBindingObserv Future buildStateMachine(final state.BlankState _blankState) async { final loadingText = config.c.splash; state.LoadingState _loadingState = await _blankState.next(loadingText); + state.SyncingState _syncingState = await _loadingState.next(); - final binName = config.c.outputBin; - final resourcePath = 'native/output/' + describeEnum(config.arch) + '/' + binName; - final bundle = DefaultAssetBundle.of(context); - final loading = process.deployBinary(bundle, resourcePath, binName); + final _initialIntent = await getInitialIntent(); + final _userArgs = _initialIntent + .trim() + .split(RegExp(r"\s+")) + .where((x) => !x.isEmpty) + .toList(); - state.SyncingState _syncingState = await _loadingState.next(loading); + if (!_userArgs.isEmpty) { + log.info('user args: ${_userArgs}'); + } final syncing = process - .runBinary(binName, input: inputStreamController.stream, shouldExit: _isExiting) + .runBinary + ( + config.c.outputBin, + input: inputStreamController.stream, + shouldExit: _isExiting, + userArgs: _userArgs, + ) .asBroadcastStream(); await _syncingState.next(inputStreamController.sink, syncing); @@ -182,7 +199,7 @@ class _CyberWOW_PageState extends State with WidgetsBindingObserv _exiting = true; inputStreamController.sink.add('exit'); - await Future.delayed(const Duration(seconds: 5), () => null); + await Future.delayed(const Duration(seconds: 5)); // the process controller should call exit(0) for us log.warning('Daemon took too long to shut down!'); diff --git a/cyberwow/lib/state/loading.dart b/cyberwow/lib/state/loading.dart index fa19206..3c9bd38 100644 --- a/cyberwow/lib/state/loading.dart +++ b/cyberwow/lib/state/loading.dart @@ -19,9 +19,12 @@ along with CyberWOW. If not, see . */ +import 'package:shared_preferences/shared_preferences.dart'; + import '../controller/helper.dart'; import '../config.dart' as config; import '../logging.dart'; +import '../helper.dart'; import 'prototype.dart'; import 'syncing.dart'; @@ -37,37 +40,25 @@ class LoadingState extends AppState { syncState(); } - - Future next(final Stream loadingProgress) async { + Future next() async { Future showBanner() async { - List chars = []; - banner.runes.forEach((int rune) { - final c = String.fromCharCode(rune); - chars.add(c); - }); + final Iterable chars = banner.runes.map((x) => String.fromCharCode(x)); for (final String char in chars) { append(char); - await Future.delayed(Duration(milliseconds: config.c.splashDelay), () => "1"); + await Future.delayed(Duration(milliseconds: config.c.splashDelay)); } - await Future.delayed(const Duration(seconds: 2), () => "1"); + await tick(); + await tick(); } - Future load() async { - log.fine("Loading next"); - await for (final line in loadingProgress) { - // append(line); - log.info(line); - } - } + SharedPreferences _prefs = await SharedPreferences.getInstance(); + final _bannerShown = await _prefs.getBool(config.bannerShownKey); - final outputBinExists = await binaryExists(config.c.outputBin); - if (outputBinExists) { - await load(); - } - else { - await Future.wait([load(), showBanner()]); + if (_bannerShown == null) { + await showBanner(); + await _prefs.setBool(config.bannerShownKey, true); } SyncingState _next = SyncingState(appHook); diff --git a/cyberwow/lib/widget/loading.dart b/cyberwow/lib/widget/loading.dart index 89be27c..b9055fd 100644 --- a/cyberwow/lib/widget/loading.dart +++ b/cyberwow/lib/widget/loading.dart @@ -32,7 +32,7 @@ Widget build(BuildContext context, LoadingState state) { // ), body: Container ( - padding: const EdgeInsets.all(10.0), + padding: const EdgeInsets.all(40.0), child: Align ( alignment: Alignment.topLeft, @@ -41,18 +41,19 @@ Widget build(BuildContext context, LoadingState state) { mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded + Spacer ( flex: 1, - child: SingleChildScrollView - ( - child: Text - ( - state.status, - style: Theme.of(context).textTheme.title, - ) - ) - ) + ), + Text + ( + state.status, + style: Theme.of(context).textTheme.title, + ), + Spacer + ( + flex: 1, + ), ], ), ), diff --git a/cyberwow/pubspec.lock b/cyberwow/pubspec.lock index d8c3a7a..1a5481f 100644 --- a/cyberwow/pubspec.lock +++ b/cyberwow/pubspec.lock @@ -57,13 +57,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.3" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.2" flutter: dependency: "direct main" description: flutter @@ -74,6 +67,11 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" http: dependency: "direct main" description: @@ -165,6 +163,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.5" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.6+1" + shared_preferences_macos: + dependency: transitive + description: + name: shared_preferences_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+4" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2+3" sky_engine: dependency: transitive description: flutter @@ -235,4 +261,4 @@ packages: version: "3.5.0" sdks: dart: ">=2.4.0 <3.0.0" - flutter: ">=0.1.4 <2.0.0" + flutter: ">=1.12.13+hotfix.4 <2.0.0" diff --git a/cyberwow/pubspec.yaml b/cyberwow/pubspec.yaml index c578543..447d4f2 100644 --- a/cyberwow/pubspec.yaml +++ b/cyberwow/pubspec.yaml @@ -1,18 +1,7 @@ name: cyberwow description: A new Flutter project. -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. - -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# 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: 0.7.0+22 +version: 0.7.0+23 environment: sdk: ">=2.1.0 <3.0.0" @@ -21,47 +10,23 @@ dependencies: flutter: sdk: flutter - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 path_provider: ^1.1.0 http: ^0.12.0 logging: ^0.11.3 intl: ^0.16.0 + shared_preferences: ^0.5.6 dev_dependencies: flutter_test: sdk: flutter -# For information on the generic Dart part of this file, see the -# following page: https://www.dartlang.org/tools/pub/pubspec - -# The following section is specific to Flutter. flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: assets: - - native/output/x86_64/wownerod - - native/output/arm64/wownerod - assets/wownero_symbol.png - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: fonts: - family: RobotoMono fonts: @@ -71,6 +36,3 @@ flutter: - family: VT323 fonts: - asset: fonts/VT323/VT323-Regular.ttf - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages diff --git a/etc/scripts/build-external-libs/collect.sh b/etc/scripts/build-external-libs/collect.sh index 1bec331..b7febda 100755 --- a/etc/scripts/build-external-libs/collect.sh +++ b/etc/scripts/build-external-libs/collect.sh @@ -49,6 +49,7 @@ for arch in ${archs[@]}; do ;; "arm64") target_host=aarch64-linux-android + target_abi=arm64-v8a ;; "x86_64") target_host=x86_64-linux-android @@ -59,12 +60,10 @@ for arch in ${archs[@]}; do esac echo "collecting for ${arch}" - mkdir -p $target_root/cyberwow/native/output/$arch - cp build/release/bin/wownerod $target_root/cyberwow/native/output/$arch/ + mkdir -p $target_root/cyberwow/android/app/src/main/jniLibs/$target_abi + cp build/release/bin/wownerod \ + $target_root/cyberwow/android/app/src/main/jniLibs/$target_abi/libwownerod.so done -mkdir -p $target_root/cyberwow/native/output/x86_64 -touch $target_root/cyberwow/native/output/x86_64/wownerod - exit 0