diff --git a/MOBILE_CONNECTION_RUNBOOK.md b/MOBILE_CONNECTION_RUNBOOK.md new file mode 100644 index 00000000000..9ca9d17b093 --- /dev/null +++ b/MOBILE_CONNECTION_RUNBOOK.md @@ -0,0 +1,164 @@ +# Conexão móvel do T3 Code + +Este documento registra o setup usado para conectar o celular e o tablet Android ao T3 Code no +Linux e no Mac. Ele não contém tokens: as credenciais de pareamento são temporárias e devem ser +geradas novamente para cada aplicativo e dispositivo. + +## Configuração atual + +| Máquina | Endereço Tailscale HTTPS | IP do tailnet | +| --------- | ----------------------------------------------- | --------------- | +| Linux MSI | `https://gabriel-alonso-msi.tailad333c.ts.net` | `100.70.132.45` | +| Mac mini | `https://mac-mini-de-gabriel.tailad333c.ts.net` | `100.71.185.10` | + +O Tailscale precisa permanecer conectado no dispositivo móvel, inclusive dentro de casa. Sem exit +node habilitado, somente o tráfego destinado ao tailnet passa pelo Tailscale. No Wi-Fi de casa, a +comunicação entre os pares normalmente continua direta pela rede local. + +Aplicativos Android: + +| Aplicativo | Package ID | APK | +| ----------------------- | ------------------------ | ------------------------------------------------------------------------- | +| React Native standalone | `com.t3tools.t3code.dev` | `apps/mobile/android/app/build/outputs/apk/release/app-release.apk` | +| Capacitor | `tools.t3code.mobile` | `apps/mobile-capacitor/android/app/build/outputs/apk/debug/app-debug.apk` | + +Dispositivos usados no setup: + +| Dispositivo | Modelo | Último serial ADB conhecido | +| ----------- | ---------------- | --------------------------- | +| Celular | Samsung SM-S928B | `RXCX800G1DY` | +| Tablet | Samsung SM-X610 | `RX2XC0094TX` | + +Sempre confirme o serial atual antes de executar comandos: + +```bash +ADB="$HOME/.local/share/Android/Sdk/platform-tools/adb" +"$ADB" devices -l +``` + +## Verificação das máquinas + +No Linux: + +```bash +tailscale status +tailscale serve status +``` + +O Tailscale Serve do Linux deve encaminhar o HTTPS para o servidor local: + +```text +https://gabriel-alonso-msi.tailad333c.ts.net/ -> http://127.0.0.1:3773 +``` + +No Mac: + +```bash +ssh mac-mini '/Applications/Tailscale.app/Contents/MacOS/Tailscale status; \ + /Applications/Tailscale.app/Contents/MacOS/Tailscale serve status' +``` + +O T3 Code precisa estar em execução nas duas máquinas antes de testar o aplicativo. + +## Gerar credenciais de pareamento + +Gere uma credencial diferente para cada combinação de dispositivo e aplicativo. O exemplo abaixo +cria uma credencial de 30 minutos para o Linux: + +```bash +npx --yes t3@0.0.28 auth pairing create \ + --base-dir "$HOME/.t3" \ + --ttl 30m \ + --label "NOME DO DISPOSITIVO E APLICATIVO" \ + --base-url "https://gabriel-alonso-msi.tailad333c.ts.net" \ + --json +``` + +Para o Mac: + +```bash +ssh mac-mini 'PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:$PATH; \ + /opt/homebrew/bin/npx --yes t3@0.0.28 auth pairing create \ + --base-dir "$HOME/.t3" \ + --ttl 30m \ + --label "NOME DO DISPOSITIVO E APLICATIVO" \ + --base-url "https://mac-mini-de-gabriel.tailad333c.ts.net" \ + --json' +``` + +Use o campo `credential` retornado como código de pareamento. Não registre esse código neste +documento. + +## Parear os aplicativos + +No React Native: + +1. Abra **Settings → Environments → +**. +2. Informe o endereço HTTPS da máquina e o `credential` correspondente. +3. Repita para a outra máquina. +4. Confirme que os dois ambientes aparecem como **Connected**. + +No Capacitor: + +1. Abra **Settings → Connections → Add environment**. +2. Informe o endereço HTTPS da máquina e o `credential` correspondente. +3. Repita para a outra máquina. +4. Confirme os dois indicadores verdes. + +## Compilar e instalar + +### Capacitor + +```bash +vp run --filter @t3tools/mobile-capacitor build + +cd apps/mobile-capacitor/android +ANDROID_HOME="$HOME/.local/share/Android/Sdk" \ +ANDROID_SDK_ROOT="$HOME/.local/share/Android/Sdk" \ +./gradlew app:assembleDebug --no-daemon +``` + +Instalação preservando os pareamentos existentes: + +```bash +ADB="$HOME/.local/share/Android/Sdk/platform-tools/adb" +"$ADB" -s SERIAL install -r \ + apps/mobile-capacitor/android/app/build/outputs/apk/debug/app-debug.apk +``` + +Se aparecer `INSTALL_FAILED_UPDATE_INCOMPATIBLE`, existe uma versão antiga assinada por outra +chave. A substituição abaixo apaga somente os dados do Capacitor e exige novo pareamento: + +```bash +"$ADB" -s SERIAL uninstall tools.t3code.mobile +"$ADB" -s SERIAL install \ + apps/mobile-capacitor/android/app/build/outputs/apk/debug/app-debug.apk +``` + +### React Native standalone + +```bash +cd apps/mobile/android +ANDROID_HOME="$HOME/.local/share/Android/Sdk" \ +ANDROID_SDK_ROOT="$HOME/.local/share/Android/Sdk" \ +./gradlew app:assembleRelease --no-daemon +``` + +```bash +ADB="$HOME/.local/share/Android/Sdk/platform-tools/adb" +"$ADB" -s SERIAL install -r \ + apps/mobile/android/app/build/outputs/apk/release/app-release.apk +``` + +Use o APK `release`: o APK de desenvolvimento depende do Metro e não é adequado para uso longe do +computador. + +## Checklist final + +- Tailscale conectado no Linux, Mac e dispositivo Android. +- T3 Code em execução nas duas máquinas. +- Linux e Mac aparecem como **Connected** nos dois aplicativos. +- Threads das duas máquinas são carregadas. +- O React Native abre sem Metro e sem cabo USB. +- O Capacitor respeita as barras de status e navegação em retrato e paisagem. +- `vp check`, `vp run typecheck` e `vp run lint:mobile` passam antes de distribuir novos APKs. diff --git a/apps/mobile-capacitor/README.md b/apps/mobile-capacitor/README.md new file mode 100644 index 00000000000..9e09fe13453 --- /dev/null +++ b/apps/mobile-capacitor/README.md @@ -0,0 +1,15 @@ +# T3 Code Mobile — Capacitor + +Shell Android do `apps/web`, separado do aplicativo React Native em `apps/mobile`. + +O shell usa o runtime moderno de conexões do web app. Assim, o celular pode salvar +vários ambientes (por exemplo, Linux e Mac via Tailscale), mantendo apenas o ambiente +selecionado ativo. + +```bash +vp run --filter @t3tools/mobile-capacitor build +vp run --filter @t3tools/mobile-capacitor open:android +``` + +O Android permite HTTP sem TLS para endereços privados/Tailscale. A autenticação +continua obrigatória: cada máquina precisa ser pareada para emitir seu bearer token. diff --git a/apps/mobile-capacitor/android/.gitignore b/apps/mobile-capacitor/android/.gitignore new file mode 100644 index 00000000000..48354a3dfc4 --- /dev/null +++ b/apps/mobile-capacitor/android/.gitignore @@ -0,0 +1,101 @@ +# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore + +# Built application files +*.apk +*.aar +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ + +# Android Profiling +*.hprof + +# Cordova plugins for Capacitor +capacitor-cordova-android-plugins + +# Copied web assets +app/src/main/assets/public + +# Generated Config files +app/src/main/assets/capacitor.config.json +app/src/main/assets/capacitor.plugins.json +app/src/main/res/xml/config.xml diff --git a/apps/mobile-capacitor/android/app/.gitignore b/apps/mobile-capacitor/android/app/.gitignore new file mode 100644 index 00000000000..043df802a29 --- /dev/null +++ b/apps/mobile-capacitor/android/app/.gitignore @@ -0,0 +1,2 @@ +/build/* +!/build/.npmkeep diff --git a/apps/mobile-capacitor/android/app/build.gradle b/apps/mobile-capacitor/android/app/build.gradle new file mode 100644 index 00000000000..5ec6e75a7a7 --- /dev/null +++ b/apps/mobile-capacitor/android/app/build.gradle @@ -0,0 +1,54 @@ +apply plugin: 'com.android.application' + +android { + namespace = "tools.t3code.mobile" + compileSdk = rootProject.ext.compileSdkVersion + defaultConfig { + applicationId "tools.t3code.mobile" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + aaptOptions { + // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. + // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61 + ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' + } + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +repositories { + flatDir{ + dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs' + } +} + +dependencies { + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" + implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion" + implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion" + implementation project(':capacitor-android') + testImplementation "junit:junit:$junitVersion" + androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" + androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion" + implementation project(':capacitor-cordova-android-plugins') +} + +apply from: 'capacitor.build.gradle' + +try { + def servicesJSON = file('google-services.json') + if (servicesJSON.text) { + apply plugin: 'com.google.gms.google-services' + } +} catch(Exception e) { + logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work") +} diff --git a/apps/mobile-capacitor/android/app/capacitor.build.gradle b/apps/mobile-capacitor/android/app/capacitor.build.gradle new file mode 100644 index 00000000000..bbfb44fad11 --- /dev/null +++ b/apps/mobile-capacitor/android/app/capacitor.build.gradle @@ -0,0 +1,19 @@ +// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN + +android { + compileOptions { + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 + } +} + +apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" +dependencies { + + +} + + +if (hasProperty('postBuildExtras')) { + postBuildExtras() +} diff --git a/apps/mobile-capacitor/android/app/proguard-rules.pro b/apps/mobile-capacitor/android/app/proguard-rules.pro new file mode 100644 index 00000000000..f1b424510da --- /dev/null +++ b/apps/mobile-capacitor/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/apps/mobile-capacitor/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/apps/mobile-capacitor/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java new file mode 100644 index 00000000000..f2c2217efa5 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +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/apps/mobile-capacitor/android/app/src/main/AndroidManifest.xml b/apps/mobile-capacitor/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..f08a0d15617 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/mobile-capacitor/android/app/src/main/java/tools/t3code/mobile/MainActivity.java b/apps/mobile-capacitor/android/app/src/main/java/tools/t3code/mobile/MainActivity.java new file mode 100644 index 00000000000..981c534ecff --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/java/tools/t3code/mobile/MainActivity.java @@ -0,0 +1,5 @@ +package tools.t3code.mobile; + +import com.getcapacitor.BridgeActivity; + +public class MainActivity extends BridgeActivity {} diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-land-hdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-hdpi/splash.png new file mode 100644 index 00000000000..e31573b4fc9 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-land-mdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-mdpi/splash.png new file mode 100644 index 00000000000..f7a64923ea1 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xhdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xhdpi/splash.png new file mode 100644 index 00000000000..807725501bd Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xxhdpi/splash.png new file mode 100644 index 00000000000..14c6c8fe39f Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xxxhdpi/splash.png new file mode 100644 index 00000000000..244ca2506db Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-port-hdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-hdpi/splash.png new file mode 100644 index 00000000000..74faaa583c8 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-port-mdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-mdpi/splash.png new file mode 100644 index 00000000000..e944f4ad4e1 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xhdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xhdpi/splash.png new file mode 100644 index 00000000000..564a82ff954 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xxhdpi/splash.png new file mode 100644 index 00000000000..bfabe6871a1 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xxxhdpi/splash.png new file mode 100644 index 00000000000..6929071268e Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/apps/mobile-capacitor/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000000..c7bd21dbd86 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable/ic_launcher_background.xml b/apps/mobile-capacitor/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000000..d5fccc538c1 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/mobile-capacitor/android/app/src/main/res/drawable/splash.png b/apps/mobile-capacitor/android/app/src/main/res/drawable/splash.png new file mode 100644 index 00000000000..f7a64923ea1 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/drawable/splash.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/layout/activity_main.xml b/apps/mobile-capacitor/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000000..b5ad1387011 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/apps/mobile-capacitor/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000000..036d09bc5fd --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/apps/mobile-capacitor/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000000..036d09bc5fd --- /dev/null +++ b/apps/mobile-capacitor/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/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000000..c023e505950 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000000..2127973b2d3 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000000..b441f37d6a2 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000000..72905b854cb Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000000..8ed0605c27c Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000000..9502e47a2c5 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000000..4d1e077104c Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000000..df0f15880be Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000000..853db043d8a Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000000..6cdf97c1196 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000000..2960cbb6104 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000000..8e3093a86ff Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000000..46de6e255a9 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000000..d2ea9abed39 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000000..a40d73e9c68 Binary files /dev/null and b/apps/mobile-capacitor/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/apps/mobile-capacitor/android/app/src/main/res/values/ic_launcher_background.xml b/apps/mobile-capacitor/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000000..c5d5899fdf0 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/apps/mobile-capacitor/android/app/src/main/res/values/strings.xml b/apps/mobile-capacitor/android/app/src/main/res/values/strings.xml new file mode 100644 index 00000000000..eb8f958f21f --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + T3 Code + T3 Code + tools.t3code.mobile + tools.t3code.mobile + diff --git a/apps/mobile-capacitor/android/app/src/main/res/values/styles.xml b/apps/mobile-capacitor/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000000..be874e54a4a --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/values/styles.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/apps/mobile-capacitor/android/app/src/main/res/xml/file_paths.xml b/apps/mobile-capacitor/android/app/src/main/res/xml/file_paths.xml new file mode 100644 index 00000000000..bd0c4d80d04 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/apps/mobile-capacitor/android/app/src/main/res/xml/network_security_config.xml b/apps/mobile-capacitor/android/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 00000000000..9f02f9066c8 --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/mobile-capacitor/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/apps/mobile-capacitor/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java new file mode 100644 index 00000000000..0297327842d --- /dev/null +++ b/apps/mobile-capacitor/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java @@ -0,0 +1,18 @@ +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/apps/mobile-capacitor/android/build.gradle b/apps/mobile-capacitor/android/build.gradle new file mode 100644 index 00000000000..f8f0e43b6d5 --- /dev/null +++ b/apps/mobile-capacitor/android/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.google.gms:google-services:4.4.4' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +apply from: "variables.gradle" + +allprojects { + repositories { + google() + mavenCentral() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/apps/mobile-capacitor/android/capacitor.settings.gradle b/apps/mobile-capacitor/android/capacitor.settings.gradle new file mode 100644 index 00000000000..1b6303f4a97 --- /dev/null +++ b/apps/mobile-capacitor/android/capacitor.settings.gradle @@ -0,0 +1,3 @@ +// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN +include ':capacitor-android' +project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@8.3.3_@capacitor+core@8.3.3/node_modules/@capacitor/android/capacitor') diff --git a/apps/mobile-capacitor/android/gradle.properties b/apps/mobile-capacitor/android/gradle.properties new file mode 100644 index 00000000000..2e87c52f83c --- /dev/null +++ b/apps/mobile-capacitor/android/gradle.properties @@ -0,0 +1,22 @@ +# 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. +org.gradle.jvmargs=-Xmx1536m + +# 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 diff --git a/apps/mobile-capacitor/android/gradle/wrapper/gradle-wrapper.jar b/apps/mobile-capacitor/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..1b33c55baab Binary files /dev/null and b/apps/mobile-capacitor/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/apps/mobile-capacitor/android/gradle/wrapper/gradle-wrapper.properties b/apps/mobile-capacitor/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..7705927e949 --- /dev/null +++ b/apps/mobile-capacitor/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/apps/mobile-capacitor/android/gradlew b/apps/mobile-capacitor/android/gradlew new file mode 100755 index 00000000000..23d15a93670 --- /dev/null +++ b/apps/mobile-capacitor/android/gradlew @@ -0,0 +1,251 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/HEAD/platforms/jvm/plugins-application/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# 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="\\\"\\\"" + + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +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=SC2039,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=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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. +# +# 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/apps/mobile-capacitor/android/gradlew.bat b/apps/mobile-capacitor/android/gradlew.bat new file mode 100644 index 00000000000..db3a6ac207e --- /dev/null +++ b/apps/mobile-capacitor/android/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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=. +@rem This is normally unused +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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega diff --git a/apps/mobile-capacitor/android/settings.gradle b/apps/mobile-capacitor/android/settings.gradle new file mode 100644 index 00000000000..3b4431d7724 --- /dev/null +++ b/apps/mobile-capacitor/android/settings.gradle @@ -0,0 +1,5 @@ +include ':app' +include ':capacitor-cordova-android-plugins' +project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/') + +apply from: 'capacitor.settings.gradle' \ No newline at end of file diff --git a/apps/mobile-capacitor/android/variables.gradle b/apps/mobile-capacitor/android/variables.gradle new file mode 100644 index 00000000000..ee4ba41c46f --- /dev/null +++ b/apps/mobile-capacitor/android/variables.gradle @@ -0,0 +1,16 @@ +ext { + minSdkVersion = 24 + compileSdkVersion = 36 + targetSdkVersion = 36 + androidxActivityVersion = '1.11.0' + androidxAppCompatVersion = '1.7.1' + androidxCoordinatorLayoutVersion = '1.3.0' + androidxCoreVersion = '1.17.0' + androidxFragmentVersion = '1.8.9' + coreSplashScreenVersion = '1.2.0' + androidxWebkitVersion = '1.14.0' + junitVersion = '4.13.2' + androidxJunitVersion = '1.3.0' + androidxEspressoCoreVersion = '3.7.0' + cordovaAndroidVersion = '14.0.1' +} \ No newline at end of file diff --git a/apps/mobile-capacitor/capacitor.config.ts b/apps/mobile-capacitor/capacitor.config.ts new file mode 100644 index 00000000000..734a7924fde --- /dev/null +++ b/apps/mobile-capacitor/capacitor.config.ts @@ -0,0 +1,19 @@ +import type { CapacitorConfig } from "@capacitor/cli"; + +const config: CapacitorConfig = { + appId: "tools.t3code.mobile", + appName: "T3 Code", + webDir: "../web/dist", + loggingBehavior: "none", + plugins: { + SystemBars: { + insetsHandling: "css", + }, + }, + server: { + cleartext: true, + androidScheme: "http", + }, +}; + +export default config; diff --git a/apps/mobile-capacitor/package.json b/apps/mobile-capacitor/package.json new file mode 100644 index 00000000000..7633d493ed1 --- /dev/null +++ b/apps/mobile-capacitor/package.json @@ -0,0 +1,21 @@ +{ + "name": "@t3tools/mobile-capacitor", + "version": "0.0.0", + "private": true, + "type": "module", + "scripts": { + "build": "vp run --filter @t3tools/web build && cap sync", + "sync": "cap sync", + "sync:android": "cap sync android", + "typecheck": "tsgo --noEmit", + "open:android": "cap open android" + }, + "dependencies": { + "@capacitor/android": "8.3.3", + "@capacitor/core": "8.3.3" + }, + "devDependencies": { + "@capacitor/cli": "8.3.3", + "@typescript/native-preview": "catalog:" + } +} diff --git a/apps/mobile-capacitor/tsconfig.json b/apps/mobile-capacitor/tsconfig.json new file mode 100644 index 00000000000..ba759d8de68 --- /dev/null +++ b/apps/mobile-capacitor/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": ["node"] + }, + "include": ["capacitor.config.ts"] +} diff --git a/apps/mobile/src/features/connection/pairing.ts b/apps/mobile/src/features/connection/pairing.ts index 910efa7f256..fc1c538aa94 100644 --- a/apps/mobile/src/features/connection/pairing.ts +++ b/apps/mobile/src/features/connection/pairing.ts @@ -23,7 +23,9 @@ export function buildPairingUrl(host: string, code: string): string { url.hash = new URLSearchParams([["token", c]]).toString(); return url.toString(); } catch { - return `${h}#token=${c}`; + const normalizedHost = h.includes("://") ? h : `https://${h}`; + const separator = normalizedHost.includes("#") ? "&" : "#"; + return `${normalizedHost}${separator}token=${encodeURIComponent(c)}`; } } diff --git a/apps/mobile/src/native/StackHeader.tsx b/apps/mobile/src/native/StackHeader.tsx index e2708757995..2641c08600d 100644 --- a/apps/mobile/src/native/StackHeader.tsx +++ b/apps/mobile/src/native/StackHeader.tsx @@ -14,7 +14,7 @@ import { type ReactElement, type ReactNode, } from "react"; -import type { ColorValue } from "react-native"; +import { Platform, Pressable, Text, View, type ColorValue } from "react-native"; export { nativeHeaderScrollEdgeEffects, @@ -253,6 +253,82 @@ function collectToolbarItems(children: ReactNode): NativeStackHeaderItem[] { return items; } +function androidToolbarButtonLabel(icon: unknown): string { + switch (icon) { + case "plus": + case "square.and.pencil": + return "+"; + case "xmark": + return "×"; + case "gearshape": + return "⚙"; + case "qrcode.viewfinder": + return "QR"; + default: + return "⋯"; + } +} + +function AndroidHeaderToolbar(props: { readonly children?: ReactNode }) { + return ( + + {Children.toArray(props.children).map((child, index) => { + if (!isValidElement(child)) { + return null; + } + const typeName = elementTypeName(child); + if (typeName !== "NativeHeaderToolbarButton") { + return null; + } + const accessibilityLabel = + typeof child.props.accessibilityLabel === "string" + ? child.props.accessibilityLabel + : undefined; + const onPress = + typeof child.props.onPress === "function" + ? (child.props.onPress as () => void) + : undefined; + return ( + + + {androidToolbarButtonLabel(child.props.icon)} + + + ); + })} + + ); +} + function NativeHeaderToolbarRoot(props: { readonly placement?: "left" | "right" | "bottom"; readonly children?: ReactNode; @@ -264,6 +340,15 @@ function NativeHeaderToolbarRoot(props: { if (!navigation) { return; } + if (Platform.OS === "android" && props.placement !== "bottom") { + const optionName = props.placement === "left" ? "headerLeft" : "headerRight"; + navigation.setOptions({ + [optionName]: () => {props.children}, + }); + return () => { + navigation.setOptions({ [optionName]: undefined }); + }; + } if (props.placement === "bottom") { navigation.setOptions({ unstable_headerToolbarItems: () => items, @@ -284,7 +369,7 @@ function NativeHeaderToolbarRoot(props: { return () => { navigation.setOptions({ unstable_headerRightItems: () => [] }); }; - }, [items, navigation, props.placement]); + }, [items, navigation, props.children, props.placement]); return null; } diff --git a/apps/server/src/http.ts b/apps/server/src/http.ts index fc7a9ef13a2..e88a70a72c9 100644 --- a/apps/server/src/http.ts +++ b/apps/server/src/http.ts @@ -40,7 +40,11 @@ import { failEnvironmentInternal, } from "./auth/http.ts"; import * as ServerEnvironment from "./environment/ServerEnvironment.ts"; -import { browserApiCorsAllowedHeaders, browserApiCorsAllowedMethods } from "./httpCors.ts"; +import { + browserApiCorsAllowedHeaders, + browserApiCorsAllowedMethods, + mobileCapacitorCorsAllowedOrigins, +} from "./httpCors.ts"; const OTLP_TRACES_PROXY_PATH = "/api/observability/v1/traces"; const LOOPBACK_HOSTNAMES = new Set(["127.0.0.1", "::1", "localhost"]); @@ -54,7 +58,16 @@ export const browserApiCorsLayer = Layer.unwrap( // explicit. Packaged desktop omits credentials and uses Effect's default wildcard origin. return HttpRouter.cors({ ...(devOrigin - ? { allowedOrigins: [devOrigin, ...DESKTOP_RENDERER_ORIGINS], credentials: true } + ? { + allowedOrigins: [ + ...new Set([ + devOrigin, + ...DESKTOP_RENDERER_ORIGINS, + ...mobileCapacitorCorsAllowedOrigins, + ]), + ], + credentials: true, + } : {}), allowedMethods: browserApiCorsAllowedMethods, allowedHeaders: browserApiCorsAllowedHeaders, diff --git a/apps/server/src/httpCors.ts b/apps/server/src/httpCors.ts index aeb8dbce5a5..fa4f26567bb 100644 --- a/apps/server/src/httpCors.ts +++ b/apps/server/src/httpCors.ts @@ -7,6 +7,13 @@ export const browserApiCorsAllowedHeaders = [ "dpop", ] as const; +// Capacitor serves the bundled web app from a native WebView origin. These +// must stay explicit when development enables credentialed CORS. +export const mobileCapacitorCorsAllowedOrigins = [ + "http://localhost", + "capacitor://localhost", +] as const; + export const browserApiCorsHeaders = { "access-control-allow-origin": "*", "access-control-allow-methods": browserApiCorsAllowedMethods.join(", "), diff --git a/apps/server/src/server.test.ts b/apps/server/src/server.test.ts index 347c2920792..8f01056b9a8 100644 --- a/apps/server/src/server.test.ts +++ b/apps/server/src/server.test.ts @@ -3262,6 +3262,32 @@ it.layer(NodeServices.layer)("server router seam", (it) => { ); } + for (const capacitorOrigin of ["http://localhost", "capacitor://localhost"]) { + it.effect(`allows Capacitor preflights from ${capacitorOrigin} in development`, () => + Effect.gen(function* () { + yield* buildAppUnderTest({ + config: { devUrl: new URL(crossOriginClientOrigin) }, + }); + + const sessionUrl = yield* getHttpServerUrl("/api/auth/session"); + const response = yield* fetchEffect(sessionUrl, { + method: "OPTIONS", + headers: { + origin: capacitorOrigin, + "access-control-request-method": "GET", + "access-control-request-headers": "authorization, content-type", + }, + }); + + assert.equal(response.status, 204); + assertBrowserApiCorsPreflightHeaders(response.headers, { + origin: capacitorOrigin, + credentials: true, + }); + }).pipe(Effect.provide(NodeHttpServer.layerTest)), + ); + } + it.effect("includes CORS headers on remote websocket-ticket auth failures", () => Effect.gen(function* () { yield* buildAppUnderTest(); diff --git a/apps/web/src/capacitor.test.ts b/apps/web/src/capacitor.test.ts new file mode 100644 index 00000000000..63055eb1b01 --- /dev/null +++ b/apps/web/src/capacitor.test.ts @@ -0,0 +1,21 @@ +import { afterEach, describe, expect, it, vi } from "vite-plus/test"; + +import { isCapacitorNativeApp } from "./capacitor"; + +describe("Capacitor runtime detection", () => { + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it("detects a native Capacitor WebView", () => { + vi.stubGlobal("Capacitor", { isNativePlatform: () => true }); + + expect(isCapacitorNativeApp()).toBe(true); + }); + + it("does not classify the browser implementation as native", () => { + vi.stubGlobal("Capacitor", { isNativePlatform: () => false }); + + expect(isCapacitorNativeApp()).toBe(false); + }); +}); diff --git a/apps/web/src/capacitor.ts b/apps/web/src/capacitor.ts new file mode 100644 index 00000000000..dc024aa2c23 --- /dev/null +++ b/apps/web/src/capacitor.ts @@ -0,0 +1,15 @@ +interface CapacitorRuntimeGlobal { + readonly isNativePlatform?: () => boolean; +} + +export function isCapacitorNativeApp(): boolean { + if (typeof window === "undefined") { + return false; + } + + return ( + ( + window as Window & { readonly Capacitor?: CapacitorRuntimeGlobal } + ).Capacitor?.isNativePlatform?.() === true + ); +} diff --git a/apps/web/src/components/AppSidebarLayout.tsx b/apps/web/src/components/AppSidebarLayout.tsx index 0f1a8f9d429..639111de8c2 100644 --- a/apps/web/src/components/AppSidebarLayout.tsx +++ b/apps/web/src/components/AppSidebarLayout.tsx @@ -6,6 +6,7 @@ import { isElectron } from "../env"; import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings"; import { isMacPlatform } from "../lib/utils"; import { primaryServerKeybindingsAtom } from "../state/server"; +import { isCapacitorNativeApp } from "../capacitor"; import ThreadSidebar from "./Sidebar"; import { Sidebar, SidebarProvider, SidebarRail, SidebarTrigger, useSidebar } from "./ui/sidebar"; import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip"; @@ -55,6 +56,7 @@ function SidebarControl() { export function AppSidebarLayout({ children }: { children: ReactNode }) { const navigate = useNavigate(); + const isCapacitor = isCapacitorNativeApp(); const macosWindowControlsStyle = isElectron && isMacPlatform(navigator.platform) ? ({ "--workspace-controls-left": MACOS_TRAFFIC_LIGHTS_LEFT_INSET } as CSSProperties) @@ -78,7 +80,11 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) { }, [navigate]); return ( - + { if (cached) return cached; const promise = getSharedHighlighter({ - themes: [resolveDiffThemeName("dark"), resolveDiffThemeName("light")], + themes: [ + resolveDiffThemeName("dark"), + resolveDiffThemeName("light"), + resolveDiffThemeName("ayuBlack"), + ], langs: [language as SupportedLanguages], preferredHighlighter: "shiki-js", }).catch((err) => { @@ -1238,7 +1242,7 @@ function ChatMarkdown({ className, lineBreaks = false, }: ChatMarkdownProps) { - const { resolvedTheme } = useTheme(); + const { resolvedTheme, syntaxTheme } = useTheme(); const createAssetUrl = useAtomQueryRunner(assetEnvironment.createUrl, { reportFailure: false, }); @@ -1252,7 +1256,7 @@ function ChatMarkdown({ environmentId, serverConfig?.availableEditors ?? [], ); - const diffThemeName = resolveDiffThemeName(resolvedTheme); + const diffThemeName = resolveDiffThemeName(syntaxTheme); const markdownFileLinkMetaByHref = useMemo(() => { const metaByHref = new Map< string, diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx index f5ea5bb1eba..1186dd8b311 100644 --- a/apps/web/src/components/ChatView.tsx +++ b/apps/web/src/components/ChatView.tsx @@ -5029,7 +5029,7 @@ function ChatViewContent(props: ChatViewProps) { !inlineRightPanelOwnsTitleBar && "wco:pr-[var(--workspace-native-controls-inset)]", ) - : "workspace-topbar pl-[calc(env(safe-area-inset-left)+0.75rem)] pr-[calc(env(safe-area-inset-right)+0.75rem)] sm:pl-[calc(env(safe-area-inset-left)+1.25rem)] sm:pr-[calc(env(safe-area-inset-right)+1.25rem)]", + : "workspace-topbar pl-[calc(var(--app-safe-area-inset-left)+0.75rem)] pr-[calc(var(--app-safe-area-inset-right)+0.75rem)] sm:pl-[calc(var(--app-safe-area-inset-left)+1.25rem)] sm:pr-[calc(var(--app-safe-area-inset-right)+1.25rem)]", COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, )} > @@ -5219,8 +5219,8 @@ function ChatViewContent(props: ChatViewProps) { className={cn( "chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10", isGitRepo - ? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]" - : "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]", + ? "pb-[calc(var(--app-safe-area-inset-bottom)+0.25rem)]" + : "pb-[calc(var(--app-safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(var(--app-safe-area-inset-bottom)+1rem)]", )} > {isGitRepo && ( diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx index cbcd36ce05e..cadf2f87d2e 100644 --- a/apps/web/src/components/DiffPanel.tsx +++ b/apps/web/src/components/DiffPanel.tsx @@ -183,7 +183,7 @@ interface DiffPanelProps { export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider"; export default function DiffPanel({ mode = "inline", composerDraftTarget }: DiffPanelProps) { - const { resolvedTheme } = useTheme(); + const { resolvedTheme, syntaxTheme } = useTheme(); const settings = useClientSettings(); const [diffRenderMode, setDiffRenderMode] = useState("stacked"); const [wordWrap, setWordWrap] = useState(settings.wordWrap); @@ -844,7 +844,7 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff diffStyle: diffRenderMode === "split" ? "split" : "unified", lineDiffType: "none", overflow: wordWrap ? "wrap" : "scroll", - theme: resolveDiffThemeName(resolvedTheme), + theme: resolveDiffThemeName(syntaxTheme), themeType: resolvedTheme as DiffThemeType, unsafeCSS: DIFF_PANEL_UNSAFE_CSS, stickyHeaders: true, diff --git a/apps/web/src/components/DiffWorkerPoolProvider.tsx b/apps/web/src/components/DiffWorkerPoolProvider.tsx index 3ec748c6bcb..38911248d25 100644 --- a/apps/web/src/components/DiffWorkerPoolProvider.tsx +++ b/apps/web/src/components/DiffWorkerPoolProvider.tsx @@ -7,7 +7,7 @@ import { resolveDiffThemeName, type DiffThemeName } from "../lib/diffRendering"; export class DiffWorkerError extends Schema.TaggedErrorClass()("DiffWorkerError", { operation: Schema.Literals(["create-worker", "get-render-options", "set-render-options"]), - themeName: Schema.Literals(["pierre-light", "pierre-dark"]), + themeName: Schema.Literals(["pierre-light", "pierre-dark", "t3code-ayu-black"]), cause: Schema.Defect(), }) { override get message(): string { @@ -46,8 +46,8 @@ function DiffWorkerThemeSync({ themeName }: { themeName: DiffThemeName }) { } export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) { - const { resolvedTheme } = useTheme(); - const diffThemeName = resolveDiffThemeName(resolvedTheme); + const { syntaxTheme } = useTheme(); + const diffThemeName = resolveDiffThemeName(syntaxTheme); const workerPoolSize = useMemo(() => { const cores = typeof navigator === "undefined" ? 4 : Math.max(1, navigator.hardwareConcurrency || 4); diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx index 40017d56314..52ab111e8fe 100644 --- a/apps/web/src/components/settings/SettingsPanels.tsx +++ b/apps/web/src/components/settings/SettingsPanels.tsx @@ -102,6 +102,10 @@ const THEME_OPTIONS = [ value: "dark", label: "Dark", }, + { + value: "ayuBlack", + label: "Ayu Black", + }, ] as const; const TIMESTAMP_FORMAT_LABELS = { @@ -528,7 +532,12 @@ export function GeneralSettingsPanel() {