diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4630808..5f8f1e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,8 +54,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: projectPath: './ui' - tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version - releaseName: 'App Name v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version. + tagName: pre-alpha-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version + releaseName: 'Soda v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version. releaseBody: 'See the assets to download and install this version.' releaseDraft: true prerelease: false diff --git a/crate/src/structs.rs b/crate/src/structs.rs index d679407..ad125a6 100644 --- a/crate/src/structs.rs +++ b/crate/src/structs.rs @@ -2,19 +2,19 @@ use serde_derive::{self, Deserialize, Serialize}; use std::convert::From; #[derive(Deserialize, Serialize, Debug)] pub struct IDL { + pub(crate) version: String, + pub(crate) name: String, + pub(crate) instructions: Vec, #[serde(default)] pub(crate) accounts: Vec, #[serde(default)] - pub(crate) errors: Vec, + pub(crate) types: Vec, #[serde(default)] pub(crate) events: Vec, - pub(crate) instructions: Vec, #[serde(default)] - pub(crate) metadata: Metadata, - pub(crate) name: String, + pub(crate) errors: Vec, #[serde(default)] - pub(crate) types: Vec, - pub(crate) version: String, + pub(crate) metadata: Metadata, } #[derive(Deserialize, Serialize, Debug)] diff --git a/templates/react_native/files/client/.bundle/config.hbs b/templates/react_native/files/client/.bundle/config.hbs new file mode 100644 index 0000000..848943b --- /dev/null +++ b/templates/react_native/files/client/.bundle/config.hbs @@ -0,0 +1,2 @@ +BUNDLE_PATH: "vendor/bundle" +BUNDLE_FORCE_RUBY_PLATFORM: 1 diff --git a/templates/react_native/files/client/.eslintrc.js.hbs b/templates/react_native/files/client/.eslintrc.js.hbs new file mode 100644 index 0000000..40c6dcd --- /dev/null +++ b/templates/react_native/files/client/.eslintrc.js.hbs @@ -0,0 +1,4 @@ +module.exports = { + root: true, + extends: '@react-native-community', +}; diff --git a/templates/react_native/files/client/.gitignore.hbs b/templates/react_native/files/client/.gitignore.hbs new file mode 100644 index 0000000..16f8c30 --- /dev/null +++ b/templates/react_native/files/client/.gitignore.hbs @@ -0,0 +1,63 @@ +# OSX +# +.DS_Store + +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate +ios/.xcode.env.local + +# Android/IntelliJ +# +build/ +.idea +.gradle +local.properties +*.iml +*.hprof +.cxx/ +*.keystore +!debug.keystore + +# node.js +# +node_modules/ +npm-debug.log +yarn-error.log + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/ + +**/fastlane/report.xml +**/fastlane/Preview.html +**/fastlane/screenshots +**/fastlane/test_output + +# Bundle artifact +*.jsbundle + +# Ruby / CocoaPods +/ios/Pods/ +/vendor/bundle/ + +# Temporary files created by Metro to check the health of the file watcher +.metro-health-check* diff --git a/templates/react_native/files/client/.node-version.hbs b/templates/react_native/files/client/.node-version.hbs new file mode 100644 index 0000000..3c03207 --- /dev/null +++ b/templates/react_native/files/client/.node-version.hbs @@ -0,0 +1 @@ +18 diff --git a/templates/react_native/files/client/.prettierrc.js.hbs b/templates/react_native/files/client/.prettierrc.js.hbs new file mode 100644 index 0000000..2b54074 --- /dev/null +++ b/templates/react_native/files/client/.prettierrc.js.hbs @@ -0,0 +1,7 @@ +module.exports = { + arrowParens: 'avoid', + bracketSameLine: true, + bracketSpacing: false, + singleQuote: true, + trailingComma: 'all', +}; diff --git a/templates/react_native/files/client/.watchmanconfig.hbs b/templates/react_native/files/client/.watchmanconfig.hbs new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/templates/react_native/files/client/.watchmanconfig.hbs @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/templates/react_native/files/client/App.tsx.hbs b/templates/react_native/files/client/App.tsx.hbs new file mode 100644 index 0000000..146d19d --- /dev/null +++ b/templates/react_native/files/client/App.tsx.hbs @@ -0,0 +1,34 @@ +import {ConnectionProvider} from './components/providers/ConnectionProvider'; +import {clusterApiUrl} from '@solana/web3.js'; +import React from 'react'; +import {SafeAreaView, StyleSheet} from 'react-native'; +import {AuthorizationProvider} from './components/providers/AuthorizationProvider'; +import {Header} from './components/Header'; + +import MainScreen from './screens/MainScreen'; + +const DEVNET_ENDPOINT = clusterApiUrl('devnet'); + +export default function App() { + return ( + + + +
+ + + + + + ); +} + +const styles = StyleSheet.create({ + shell: { + height: '100%', + }, +}); diff --git a/templates/react_native/files/client/Gemfile.hbs b/templates/react_native/files/client/Gemfile.hbs new file mode 100644 index 0000000..1142b1b --- /dev/null +++ b/templates/react_native/files/client/Gemfile.hbs @@ -0,0 +1,6 @@ +source 'https://rubygems.org' + +# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version +ruby '>= 2.6.10' + +gem 'cocoapods', '>= 1.11.3' diff --git a/templates/react_native/files/client/__tests__/App-test.tsx.hbs b/templates/react_native/files/client/__tests__/App-test.tsx.hbs new file mode 100644 index 0000000..1784766 --- /dev/null +++ b/templates/react_native/files/client/__tests__/App-test.tsx.hbs @@ -0,0 +1,14 @@ +/** + * @format + */ + +import 'react-native'; +import React from 'react'; +import App from '../App'; + +// Note: test renderer must be required after react-native. +import renderer from 'react-test-renderer'; + +it('renders correctly', () => { + renderer.create(); +}); diff --git a/templates/react_native/files/client/android/app/build.gradle.hbs b/templates/react_native/files/client/android/app/build.gradle.hbs new file mode 100644 index 0000000..111c0aa --- /dev/null +++ b/templates/react_native/files/client/android/app/build.gradle.hbs @@ -0,0 +1,170 @@ +apply plugin: "com.android.application" +apply plugin: "com.facebook.react" + +import com.android.build.OutputFile + +/** + * This is the configuration block to customize your React Native Android app. + * By default you don't need to apply any configuration, just uncomment the lines you need. + */ +react { + /* Folders */ + // The root of your project, i.e. where "package.json" lives. Default is '..' + // root = file("../") + // The folder where the react-native NPM package is. Default is ../node_modules/react-native + // reactNativeDir = file("../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen + // codegenDir = file("../node_modules/react-native-codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js + // cliFile = file("../node_modules/react-native/cli.js") + + /* Variants */ + // The list of variants to that are debuggable. For those we're going to + // skip the bundling of the JS bundle and the assets. By default is just 'debug'. + // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. + // debuggableVariants = ["liteDebug", "prodDebug"] + + /* Bundling */ + // A list containing the node command and its flags. Default is just 'node'. + // nodeExecutableAndArgs = ["node"] + // + // The command to run when bundling. By default is 'bundle' + // bundleCommand = "ram-bundle" + // + // The path to the CLI configuration file. Default is empty. + // bundleConfig = file(../rn-cli.config.js) + // + // The name of the generated asset file containing your JS bundle + // bundleAssetName = "MyApplication.android.bundle" + // + // The entry file for bundle generation. Default is 'index.android.js' or 'index.js' + // entryFile = file("../js/MyApplication.android.js") + // + // A list of extra flags to pass to the 'bundle' commands. + // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle + // extraPackagerArgs = [] + + /* Hermes Commands */ + // The hermes compiler command to run. By default it is 'hermesc' + // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" + // + // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" + // hermesFlags = ["-O", "-output-source-map"] +} + +/** + * Set this to true to create four separate APKs instead of one, + * one for each native architecture. This is useful if you don't + * use App Bundles (https://developer.android.com/guide/app-bundle/) + * and want to have separate APKs to upload to the Play Store. + */ +def enableSeparateBuildPerCPUArchitecture = false + +/** + * Set this to true to Run Proguard on Release builds to minify the Java bytecode. + */ +def enableProguardInReleaseBuilds = false + +/** + * The preferred build flavor of JavaScriptCore (JSC) + * + * For example, to use the international variant, you can use: + * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` + * + * The international variant includes ICU i18n library and necessary data + * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that + * give correct results when using with locales other than en-US. Note that + * this variant is about 6MiB larger per architecture than default. + */ +def jscFlavor = 'org.webkit:android-jsc:+' + +/** + * Private function to get the list of Native Architectures you want to build. + * This reads the value from reactNativeArchitectures in your gradle.properties + * file and works together with the --active-arch-only flag of react-native run-android. + */ +def reactNativeArchitectures() { + def value = project.getProperties().get("reactNativeArchitectures") + return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] +} + +android { + ndkVersion rootProject.ext.ndkVersion + + compileSdkVersion rootProject.ext.compileSdkVersion + + namespace "com.reactnativetemplate" + defaultConfig { + applicationId "com.reactnativetemplate" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 1 + versionName "1.0" + } + + splits { + abi { + reset() + enable enableSeparateBuildPerCPUArchitecture + universalApk false // If true, also generate a universal APK + include (*reactNativeArchitectures()) + } + } + signingConfigs { + debug { + storeFile file('debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + } + buildTypes { + debug { + signingConfig signingConfigs.debug + } + release { + // Caution! In production, you need to generate your own keystore file. + // see https://reactnative.dev/docs/signed-apk-android. + signingConfig signingConfigs.debug + minifyEnabled enableProguardInReleaseBuilds + proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" + } + } + + // applicationVariants are e.g. debug, release + applicationVariants.all { variant -> + variant.outputs.each { output -> + // For each separate APK per architecture, set a unique version code as described here: + // https://developer.android.com/studio/build/configure-apk-splits.html + // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. + def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] + def abi = output.getFilter(OutputFile.ABI) + if (abi != null) { // null for the universal-debug, universal-release variants + output.versionCodeOverride = + defaultConfig.versionCode * 1000 + versionCodes.get(abi) + } + + } + } +} + +dependencies { + // The version of react-native is set by the React Native Gradle Plugin + implementation("com.facebook.react:react-android") + + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") + + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") + debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { + exclude group:'com.squareup.okhttp3', module:'okhttp' + } + + debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") + if (hermesEnabled.toBoolean()) { + implementation("com.facebook.react:hermes-android") + } else { + implementation jscFlavor + } +} + +apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) diff --git a/templates/react_native/files/client/android/app/debug.keystore b/templates/react_native/files/client/android/app/debug.keystore new file mode 100644 index 0000000..364e105 Binary files /dev/null and b/templates/react_native/files/client/android/app/debug.keystore differ diff --git a/templates/react_native/files/client/android/app/proguard-rules.pro.hbs b/templates/react_native/files/client/android/app/proguard-rules.pro.hbs new file mode 100644 index 0000000..11b0257 --- /dev/null +++ b/templates/react_native/files/client/android/app/proguard-rules.pro.hbs @@ -0,0 +1,10 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: diff --git a/templates/react_native/files/client/android/app/src/debug/AndroidManifest.xml.hbs b/templates/react_native/files/client/android/app/src/debug/AndroidManifest.xml.hbs new file mode 100644 index 0000000..4b185bc --- /dev/null +++ b/templates/react_native/files/client/android/app/src/debug/AndroidManifest.xml.hbs @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/templates/react_native/files/client/android/app/src/debug/java/com/reactnativetemplate/ReactNativeFlipper.java.hbs b/templates/react_native/files/client/android/app/src/debug/java/com/reactnativetemplate/ReactNativeFlipper.java.hbs new file mode 100644 index 0000000..dad6e98 --- /dev/null +++ b/templates/react_native/files/client/android/app/src/debug/java/com/reactnativetemplate/ReactNativeFlipper.java.hbs @@ -0,0 +1,75 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + *

