diff --git a/android/app/build.gradle b/android/app/build.gradle index 3f5e684..00f7b31 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.application' android { - namespace "com.example.app" + namespace "com.github.Qortal.qortalMobile" compileSdk rootProject.ext.compileSdkVersion defaultConfig { - applicationId "com.example.app" + applicationId "com.github.Qortal.qortalMobile" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index d4f22b6..709d329 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -12,6 +12,7 @@ dependencies { implementation project(':capacitor-browser') implementation project(':capacitor-filesystem') implementation project(':capacitor-local-notifications') + implementation project(':capacitor-splash-screen') implementation project(':evva-capacitor-secure-storage-plugin') implementation project(':transistorsoft-capacitor-background-fetch') implementation "androidx.webkit:webkit:1.4.0" diff --git a/android/app/src/main/java/com/example/app/BackgroundFetchHeadlessTask.java b/android/app/src/main/java/com/github/Qortal/qortalMobile/BackgroundFetchHeadlessTask.java similarity index 95% rename from android/app/src/main/java/com/example/app/BackgroundFetchHeadlessTask.java rename to android/app/src/main/java/com/github/Qortal/qortalMobile/BackgroundFetchHeadlessTask.java index fac2dc1..0c1a0a0 100644 --- a/android/app/src/main/java/com/example/app/BackgroundFetchHeadlessTask.java +++ b/android/app/src/main/java/com/github/Qortal/qortalMobile/BackgroundFetchHeadlessTask.java @@ -1,4 +1,4 @@ -package com.example.app; +package com.github.Qortal.qortalMobile; import android.content.Context; diff --git a/android/app/src/main/java/com/example/app/MainActivity.java b/android/app/src/main/java/com/github/Qortal/qortalMobile/MainActivity.java similarity index 70% rename from android/app/src/main/java/com/example/app/MainActivity.java rename to android/app/src/main/java/com/github/Qortal/qortalMobile/MainActivity.java index 966f32d..f5ad5fd 100644 --- a/android/app/src/main/java/com/example/app/MainActivity.java +++ b/android/app/src/main/java/com/github/Qortal/qortalMobile/MainActivity.java @@ -1,4 +1,4 @@ -package com.example.app; +package com.github.Qortal.qortalMobile; import com.getcapacitor.BridgeActivity; diff --git a/android/app/src/main/res/drawable-land-hdpi/splash.png b/android/app/src/main/res/drawable-land-hdpi/splash.png index e31573b..d22deda 100644 Binary files a/android/app/src/main/res/drawable-land-hdpi/splash.png and b/android/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-mdpi/splash.png b/android/app/src/main/res/drawable-land-mdpi/splash.png index f7a6492..d22deda 100644 Binary files a/android/app/src/main/res/drawable-land-mdpi/splash.png and b/android/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xhdpi/splash.png b/android/app/src/main/res/drawable-land-xhdpi/splash.png index 8077255..d22deda 100644 Binary files a/android/app/src/main/res/drawable-land-xhdpi/splash.png and b/android/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxhdpi/splash.png index 14c6c8f..d22deda 100644 Binary files a/android/app/src/main/res/drawable-land-xxhdpi/splash.png and b/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png index 244ca25..d22deda 100644 Binary files a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-hdpi/splash.png b/android/app/src/main/res/drawable-port-hdpi/splash.png index 74faaa5..d22deda 100644 Binary files a/android/app/src/main/res/drawable-port-hdpi/splash.png and b/android/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-mdpi/splash.png b/android/app/src/main/res/drawable-port-mdpi/splash.png index e944f4a..d22deda 100644 Binary files a/android/app/src/main/res/drawable-port-mdpi/splash.png and b/android/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xhdpi/splash.png b/android/app/src/main/res/drawable-port-xhdpi/splash.png index 564a82f..d22deda 100644 Binary files a/android/app/src/main/res/drawable-port-xhdpi/splash.png and b/android/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxhdpi/splash.png index bfabe68..d22deda 100644 Binary files a/android/app/src/main/res/drawable-port-xxhdpi/splash.png and b/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png index 6929071..d22deda 100644 Binary files a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable/launch_screen.xml b/android/app/src/main/res/drawable/launch_screen.xml new file mode 100644 index 0000000..c50e27a --- /dev/null +++ b/android/app/src/main/res/drawable/launch_screen.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/android/app/src/main/res/drawable/qort.png b/android/app/src/main/res/drawable/qort.png deleted file mode 100644 index 39d090f..0000000 Binary files a/android/app/src/main/res/drawable/qort.png and /dev/null differ diff --git a/android/app/src/main/res/drawable/splash.png b/android/app/src/main/res/drawable/splash.png index f7a6492..d22deda 100644 Binary files a/android/app/src/main/res/drawable/splash.png and b/android/app/src/main/res/drawable/splash.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 12a409b..d14235c 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png index a05f3fc..1966948 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png index d6bdb01..5a6679e 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 3966b05..756e008 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png index 3814b23..75025cf 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png index 1907b24..432fd9f 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index ff8e391..e76fb8c 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png index 2e1846f..9784f16 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png index 123ff93..6554e4c 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index f1f3036..58040c0 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png index fe154c8..b8a5c23 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png index c4fdc57..ed4a9b3 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 7191d0c..2ca6891 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png index b640524..6807fa5 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png index 69a0eb8..976cfb0 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..2051f01 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + #FFFFFF + + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 624265c..7683412 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - Qortal - Qortal - com.example.app - com.example.app + Qortal Go + Qortal Go + com.github.Qortal.qortalMobile + com.github.Qortal.qortalMobile diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index be874e5..dc87342 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -17,6 +17,8 @@ + @drawable/launch_screen + @null + + \ No newline at end of file diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index c72458d..4688996 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -11,6 +11,9 @@ project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacit include ':capacitor-local-notifications' project(':capacitor-local-notifications').projectDir = new File('../node_modules/@capacitor/local-notifications/android') +include ':capacitor-splash-screen' +project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capacitor/splash-screen/android') + include ':evva-capacitor-secure-storage-plugin' project(':evva-capacitor-secure-storage-plugin').projectDir = new File('../node_modules/@evva/capacitor-secure-storage-plugin/android') diff --git a/capacitor.config.ts b/capacitor.config.ts index d64b8cd..4a16982 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -1,13 +1,22 @@ import type { CapacitorConfig } from '@capacitor/cli'; const config: CapacitorConfig = { - appId: 'com.example.app', - appName: 'Qortal ', + appId: 'com.github.Qortal.qortalMobile', + appName: 'Qortal Go', webDir: 'dist', "plugins": { "LocalNotifications": { "smallIcon": "qort", - "iconColor": "#09b6e8" + "iconColor": "#ffffff" + }, + "SplashScreen": { + "launchShowDuration": 3000, + "backgroundColor": "#ffffff", + "androidScaleType": "FIT_XY", + "showSpinner": true, + "androidSpinnerStyle": "large", + "splashFullScreen": true, + "splashImmersive": true } } }; diff --git a/package-lock.json b/package-lock.json index 5258f9f..55bd4bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "ext-one", - "version": "0.0.0", + "name": "qortal-go", + "version": "0.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "ext-one", - "version": "0.0.0", + "name": "qortal-go", + "version": "0.2.0", "dependencies": { "@capacitor/android": "^6.1.2", "@capacitor/browser": "^6.0.3", @@ -14,6 +14,7 @@ "@capacitor/core": "^6.1.2", "@capacitor/filesystem": "^6.0.1", "@capacitor/local-notifications": "^6.1.0", + "@capacitor/splash-screen": "^6.0.2", "@chatscope/chat-ui-kit-react": "^2.0.3", "@dnd-kit/core": "^6.1.0", "@dnd-kit/sortable": "^8.0.0", @@ -525,6 +526,14 @@ "@capacitor/core": "^6.0.0" } }, + "node_modules/@capacitor/splash-screen": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@capacitor/splash-screen/-/splash-screen-6.0.2.tgz", + "integrity": "sha512-WC0KYZ+ev15up03xs4fTnoTKwBVUSxXsKKQr/8XAncvi/nAG8qrpanW8OlavSC5zF5e1IZZDLsI2GSv0SkZ7VQ==", + "peerDependencies": { + "@capacitor/core": "^6.0.0" + } + }, "node_modules/@chatscope/chat-ui-kit-react": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@chatscope/chat-ui-kit-react/-/chat-ui-kit-react-2.0.3.tgz", diff --git a/package.json b/package.json index 188ad26..44ad800 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@capacitor/core": "^6.1.2", "@capacitor/filesystem": "^6.0.1", "@capacitor/local-notifications": "^6.1.0", + "@capacitor/splash-screen": "^6.0.2", "@chatscope/chat-ui-kit-react": "^2.0.3", "@dnd-kit/core": "^6.1.0", "@dnd-kit/sortable": "^8.0.0",