diff --git a/packages/app/android/.gitignore b/packages/app/android/.gitignore old mode 100755 new mode 100644 index 49afed60..48354a3d --- a/packages/app/android/.gitignore +++ b/packages/app/android/.gitignore @@ -99,32 +99,3 @@ app/src/main/assets/public app/src/main/assets/capacitor.config.json app/src/main/assets/capacitor.plugins.json app/src/main/res/xml/config.xml - -.idea/ -types/ -.sourcemaps -xcuserdata/ -node_modules/ -Pods/ -*.map -.DS_Store -Podfile.lock -Build/* -build/ -Index/ -.*.sw* -android-template.iml -!/build/.npmkeep -lerna-debug.log -local.properties -contents.xcworkspacedata -android-template/.gradle/ -android-template/app/app.iml -.gradle/ -.settings/ -.project -.env - -# Carthage and Carthage-built binaries -Carthage -*.xcframework.zip \ No newline at end of file diff --git a/packages/app/android/.idea/.gitignore b/packages/app/android/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/packages/app/android/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/packages/app/android/.idea/compiler.xml b/packages/app/android/.idea/compiler.xml new file mode 100644 index 00000000..b589d56e --- /dev/null +++ b/packages/app/android/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/packages/app/android/.idea/jarRepositories.xml b/packages/app/android/.idea/jarRepositories.xml new file mode 100644 index 00000000..de647e0d --- /dev/null +++ b/packages/app/android/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/app/android/.idea/misc.xml b/packages/app/android/.idea/misc.xml new file mode 100644 index 00000000..8978d23d --- /dev/null +++ b/packages/app/android/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/packages/app/android/app/.gitignore b/packages/app/android/app/.gitignore old mode 100755 new mode 100644 diff --git a/packages/app/android/app/build.gradle b/packages/app/android/app/build.gradle old mode 100755 new mode 100644 index 4b6b766c..6f6d4ade --- a/packages/app/android/app/build.gradle +++ b/packages/app/android/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace "com.ragestudio.comty" compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "com.ragestudio.comty" diff --git a/packages/app/android/app/capacitor.build.gradle b/packages/app/android/app/capacitor.build.gradle old mode 100755 new mode 100644 index 638b0f00..69cd1542 --- a/packages/app/android/app/capacitor.build.gradle +++ b/packages/app/android/app/capacitor.build.gradle @@ -2,8 +2,8 @@ android { compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } @@ -12,6 +12,7 @@ dependencies { implementation project(':capacitor-app') implementation project(':capacitor-haptics') implementation project(':capacitor-push-notifications') + implementation project(':capacitor-splash-screen') implementation project(':capacitor-status-bar') implementation project(':capacitor-storage') implementation project(':capgo-capacitor-updater') diff --git a/packages/app/android/app/proguard-rules.pro b/packages/app/android/app/proguard-rules.pro old mode 100755 new mode 100644 diff --git a/packages/app/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/packages/app/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java deleted file mode 100755 index f2c2217e..00000000 --- a/packages/app/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.getcapacitor.myapp; - -import static org.junit.Assert.*; - -import android.content.Context; -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.platform.app.InstrumentationRegistry; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - - @Test - public void useAppContext() throws Exception { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.getcapacitor.app", appContext.getPackageName()); - } -} diff --git a/packages/app/android/app/src/main/AndroidManifest.xml b/packages/app/android/app/src/main/AndroidManifest.xml old mode 100755 new mode 100644 index b3e9ec4a..80df3f7a --- a/packages/app/android/app/src/main/AndroidManifest.xml +++ b/packages/app/android/app/src/main/AndroidManifest.xml @@ -1,18 +1,29 @@ - + + + + + + + + + + + + android:usesCleartextTraffic="true" + > + android:grantUriPermissions="true"> - + android:resource="@xml/file_paths"> - - - diff --git a/packages/app/android/app/src/main/java/com/ragestudio/comty/MainActivity.java b/packages/app/android/app/src/main/java/com/ragestudio/comty/MainActivity.java old mode 100755 new mode 100644 diff --git a/packages/app/android/app/src/main/res/drawable-land-hdpi/splash.png b/packages/app/android/app/src/main/res/drawable-land-hdpi/splash.png new file mode 100644 index 00000000..e31573b4 Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-land-mdpi/splash.png b/packages/app/android/app/src/main/res/drawable-land-mdpi/splash.png new file mode 100644 index 00000000..f7a64923 Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-land-xhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-land-xhdpi/splash.png new file mode 100644 index 00000000..80772550 Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-land-xxhdpi/splash.png new file mode 100644 index 00000000..14c6c8fe Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-land-xxxhdpi/splash.png new file mode 100644 index 00000000..244ca250 Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-port-hdpi/splash.png b/packages/app/android/app/src/main/res/drawable-port-hdpi/splash.png new file mode 100644 index 00000000..74faaa58 Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-port-mdpi/splash.png b/packages/app/android/app/src/main/res/drawable-port-mdpi/splash.png new file mode 100644 index 00000000..e944f4ad Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-port-xhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-port-xhdpi/splash.png new file mode 100644 index 00000000..564a82ff Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-port-xxhdpi/splash.png new file mode 100644 index 00000000..bfabe687 Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-port-xxxhdpi/splash.png new file mode 100644 index 00000000..69290712 Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/packages/app/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/packages/app/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..c7bd21db --- /dev/null +++ b/packages/app/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/packages/app/android/app/src/main/res/drawable/ic_launcher_background.xml b/packages/app/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..d5fccc53 --- /dev/null +++ b/packages/app/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/app/android/app/src/main/res/drawable/splash.png b/packages/app/android/app/src/main/res/drawable/splash.png old mode 100755 new mode 100644 index 6af7e568..f7a64923 Binary files a/packages/app/android/app/src/main/res/drawable/splash.png and b/packages/app/android/app/src/main/res/drawable/splash.png differ diff --git a/packages/app/android/app/src/main/res/layout/activity_main.xml b/packages/app/android/app/src/main/res/layout/activity_main.xml old mode 100755 new mode 100644 diff --git a/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml old mode 100755 new mode 100644 index 345888d2..036d09bc --- a/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..036d09bc --- /dev/null +++ b/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100755 new mode 100644 index ed88c666..c023e505 Binary files a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png deleted file mode 100755 index 19669488..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png old mode 100755 new mode 100644 index 53afcd4d..2127973b Binary files a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png deleted file mode 100755 index 53afcd4d..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..b441f37d Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100755 new mode 100644 index 4dc1ed4d..72905b85 Binary files a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png deleted file mode 100755 index 75025cfd..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png old mode 100755 new mode 100644 index b2bce526..8ed0605c Binary files a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png deleted file mode 100755 index b2bce526..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..9502e47a Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100755 new mode 100644 index 587e5aab..4d1e0771 Binary files a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png deleted file mode 100755 index 9784f16c..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png old mode 100755 new mode 100644 index 67f1fa08..df0f1588 Binary files a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png deleted file mode 100755 index 67f1fa08..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..853db043 Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100755 new mode 100644 index 2a7aa76b..6cdf97c1 Binary files a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png deleted file mode 100755 index 04ef206c..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png old mode 100755 new mode 100644 index 3e9540dc..2960cbb6 Binary files a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png deleted file mode 100755 index 3e9540dc..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..8e3093a8 Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100755 new mode 100644 index c9c46e92..46de6e25 Binary files a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png deleted file mode 100755 index 66a5487a..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png old mode 100755 new mode 100644 index ddde0fdc..d2ea9abe Binary files a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png deleted file mode 100755 index ddde0fdc..00000000 Binary files a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and /dev/null differ diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..a40d73e9 Binary files /dev/null and b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/packages/app/android/app/src/main/res/values/ic_launcher_background.xml b/packages/app/android/app/src/main/res/values/ic_launcher_background.xml old mode 100755 new mode 100644 diff --git a/packages/app/android/app/src/main/res/values/strings.xml b/packages/app/android/app/src/main/res/values/strings.xml old mode 100755 new mode 100644 diff --git a/packages/app/android/app/src/main/res/values/styles.xml b/packages/app/android/app/src/main/res/values/styles.xml old mode 100755 new mode 100644 diff --git a/packages/app/android/app/src/main/res/xml/file_paths.xml b/packages/app/android/app/src/main/res/xml/file_paths.xml old mode 100755 new mode 100644 diff --git a/packages/app/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/packages/app/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java deleted file mode 100755 index 02973278..00000000 --- a/packages/app/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.getcapacitor.myapp; - -import static org.junit.Assert.*; - -import org.junit.Test; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle old mode 100755 new mode 100644 index fe3625ec..6595935c --- a/packages/app/android/build.gradle +++ b/packages/app/android/build.gradle @@ -7,8 +7,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' - classpath 'com.google.gms:google-services:4.3.13' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.3.15' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/packages/app/android/capacitor.settings.gradle b/packages/app/android/capacitor.settings.gradle old mode 100755 new mode 100644 index 919a9ef8..d768124c --- a/packages/app/android/capacitor.settings.gradle +++ b/packages/app/android/capacitor.settings.gradle @@ -11,6 +11,9 @@ project(':capacitor-haptics').projectDir = new File('../../../node_modules/@capa include ':capacitor-push-notifications' project(':capacitor-push-notifications').projectDir = new File('../../../node_modules/@capacitor/push-notifications/android') +include ':capacitor-splash-screen' +project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/@capacitor/splash-screen/android') + include ':capacitor-status-bar' project(':capacitor-status-bar').projectDir = new File('../../../node_modules/@capacitor/status-bar/android') diff --git a/packages/app/android/gradle.properties b/packages/app/android/gradle.properties old mode 100755 new mode 100644 index 0566c221..2e87c52f --- a/packages/app/android/gradle.properties +++ b/packages/app/android/gradle.properties @@ -20,5 +20,3 @@ org.gradle.jvmargs=-Xmx1536m # 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 diff --git a/packages/app/android/gradle/wrapper/gradle-wrapper.jar b/packages/app/android/gradle/wrapper/gradle-wrapper.jar old mode 100755 new mode 100644 index 41d9927a..ccebba77 Binary files a/packages/app/android/gradle/wrapper/gradle-wrapper.jar and b/packages/app/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/packages/app/android/gradle/wrapper/gradle-wrapper.properties b/packages/app/android/gradle/wrapper/gradle-wrapper.properties old mode 100755 new mode 100644 index 92f06b50..264bc9f4 --- a/packages/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ +#Tue Jun 20 16:57:49 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/app/android/gradlew b/packages/app/android/gradlew index 1b6c7873..79a61d42 100755 --- a/packages/app/android/gradlew +++ b/packages/app/android/gradlew @@ -55,7 +55,7 @@ # 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 +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # 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"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/packages/app/android/gradlew.bat b/packages/app/android/gradlew.bat old mode 100755 new mode 100644 index ac1b06f9..6689b85b --- a/packages/app/android/gradlew.bat +++ b/packages/app/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/packages/app/android/settings.gradle b/packages/app/android/settings.gradle old mode 100755 new mode 100644 diff --git a/packages/app/android/variables.gradle b/packages/app/android/variables.gradle old mode 100755 new mode 100644 index 777bd7e8..5946adab --- a/packages/app/android/variables.gradle +++ b/packages/app/android/variables.gradle @@ -1,16 +1,16 @@ ext { minSdkVersion = 22 - compileSdkVersion = 32 - targetSdkVersion = 32 - androidxActivityVersion = '1.4.0' - androidxAppCompatVersion = '1.4.2' + compileSdkVersion = 33 + targetSdkVersion = 33 + androidxActivityVersion = '1.7.0' + androidxAppCompatVersion = '1.6.1' androidxCoordinatorLayoutVersion = '1.2.0' - androidxCoreVersion = '1.8.0' - androidxFragmentVersion = '1.4.1' - coreSplashScreenVersion = '1.0.0-rc01' - androidxWebkitVersion = '1.4.0' + androidxCoreVersion = '1.10.0' + androidxFragmentVersion = '1.5.6' + coreSplashScreenVersion = '1.0.0' + androidxWebkitVersion = '1.6.1' junitVersion = '4.13.2' - androidxJunitVersion = '1.1.3' - androidxEspressoCoreVersion = '3.4.0' + androidxJunitVersion = '1.1.5' + androidxEspressoCoreVersion = '3.5.1' cordovaAndroidVersion = '10.1.1' } \ No newline at end of file diff --git a/packages/app/package.json b/packages/app/package.json index d6ee41ac..232e452f 100755 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -132,6 +132,7 @@ "wait-on": "^6.0.1" }, "devDependencies": { + "@capacitor/assets": "^2.0.4", "@electron-forge/cli": "^6.0.0-beta.66", "@electron-forge/maker-deb": "^6.0.0-beta.66", "@electron-forge/maker-rpm": "^6.0.0-beta.66",