This source code is licensed under the MIT license found in the LICENSE file in the root + * directory of this source tree. + */ +package com.reactnativetemplate; + +import android.content.Context; +import com.facebook.flipper.android.AndroidFlipperClient; +import com.facebook.flipper.android.utils.FlipperUtils; +import com.facebook.flipper.core.FlipperClient; +import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin; +import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin; +import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin; +import com.facebook.flipper.plugins.inspector.DescriptorMapping; +import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; +import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; +import com.facebook.flipper.plugins.network.NetworkFlipperPlugin; +import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin; +import com.facebook.react.ReactInstanceEventListener; +import com.facebook.react.ReactInstanceManager; +import com.facebook.react.bridge.ReactContext; +import com.facebook.react.modules.network.NetworkingModule; +import okhttp3.OkHttpClient; + +/** + * Class responsible of loading Flipper inside your React Native application. This is the debug + * flavor of it. Here you can add your own plugins and customize the Flipper setup. + */ +public class ReactNativeFlipper { + public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { + if (FlipperUtils.shouldEnableFlipper(context)) { + final FlipperClient client = AndroidFlipperClient.getInstance(context); + + client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults())); + client.addPlugin(new DatabasesFlipperPlugin(context)); + client.addPlugin(new SharedPreferencesFlipperPlugin(context)); + client.addPlugin(CrashReporterPlugin.getInstance()); + + NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin(); + NetworkingModule.setCustomClientBuilder( + new NetworkingModule.CustomClientBuilder() { + @Override + public void apply(OkHttpClient.Builder builder) { + builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin)); + } + }); + client.addPlugin(networkFlipperPlugin); + client.start(); + + // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized + // Hence we run if after all native modules have been initialized + ReactContext reactContext = reactInstanceManager.getCurrentReactContext(); + if (reactContext == null) { + reactInstanceManager.addReactInstanceEventListener( + new ReactInstanceEventListener() { + @Override + public void onReactContextInitialized(ReactContext reactContext) { + reactInstanceManager.removeReactInstanceEventListener(this); + reactContext.runOnNativeModulesQueueThread( + new Runnable() { + @Override + public void run() { + client.addPlugin(new FrescoFlipperPlugin()); + } + }); + } + }); + } else { + client.addPlugin(new FrescoFlipperPlugin()); + } + } + } +} diff --git a/templates/react_native/files/client/android/app/src/main/AndroidManifest.xml.hbs b/templates/react_native/files/client/android/app/src/main/AndroidManifest.xml.hbs new file mode 100644 index 0000000..4122f36 --- /dev/null +++ b/templates/react_native/files/client/android/app/src/main/AndroidManifest.xml.hbs @@ -0,0 +1,25 @@ + + + + + + + + + + + + + diff --git a/templates/react_native/files/client/android/app/src/main/java/com/reactnativetemplate/MainActivity.java.hbs b/templates/react_native/files/client/android/app/src/main/java/com/reactnativetemplate/MainActivity.java.hbs new file mode 100644 index 0000000..f0a91e6 --- /dev/null +++ b/templates/react_native/files/client/android/app/src/main/java/com/reactnativetemplate/MainActivity.java.hbs @@ -0,0 +1,35 @@ +package com.reactnativetemplate; + +import com.facebook.react.ReactActivity; +import com.facebook.react.ReactActivityDelegate; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactActivityDelegate; + +public class MainActivity extends ReactActivity { + + /** + * Returns the name of the main component registered from JavaScript. This is used to schedule + * rendering of the component. + */ + @Override + protected String getMainComponentName() { + return "ReactnativeTemplate"; + } + + /** + * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link + * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React + * (aka React 18) with two boolean flags. + */ + @Override + protected ReactActivityDelegate createReactActivityDelegate() { + return new DefaultReactActivityDelegate( + this, + getMainComponentName(), + // If you opted-in for the New Architecture, we enable the Fabric Renderer. + DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled + // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18). + DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled + ); + } +} diff --git a/templates/react_native/files/client/android/app/src/main/java/com/reactnativetemplate/MainApplication.java.hbs b/templates/react_native/files/client/android/app/src/main/java/com/reactnativetemplate/MainApplication.java.hbs new file mode 100644 index 0000000..7ed7afa --- /dev/null +++ b/templates/react_native/files/client/android/app/src/main/java/com/reactnativetemplate/MainApplication.java.hbs @@ -0,0 +1,62 @@ +package com.reactnativetemplate; + +import android.app.Application; +import com.facebook.react.PackageList; +import com.facebook.react.ReactApplication; +import com.facebook.react.ReactNativeHost; +import com.facebook.react.ReactPackage; +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint; +import com.facebook.react.defaults.DefaultReactNativeHost; +import com.facebook.soloader.SoLoader; +import java.util.List; + +public class MainApplication extends Application implements ReactApplication { + + private final ReactNativeHost mReactNativeHost = + new DefaultReactNativeHost(this) { + @Override + public boolean getUseDeveloperSupport() { + return BuildConfig.DEBUG; + } + + @Override + protected List getPackages() { + @SuppressWarnings("UnnecessaryLocalVariable") + List packages = new PackageList(this).getPackages(); + // Packages that cannot be autolinked yet can be added manually here, for example: + // packages.add(new MyReactNativePackage()); + return packages; + } + + @Override + protected String getJSMainModuleName() { + return "index"; + } + + @Override + protected boolean isNewArchEnabled() { + return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + } + + @Override + protected Boolean isHermesEnabled() { + return BuildConfig.IS_HERMES_ENABLED; + } + }; + + @Override + public ReactNativeHost getReactNativeHost() { + return mReactNativeHost; + } + + @Override + public void onCreate() { + super.onCreate(); + SoLoader.init(this, /* native exopackage */ false); + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + // If you opted-in for the New Architecture, we load the native entry point for this app. + DefaultNewArchitectureEntryPoint.load(); + } + ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); + } +} diff --git a/templates/react_native/files/client/android/app/src/main/res/drawable/rn_edit_text_material.xml.hbs b/templates/react_native/files/client/android/app/src/main/res/drawable/rn_edit_text_material.xml.hbs new file mode 100644 index 0000000..f35d996 --- /dev/null +++ b/templates/react_native/files/client/android/app/src/main/res/drawable/rn_edit_text_material.xml.hbs @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a2f5908 Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..1b52399 Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..ff10afd Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..115a4c7 Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..dcd3cd8 Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..459ca60 Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..8ca12fe Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8e19b41 Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..b824ebd Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..4c19a13 Binary files /dev/null and b/templates/react_native/files/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/templates/react_native/files/client/android/app/src/main/res/values/strings.xml.hbs b/templates/react_native/files/client/android/app/src/main/res/values/strings.xml.hbs new file mode 100644 index 0000000..d6f1100 --- /dev/null +++ b/templates/react_native/files/client/android/app/src/main/res/values/strings.xml.hbs @@ -0,0 +1,3 @@ + + ReactnativeTemplate + diff --git a/templates/react_native/files/client/android/app/src/main/res/values/styles.xml.hbs b/templates/react_native/files/client/android/app/src/main/res/values/styles.xml.hbs new file mode 100644 index 0000000..9dba077 --- /dev/null +++ b/templates/react_native/files/client/android/app/src/main/res/values/styles.xml.hbs @@ -0,0 +1,9 @@ + + + + + + diff --git a/templates/react_native/files/client/android/app/src/release/java/com/reactnativetemplate/ReactNativeFlipper.java.hbs b/templates/react_native/files/client/android/app/src/release/java/com/reactnativetemplate/ReactNativeFlipper.java.hbs new file mode 100644 index 0000000..aaf3d03 --- /dev/null +++ b/templates/react_native/files/client/android/app/src/release/java/com/reactnativetemplate/ReactNativeFlipper.java.hbs @@ -0,0 +1,20 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + *

This source code is licensed under the MIT license found in the LICENSE file in the root + * directory of this source tree. + */ +package com.reactnativetemplate; + +import android.content.Context; +import com.facebook.react.ReactInstanceManager; + +/** + * Class responsible of loading Flipper inside your React Native application. This is the release + * flavor of it so it's empty as we don't want to load Flipper. + */ +public class ReactNativeFlipper { + public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { + // Do nothing as we don't want to initialize Flipper on Release. + } +} diff --git a/templates/react_native/files/client/android/build.gradle.hbs b/templates/react_native/files/client/android/build.gradle.hbs new file mode 100644 index 0000000..67d887b --- /dev/null +++ b/templates/react_native/files/client/android/build.gradle.hbs @@ -0,0 +1,21 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext { + buildToolsVersion = "33.0.0" + minSdkVersion = 21 + compileSdkVersion = 33 + targetSdkVersion = 33 + + // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. + ndkVersion = "23.1.7779620" + } + repositories { + google() + mavenCentral() + } + dependencies { + classpath("com.android.tools.build:gradle:7.3.1") + classpath("com.facebook.react:react-native-gradle-plugin") + } +} diff --git a/templates/react_native/files/client/android/gradle.properties.hbs b/templates/react_native/files/client/android/gradle.properties.hbs new file mode 100644 index 0000000..e4af465 --- /dev/null +++ b/templates/react_native/files/client/android/gradle.properties.hbs @@ -0,0 +1,44 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true + +# Version of flipper SDK to use with React Native +FLIPPER_VERSION=0.125.0 + +# Use this property to specify which architecture you want to build. +# You can also override it from the CLI using +# ./gradlew -PreactNativeArchitectures=x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 + +# Use this property to enable support to the new architecture. +# This will allow you to use TurboModules and the Fabric render in +# your application. You should enable this flag either if you want +# to write custom TurboModules/Fabric components OR use libraries that +# are providing them. +newArchEnabled=false + +# Use this property to enable or disable the Hermes JS engine. +# If set to false, you will be using JSC instead. +hermesEnabled=true diff --git a/templates/react_native/files/client/android/gradle/wrapper/gradle-wrapper.jar b/templates/react_native/files/client/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/templates/react_native/files/client/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/templates/react_native/files/client/android/gradle/wrapper/gradle-wrapper.properties.hbs b/templates/react_native/files/client/android/gradle/wrapper/gradle-wrapper.properties.hbs new file mode 100644 index 0000000..8fad3f5 --- /dev/null +++ b/templates/react_native/files/client/android/gradle/wrapper/gradle-wrapper.properties.hbs @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/templates/react_native/files/client/android/gradlew.bat.hbs b/templates/react_native/files/client/android/gradlew.bat.hbs new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/templates/react_native/files/client/android/gradlew.bat.hbs @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/templates/react_native/files/client/android/gradlew.hbs b/templates/react_native/files/client/android/gradlew.hbs new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/templates/react_native/files/client/android/gradlew.hbs @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/templates/react_native/files/client/android/settings.gradle.hbs b/templates/react_native/files/client/android/settings.gradle.hbs new file mode 100644 index 0000000..097105c --- /dev/null +++ b/templates/react_native/files/client/android/settings.gradle.hbs @@ -0,0 +1,4 @@ +rootProject.name = 'ReactnativeTemplate' +apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) +include ':app' +includeBuild('../node_modules/react-native-gradle-plugin') diff --git a/templates/react_native/files/client/app.json.hbs b/templates/react_native/files/client/app.json.hbs new file mode 100644 index 0000000..7222df4 --- /dev/null +++ b/templates/react_native/files/client/app.json.hbs @@ -0,0 +1,4 @@ +{ + "name": "ReactnativeTemplate", + "displayName": "ReactnativeTemplate" +} \ No newline at end of file diff --git a/templates/react_native/files/client/babel.config.js.hbs b/templates/react_native/files/client/babel.config.js.hbs new file mode 100644 index 0000000..f842b77 --- /dev/null +++ b/templates/react_native/files/client/babel.config.js.hbs @@ -0,0 +1,3 @@ +module.exports = { + presets: ['module:metro-react-native-babel-preset'], +}; diff --git a/templates/react_native/files/client/components/AccountInfo.tsx.hbs b/templates/react_native/files/client/components/AccountInfo.tsx.hbs new file mode 100644 index 0000000..1e0637a --- /dev/null +++ b/templates/react_native/files/client/components/AccountInfo.tsx.hbs @@ -0,0 +1,67 @@ +import React from 'react'; +import {LAMPORTS_PER_SOL, PublicKey} from '@solana/web3.js'; +import {StyleSheet, View, Text} from 'react-native'; + +interface Account { + address: string; + label?: string | undefined; + publicKey: PublicKey; +} + +type AccountInfoProps = Readonly<{ + selectedAccount: Account; + balance: number | null; +}>; + +function convertLamportsToSOL(lamports: number) { + return new Intl.NumberFormat(undefined, {maximumFractionDigits: 1}).format( + (lamports || 0) / LAMPORTS_PER_SOL, + ); +} + +export default function AccountInfo({ + balance, + selectedAccount, +}: AccountInfoProps) { + return ( + + + + {balance !== null + ? `Balance: ${convertLamportsToSOL(balance)} SOL` + : 'Loading balance...'} + + + {selectedAccount.label ?? 'Wallet name not found'} + + {selectedAccount.address} + + + ); +} + +const styles = StyleSheet.create({ + container: { + flexDirection: 'row', + alignItems: 'center', + justifyContent: 'flex-start', + backgroundColor: '#fff', + }, + textContainer: { + flexDirection: 'column', + alignItems: 'flex-start', + justifyContent: 'center', + }, + walletName: { + fontSize: 20, + fontWeight: 'bold', + }, + walletNameSubtitle: { + fontSize: 12, + marginBottom: 5, + }, + walletBalance: { + color: '#000', + fontSize: 24, + }, +}); diff --git a/templates/react_native/files/client/components/Color.tsx.hbs b/templates/react_native/files/client/components/Color.tsx.hbs new file mode 100644 index 0000000..2b7c876 --- /dev/null +++ b/templates/react_native/files/client/components/Color.tsx.hbs @@ -0,0 +1,10 @@ +export const Colors = { + primary: '#1292B4', + white: '#FFF', + lighter: '#F3F3F3', + light: '#DAE1E7', + dark: '#444', + darker: '#222', + black: '#000', + }; + \ No newline at end of file diff --git a/templates/react_native/files/client/components/ConnectButton.tsx.hbs b/templates/react_native/files/client/components/ConnectButton.tsx.hbs new file mode 100644 index 0000000..a552eff --- /dev/null +++ b/templates/react_native/files/client/components/ConnectButton.tsx.hbs @@ -0,0 +1,34 @@ +import {transact} from '@solana-mobile/mobile-wallet-adapter-protocol-web3js'; +import React, {ComponentProps, useState, useCallback} from 'react'; +import {Button} from 'react-native'; + +import {useAuthorization} from './providers/AuthorizationProvider'; +import {useConnection} from './providers/ConnectionProvider'; + +type Props = Readonly>; + +export default function ConnectButton(props: Props) { + const {authorizeSession} = useAuthorization(); + const [authorizationInProgress, setAuthorizationInProgress] = useState(false); + const handleConnectPress = useCallback(async () => { + try { + if (authorizationInProgress) { + return; + } + setAuthorizationInProgress(true); + await transact(async wallet => { + await authorizeSession(wallet); + }); + } finally { + setAuthorizationInProgress(false); + } + }, [authorizationInProgress, authorizeSession]); + return ( + + + + + - )} -

- setName(e.target.value)} - className="p-5 mb-5 m-5 bg-black text-white text-center text-base font-mono rounded-md ring-2 ring-neutral-700" - /> - {[ - { - name: "Instructions", - item: instructions, - setItem: setInstructions, - initExpanded: true, - }, - { - name: "Accounts", - item: accounts, - setItem: setAccounts, - initExpanded: false, - }, - { - name: "Types", - item: types, - setItem: setTypes, - initExpanded: false, - }, - { - name: "Events", - item: events, - setItem: setEvents, - initExpanded: false, - }, - { - name: "Errors", - item: errors, - setItem: setErrors, - initExpanded: false, - }, - ].map(({ item, setItem, name, initExpanded }) => ( -
- ))} - -
); diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock index 2b8b519..a4965a5 100644 --- a/ui/src-tauri/Cargo.lock +++ b/ui/src-tauri/Cargo.lock @@ -2565,9 +2565,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" +checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412" dependencies = [ "anyhow", "cocoa", @@ -2666,9 +2666,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c" dependencies = [ "gtk", "http", @@ -2679,6 +2679,7 @@ dependencies = [ "serde_json", "tauri-utils", "thiserror", + "url", "uuid 1.3.0", "webview2-com", "windows 0.39.0", @@ -2686,9 +2687,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab" dependencies = [ "cocoa", "gtk", @@ -2697,6 +2698,7 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", + "url", "uuid 1.3.0", "webkit2gtk", "webview2-com", diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml index b61e716..7e94091 100644 --- a/ui/src-tauri/Cargo.toml +++ b/ui/src-tauri/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.59" tauri-build = { version = "1.2.1", features = [] } [dependencies] -tauri = { version = "1.2.4", features = ["dialog-all"] } +tauri = { version = "1.2.5", features = ["dialog-all", "fs-create-dir", "fs-read-dir", "fs-read-file", "fs-write-file"] } serde_json = "1.0.93" env_logger = "0.10" soda = { path = "../../crate" } diff --git a/ui/src-tauri/icons/128x128.png b/ui/src-tauri/icons/128x128.png index 4fb24b5..486ce06 100644 Binary files a/ui/src-tauri/icons/128x128.png and b/ui/src-tauri/icons/128x128.png differ diff --git a/ui/src-tauri/icons/128x128@2x.png b/ui/src-tauri/icons/128x128@2x.png index 6f8e667..58081cb 100644 Binary files a/ui/src-tauri/icons/128x128@2x.png and b/ui/src-tauri/icons/128x128@2x.png differ diff --git a/ui/src-tauri/icons/32x32.png b/ui/src-tauri/icons/32x32.png index 36b7e0d..029a7ff 100644 Binary files a/ui/src-tauri/icons/32x32.png and b/ui/src-tauri/icons/32x32.png differ diff --git a/ui/src-tauri/icons/Square107x107Logo.png b/ui/src-tauri/icons/Square107x107Logo.png index 2a7b637..35bb925 100644 Binary files a/ui/src-tauri/icons/Square107x107Logo.png and b/ui/src-tauri/icons/Square107x107Logo.png differ diff --git a/ui/src-tauri/icons/Square142x142Logo.png b/ui/src-tauri/icons/Square142x142Logo.png index 3cae5bf..c571f85 100644 Binary files a/ui/src-tauri/icons/Square142x142Logo.png and b/ui/src-tauri/icons/Square142x142Logo.png differ diff --git a/ui/src-tauri/icons/Square150x150Logo.png b/ui/src-tauri/icons/Square150x150Logo.png index 842f1e5..0428bdf 100644 Binary files a/ui/src-tauri/icons/Square150x150Logo.png and b/ui/src-tauri/icons/Square150x150Logo.png differ diff --git a/ui/src-tauri/icons/Square284x284Logo.png b/ui/src-tauri/icons/Square284x284Logo.png index d3b1513..8411a92 100644 Binary files a/ui/src-tauri/icons/Square284x284Logo.png and b/ui/src-tauri/icons/Square284x284Logo.png differ diff --git a/ui/src-tauri/icons/Square30x30Logo.png b/ui/src-tauri/icons/Square30x30Logo.png index d9294c4..a282352 100644 Binary files a/ui/src-tauri/icons/Square30x30Logo.png and b/ui/src-tauri/icons/Square30x30Logo.png differ diff --git a/ui/src-tauri/icons/Square310x310Logo.png b/ui/src-tauri/icons/Square310x310Logo.png index 36e0579..2bdfaec 100644 Binary files a/ui/src-tauri/icons/Square310x310Logo.png and b/ui/src-tauri/icons/Square310x310Logo.png differ diff --git a/ui/src-tauri/icons/Square44x44Logo.png b/ui/src-tauri/icons/Square44x44Logo.png index 6aab5e6..7d55580 100644 Binary files a/ui/src-tauri/icons/Square44x44Logo.png and b/ui/src-tauri/icons/Square44x44Logo.png differ diff --git a/ui/src-tauri/icons/Square71x71Logo.png b/ui/src-tauri/icons/Square71x71Logo.png index 09ca6ab..c0ca89d 100644 Binary files a/ui/src-tauri/icons/Square71x71Logo.png and b/ui/src-tauri/icons/Square71x71Logo.png differ diff --git a/ui/src-tauri/icons/Square89x89Logo.png b/ui/src-tauri/icons/Square89x89Logo.png index a8b3fae..642e4fe 100644 Binary files a/ui/src-tauri/icons/Square89x89Logo.png and b/ui/src-tauri/icons/Square89x89Logo.png differ diff --git a/ui/src-tauri/icons/StoreLogo.png b/ui/src-tauri/icons/StoreLogo.png index cc114a3..7744b89 100644 Binary files a/ui/src-tauri/icons/StoreLogo.png and b/ui/src-tauri/icons/StoreLogo.png differ diff --git a/ui/src-tauri/icons/icon.icns b/ui/src-tauri/icons/icon.icns index c3a0521..d10f0bb 100644 Binary files a/ui/src-tauri/icons/icon.icns and b/ui/src-tauri/icons/icon.icns differ diff --git a/ui/src-tauri/icons/icon.ico b/ui/src-tauri/icons/icon.ico index 32b4a20..103d5b2 100644 Binary files a/ui/src-tauri/icons/icon.ico and b/ui/src-tauri/icons/icon.ico differ diff --git a/ui/src-tauri/icons/icon.png b/ui/src-tauri/icons/icon.png index 41a2597..cd984fa 100644 Binary files a/ui/src-tauri/icons/icon.png and b/ui/src-tauri/icons/icon.png differ diff --git a/ui/src-tauri/src/main.rs b/ui/src-tauri/src/main.rs index 7fca16a..be3cd38 100644 --- a/ui/src-tauri/src/main.rs +++ b/ui/src-tauri/src/main.rs @@ -3,13 +3,12 @@ windows_subsystem = "windows" )] #![allow(non_snake_case, non_camel_case_types)] - +use std::io::Write; use soda::{generate_from_idl, IDL}; use tauri::{CustomMenuItem, Menu, MenuItem, Submenu}; fn main() { let quit = CustomMenuItem::new("quit".to_string(), "Quit"); - let close = CustomMenuItem::new("close".to_string(), "Close"); let open_idl = CustomMenuItem::new("open_idl".to_string(), "Open IDL File"); let generate_idl = CustomMenuItem::new("generate_idl".to_string(), "Save IDL File"); let generate_project = @@ -25,7 +24,6 @@ fn main() { .add_item(generate_idl) .add_item(change_template) .add_item(quit) - .add_item(close), ); let menu = Menu::new() .add_native_item(MenuItem::Copy) @@ -35,27 +33,55 @@ fn main() { tauri::Builder::default() .menu(menu) .on_menu_event(|event| match event.menu_item_id() { - "quit" => { - std::process::exit(0); + "open_idl" => { + event + .window() + .emit("open_idl", Some("open_idl".to_string())) + .unwrap(); + } + "new_project" => { + event + .window() + .emit("new_project", Some("new_project".to_string())) + .unwrap(); + } + "generate_project" => { + event + .window() + .emit("generate_project", Some("generate_project".to_string())) + .unwrap(); + } + "generate_idl" => { + event + .window() + .emit("generate_idl", Some("generate_idl".to_string())) + .unwrap(); } - "close" => { - event.window().close().unwrap(); + "change_template" => { + event + .window() + .emit("change_template", Some("change_template".to_string())) + .unwrap(); + } + _ => { + std::process::exit(0); } - "open_idl" => {} - "new_project" => {} - "generate_project" => {} - "generate_idl" => {} - "change_template" => {} - _ => {} }) - .invoke_handler(tauri::generate_handler![generate]) + .invoke_handler(tauri::generate_handler![generate, generate_idl_file]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } #[tauri::command] -fn generate(handle: tauri::AppHandle, baseFolder: &str, idl: &str, templateFolder: &str) -> String { +fn generate(handle: tauri::AppHandle, baseFolder: &str, idl: &str, templateFolder: &str) -> () { let idl: IDL = serde_json::from_str(idl).expect("error while reading json"); generate_from_idl(baseFolder, idl, templateFolder); - format!("Project Generated!") } + +#[tauri::command] +fn generate_idl_file(handle: tauri::AppHandle, baseFolder: &str, idl: &str) -> (){ + let idl: IDL = serde_json::from_str(idl).expect("error while reading json"); + // generate json file + let mut file = std::fs::File::create(format!("{}/idl.json", baseFolder)).unwrap(); + file.write_all(serde_json::to_string_pretty(&idl).unwrap().as_bytes()).unwrap(); +} \ No newline at end of file diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json index a600c05..2a8f29a 100644 --- a/ui/src-tauri/tauri.conf.json +++ b/ui/src-tauri/tauri.conf.json @@ -7,11 +7,17 @@ }, "package": { "productName": "soda", - "version": "0.0.1" + "version": "0.0.2" }, "tauri": { "allowlist": { "all": false, + "fs": { + "readFile": true, + "writeFile": true, + "readDir": true, + "createDir": true + }, "dialog": { "all": true, "ask": true, @@ -69,4 +75,4 @@ } ] } -} +} \ No newline at end of file