diff --git a/.claude/launch.json b/.claude/launch.json index 8d39f8e..90cfc79 100644 --- a/.claude/launch.json +++ b/.claude/launch.json @@ -5,22 +5,22 @@ "name": "server-be (local test)", "runtimeExecutable": "pnpm", "runtimeArgs": ["--filter", "@cardy/server-be", "exec", "tsx", "src/index.ts"], - "port": 10002, + "port": 10012, "env": { + "PORT": "10012", "KEY_ENCRYPTION_SECRET": "cHrUrVMk3KgaAw066+CPj7iYXuBfBXbH5lPLFwoBSLA=", "SUPERADMIN_EMAIL": "admin@local.test", - "ADMIN_PROXY_SECRET": "local-proxy-secret", "DATA_DIR": "C:/Users/User/AppData/Local/Temp/claude/D--Documents-ProjectsGit-Cardy/bf03f49e-0768-4ffa-b6d2-c9a06a1562aa/scratchpad/data" } }, { - "name": "server-fe (local test)", + "name": "mobile-client (local test)", "runtimeExecutable": "pnpm", - "runtimeArgs": ["--filter", "@cardy/server-fe", "exec", "vite"], - "port": 10001, + "runtimeArgs": ["--filter", "@cardy/mobile-client", "exec", "vite"], + "port": 10013, "env": { - "ADMIN_PROXY_SECRET": "local-proxy-secret", - "DEV_REMOTE_EMAIL": "admin@local.test", + "PORT": "10013", + "BACKEND_URL": "http://127.0.0.1:10012", "ALLOWED_HOSTS": "localhost" } } diff --git a/.gitignore b/.gitignore index ddc0ba2..a0add8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules/ dist/ +dist-capacitor/ data/ .env *.log diff --git a/README.md b/README.md index 03c871f..ae19545 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,25 @@ pnpm --filter @cardy/server-be dev # API on 127.0.0.1:10002 (tsx watch) pnpm --filter @cardy/server-fe dev # admin UI on :10001 ``` +```bash +pnpm --filter @cardy/mobile-client start # PWA: build + vite preview on :10003 (service worker needs a build) +``` + Production-like: `pnpm --filter @cardy/server-be build && pnpm --filter @cardy/server-be start`, `pnpm --filter @cardy/server-fe start` (build + `vite preview` on :10001). +The mobile client dev server (`pnpm --filter @cardy/mobile-client dev`) works locally at +`http://localhost:10003/m/`; behind the proxy use `start`. + +## Android app + +```bash +pnpm --filter @cardy/mobile-client build:android # web build for Capacitor + cap sync +``` + +Then open `mobile-client/android` in Android Studio (or `gradlew assembleDebug` there) to build the APK. +The app registers `cardy://login?...` links (key QR codes) and asks for camera access when scanning. + `server-be` listens on `127.0.0.1` by default because `/admin/*` trusts `Remote-Email`. If the proxy runs on another machine, set `HOST` and `ADMIN_PROXY_SECRET`, and make the proxy add `X-Cardy-Proxy-Secret` on the `/api/admin` route. diff --git a/development specification-v2.md b/development specification-v2.md index 3a180f5..a54c441 100644 --- a/development specification-v2.md +++ b/development specification-v2.md @@ -1,6 +1,6 @@ # Cardy — техническое задание, версия 2 -Приложение для хранения скидочных карт: код (штрихкод или 2D-код) + тип кода + название + цвет + опциональное лого + опциональные картинки (фото/скриншоты). +Приложение для хранения скидочных карт: код (штрихкод или 2D-код) + тип кода + название + цвет + опциональный комментарий (многострочный текст) + опциональное лого + опциональные картинки (фото/скриншоты). Весь пользовательский интерфейс (серверный и клиентский) — на английском, только тёмная тема (коды на экране — чёрным по белому, чтобы сканировались). Вопросы деплоя (Dockerfile, docker-compose, конфиги прокси) в задание не входят. @@ -101,6 +101,7 @@ cards: color: "#E53935" # #RRGGBB code: "4600000000000" codeType: EAN13 + comment: "Card of Anna\nScan twice" # многострочный, до 2000 символов, '' если пусто logo: { id: 1d2e…, file: 1d2e….webp, mime: image/webp } # или null images: # порядок = порядок добавления - { id: 5f6a…, file: 5f6a….webp, mime: image/webp } @@ -149,7 +150,7 @@ cards: - **My keys** (все пользователи): список своих ключей; для выбранного ключа — QR-код с deep link, сам ключ текстом, кнопка копирования. - **Users** (admin, superadmin): CRUD пользователей текущей группы (email, роль; у суперадмина — ещё группа), по каждому пользователю — список ключей, генерация ключа (с опциональной меткой), удаление ключа, показ QR. - **Groups** (superadmin): CRUD групп (имя, уникально). -- **Cards** (admin, superadmin): список всех карт текущей группы, включая удалённые (фильтр по названию, переключатель «показывать удалённые»). Создание и редактирование: название, цвет, код, тип кода, предпросмотр кода, лого (загрузка/удаление), картинки (загрузка/удаление). Удаление помечает карту удалённой; удалённую карту можно восстановить или удалить окончательно (вместе с картинками). +- **Cards** (admin, superadmin): список всех карт текущей группы, включая удалённые (фильтр по названию, переключатель «показывать удалённые»). Создание и редактирование: название, цвет, код, тип кода, предпросмотр кода, комментарий, лого (загрузка/удаление), картинки (загрузка/удаление). Удаление помечает карту удалённой; удалённую карту можно восстановить или удалить окончательно (вместе с картинками). ### 3.7. API административного UI (публично `/api/admin`, на сервере `/admin`) @@ -180,8 +181,8 @@ cards: |---|---| | `GET /api/auth` | проверка ключа; возвращает email и группу | | `GET /api/cards` | все неудалённые карты группы, без пагинации | -| `POST /api/cards` | создать карту (multipart: поля `name`, `color`, `code`, `codeType`, опционально файл `logo`); возвращает карту с ID | -| `PUT /api/cards/:id` | изменить карту (multipart: те же поля, опционально файл `logo`, опционально `removeLogo=true`) | +| `POST /api/cards` | создать карту (multipart: поля `name`, `color`, `code`, `codeType`, опционально `comment` и файл `logo`); возвращает карту с ID | +| `PUT /api/cards/:id` | изменить карту (multipart: любые из тех же полей — не переданные не меняются, пустой `comment` очищает комментарий; опционально файл `logo`, опционально `removeLogo=true`) | | `DELETE /api/cards/:id` | пометить карту удалённой | | `GET /api/cards/:id/logo` | лого | | `GET /api/cards/:id/images/:imageId` | картинка | @@ -192,19 +193,20 @@ cards: ## 4. Клиентское мобильное приложение -React + Vite + TS; PWA и Android-приложение через Capacitor. PWA раздаётся на порту 10003 с базовым путём `/m` (`https://dev.aggtaa.com/m`). +React + Vite + TS; PWA и Android-приложение через Capacitor. PWA раздаётся на порту 10003 (`vite preview` собранной версии; `vite` — для разработки) с базовым путём `/m` (`https://dev.aggtaa.com/m`); прокси срезает `/m`, сервер восстанавливает его сам. Сборка для Capacitor (`pnpm build:android`) — с относительным базовым путём, в `dist-capacitor`. Service worker кэширует приложение целиком (включая `bwip-js` и wasm-модуль сканера) для работы офлайн. -- Хранит один ключ, адрес сервера и хэш PIN-кода (Capacitor Preferences / localStorage). Картинки — в Filesystem (Capacitor) или IndexedDB (PWA). +- Хранит один ключ, адрес API и хэш PIN-кода (SHA-256 с солью), список карт, даты использования и версии скачанных картинок — в Capacitor Preferences (в PWA это localStorage). Картинки — в IndexedDB (и в PWA, и в WebView Capacitor). - **Deep link `cardy://login?server=…&key=…`** зарегистрирован в Android-приложении (intent filter для схемы `cardy`, хост `login`). Открытие ссылки (например, QR из системной камеры) открывает экран нового входа с заполненными полями. -- **Экран нового входа**: поле адреса API (в PWA по умолчанию — `<текущий origin>/api`), сканирование QR-кода ключа камерой (из QR берутся и адрес, и ключ), ручной ввод ключа. Обязательна проверка ключа на сервере (`GET <адрес API>/auth`). Экран можно вызвать и при сохранённом ключе — старый ключ удаляется, хранится только последний. -- **Экран PIN-кода** (4 цифры): задаётся при смене ключа, сверяется при каждом открытии приложения. Защиты от перебора нет. Сменить PIN можно только через повторный вход. +- **Экран нового входа**: поле адреса API (в PWA по умолчанию — `<текущий origin>/api`), сканирование QR-кода ключа камерой (из QR берутся и адрес, и ключ), ручной ввод ключа. Обязательна проверка ключа на сервере (`GET <адрес API>/auth`). Экран можно вызвать и при сохранённом ключе — старый ключ удаляется, хранится только последний; вместе с ним удаляются все локальные данные (карты, картинки, PIN), после входа задаётся новый PIN и карты скачиваются автоматически. +- **Навигация** хранится в истории браузера: каждый переход между экранами — запись в истории (с хэшем вида `#/card/`), поэтому кнопка «назад» в тулбаре, кнопка «назад» браузера и системная кнопка Android работают одинаково; «вперёд» тоже работает. После перезагрузки PWA (и ввода PIN) открывается тот же экран. Ключ из ссылки входа в историю и адресную строку не попадает. +- **Экран PIN-кода** (4 цифры): задаётся при смене ключа, сверяется при каждом открытии приложения. Защиты от перебора нет. Сменить PIN можно только через повторный вход («Forgot PIN? Sign in again» на экране PIN; отмена входа возвращает к экрану PIN). «Открытием» считается и возврат в приложение после 30 секунд в фоне. - **Экран карт**: список локально хранящихся карт (цветные плашки с лого или, если лого нет, с аббревиатурой названия на цветном фоне), сортировка по давности использования, фильтр по подстроке названия (от 1 символа), кнопки «обновить» и «добавить». -- **«Обновить»**: скачивает список карт с сервера; при успехе заменяет локальный список (карты, пропавшие с сервера, удаляются локально вместе с картинками; даты использования сохраняются по ID карты). Затем для карт, у которых изменился `imagesVersion`, асинхронно скачиваются лого и картинки — не больше 5 запросов одновременно. -- **Экран карты**: название, код (отрисовка `bwip-js`), локальные картинки. На Android яркость поднимается до максимума. Открытие экрана считается использованием карты (сохраняются дата и время). Кнопки «редактировать» и «удалить» (с подтверждением). -- **Экран добавления и редактирования**: название, цвет (по умолчанию случайный из палитры цветов, контрастных с белым текстом), лого, картинки, код и тип кода — вручную или распознаванием с камеры или из загруженной картинки (Android — ML Kit, PWA — `zxing-wasm`). Лого и картинки перед отправкой пережимаются в WebP до 1000px по большей стороне, EXIF удаляется. -- После успешного добавления или редактирования локальная копия карты сразу обновляется ответом сервера. +- **«Обновить»**: скачивает список карт с сервера; при успехе заменяет локальный список (карты, пропавшие с сервера, удаляются локально вместе с картинками; даты использования сохраняются по ID карты). Затем для карт, у которых изменился `imagesVersion`, асинхронно скачиваются лого и картинки — не больше 5 запросов одновременно. Докачиваются и файлы, которых нет локально (например, после сбоя); версия картинок карты запоминается только когда скачаны все её файлы. +- **Экран карты**: название, код (отрисовка `bwip-js`), комментарий (с переносами строк), локальные картинки. На Android яркость окна поднимается до максимума (собственный плагин `ScreenBrightness` в `android/`) и возвращается к системной при уходе с экрана. Открытие экрана считается использованием карты (сохраняются дата и время). Кнопки «редактировать» и «удалить» (с подтверждением). +- **Экран добавления и редактирования**: название, комментарий (многострочное поле), цвет (по умолчанию случайный из палитры цветов, контрастных с белым текстом), лого, картинки, код и тип кода — вручную или распознаванием с камеры или из загруженной картинки (`barcode-detector` на `zxing-wasm` и в PWA, и в Android WebView; wasm-модуль входит в сборку). Лого и картинки можно снять камерой (кнопка «Camera», поле выбора файла с `capture`) или выбрать из галереи («Gallery», для фото — сразу несколько). Лого и картинки перед отправкой пережимаются в WebP до 1000px по большей стороне, EXIF удаляется. +- После успешного добавления или редактирования локальная копия карты сразу обновляется ответом сервера; загруженные картинки сохраняются локально без повторного скачивания. Если сохранение прервалось на середине (например, карта создана, а фото не загрузились), выполненные шаги сохраняются и «Save» повторяет только оставшиеся. - Приложение работает без интернета, кроме аутентификации, скачивания, добавления, редактирования и удаления карт и картинок. Эти функции без сети показывают сообщение об ошибке и прерываются (очереди отложенных операций нет). ## 5. Тесты -Unit- и интеграционные тесты сервера на Vitest: шифрование, генерация ключей, yaml-хранилище, права доступа, маршруты API (через `fastify.inject`). E2E-тестов нет. +Vitest. Сервер: шифрование, генерация ключей, yaml-хранилище, права доступа, маршруты API (через `fastify.inject`), интеграция с прокси. Клиент: пул загрузок, выбор карт для докачки, сортировка, PIN, распознаваемые форматы. E2E-тестов нет. diff --git a/mobile-client/.env.example b/mobile-client/.env.example new file mode 100644 index 0000000..5ac9001 --- /dev/null +++ b/mobile-client/.env.example @@ -0,0 +1,9 @@ +# Copy to .env if needed. + +# Public host names the dev/preview server answers to (comma-separated). +ALLOWED_HOSTS=dev.aggtaa.com +# Dev/preview server port. +PORT=10003 + +# Local development without the reverse proxy only: /api/* is forwarded here with /api stripped. +# BACKEND_URL=http://127.0.0.1:10002 diff --git a/mobile-client/android/.gitignore b/mobile-client/android/.gitignore new file mode 100644 index 0000000..48354a3 --- /dev/null +++ b/mobile-client/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/mobile-client/android/app/.gitignore b/mobile-client/android/app/.gitignore new file mode 100644 index 0000000..043df80 --- /dev/null +++ b/mobile-client/android/app/.gitignore @@ -0,0 +1,2 @@ +/build/* +!/build/.npmkeep diff --git a/mobile-client/android/app/build.gradle b/mobile-client/android/app/build.gradle new file mode 100644 index 0000000..10d5895 --- /dev/null +++ b/mobile-client/android/app/build.gradle @@ -0,0 +1,54 @@ +apply plugin: 'com.android.application' + +android { + namespace = "com.aggtaa.cardy" + compileSdk = rootProject.ext.compileSdkVersion + defaultConfig { + applicationId "com.aggtaa.cardy" + 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/mobile-client/android/app/capacitor.build.gradle b/mobile-client/android/app/capacitor.build.gradle new file mode 100644 index 0000000..bf02646 --- /dev/null +++ b/mobile-client/android/app/capacitor.build.gradle @@ -0,0 +1,20 @@ +// 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 { + implementation project(':capacitor-app') + implementation project(':capacitor-preferences') + +} + + +if (hasProperty('postBuildExtras')) { + postBuildExtras() +} diff --git a/mobile-client/android/app/proguard-rules.pro b/mobile-client/android/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/mobile-client/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/mobile-client/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/mobile-client/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java new file mode 100644 index 0000000..f2c2217 --- /dev/null +++ b/mobile-client/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/mobile-client/android/app/src/main/AndroidManifest.xml b/mobile-client/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..71776ed --- /dev/null +++ b/mobile-client/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile-client/android/app/src/main/java/com/aggtaa/cardy/MainActivity.java b/mobile-client/android/app/src/main/java/com/aggtaa/cardy/MainActivity.java new file mode 100644 index 0000000..1c20188 --- /dev/null +++ b/mobile-client/android/app/src/main/java/com/aggtaa/cardy/MainActivity.java @@ -0,0 +1,12 @@ +package com.aggtaa.cardy; + +import android.os.Bundle; +import com.getcapacitor.BridgeActivity; + +public class MainActivity extends BridgeActivity { + @Override + public void onCreate(Bundle savedInstanceState) { + registerPlugin(ScreenBrightnessPlugin.class); + super.onCreate(savedInstanceState); + } +} diff --git a/mobile-client/android/app/src/main/java/com/aggtaa/cardy/ScreenBrightnessPlugin.java b/mobile-client/android/app/src/main/java/com/aggtaa/cardy/ScreenBrightnessPlugin.java new file mode 100644 index 0000000..67c61c6 --- /dev/null +++ b/mobile-client/android/app/src/main/java/com/aggtaa/cardy/ScreenBrightnessPlugin.java @@ -0,0 +1,29 @@ +package com.aggtaa.cardy; + +import android.view.WindowManager; +import com.getcapacitor.Plugin; +import com.getcapacitor.PluginCall; +import com.getcapacitor.PluginMethod; +import com.getcapacitor.annotation.CapacitorPlugin; + +/** + * Sets the brightness of the app window only (no system setting is changed). + * brightness: 0..1, or -1 to return to the system brightness. + */ +@CapacitorPlugin(name = "ScreenBrightness") +public class ScreenBrightnessPlugin extends Plugin { + + @PluginMethod + public void set(PluginCall call) { + Float value = call.getFloat("brightness", -1f); + float brightness = value == null ? -1f : value; + getActivity().runOnUiThread(() -> { + WindowManager.LayoutParams params = getActivity().getWindow().getAttributes(); + params.screenBrightness = brightness < 0 + ? WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE + : Math.min(1f, brightness); + getActivity().getWindow().setAttributes(params); + call.resolve(); + }); + } +} diff --git a/mobile-client/android/app/src/main/res/drawable-land-hdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-land-hdpi/splash.png new file mode 100644 index 0000000..e31573b Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-land-hdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-land-mdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-land-mdpi/splash.png new file mode 100644 index 0000000..f7a6492 Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-land-mdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-land-xhdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-land-xhdpi/splash.png new file mode 100644 index 0000000..8077255 Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-land-xhdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-land-xxhdpi/splash.png new file mode 100644 index 0000000..14c6c8f Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-land-xxhdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-land-xxxhdpi/splash.png new file mode 100644 index 0000000..244ca25 Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-land-xxxhdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-port-hdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-port-hdpi/splash.png new file mode 100644 index 0000000..74faaa5 Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-port-hdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-port-mdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-port-mdpi/splash.png new file mode 100644 index 0000000..e944f4a Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-port-mdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-port-xhdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-port-xhdpi/splash.png new file mode 100644 index 0000000..564a82f Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-port-xhdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-port-xxhdpi/splash.png new file mode 100644 index 0000000..bfabe68 Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-port-xxhdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/mobile-client/android/app/src/main/res/drawable-port-xxxhdpi/splash.png new file mode 100644 index 0000000..6929071 Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable-port-xxxhdpi/splash.png differ diff --git a/mobile-client/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/mobile-client/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7bd21d --- /dev/null +++ b/mobile-client/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/mobile-client/android/app/src/main/res/drawable/ic_launcher_background.xml b/mobile-client/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/mobile-client/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile-client/android/app/src/main/res/drawable/splash.png b/mobile-client/android/app/src/main/res/drawable/splash.png new file mode 100644 index 0000000..f7a6492 Binary files /dev/null and b/mobile-client/android/app/src/main/res/drawable/splash.png differ diff --git a/mobile-client/android/app/src/main/res/layout/activity_main.xml b/mobile-client/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..b5ad138 --- /dev/null +++ b/mobile-client/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/mobile-client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/mobile-client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/mobile-client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/mobile-client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/mobile-client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/mobile-client/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/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..c023e50 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2127973 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..b441f37 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..72905b8 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..8ed0605 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..9502e47 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..4d1e077 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..df0f158 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..853db04 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..6cdf97c Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2960cbb Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8e3093a Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..46de6e2 Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d2ea9ab Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..a40d73e Binary files /dev/null and b/mobile-client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/mobile-client/android/app/src/main/res/values/ic_launcher_background.xml b/mobile-client/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/mobile-client/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/mobile-client/android/app/src/main/res/values/strings.xml b/mobile-client/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..0c68e9f --- /dev/null +++ b/mobile-client/android/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + Cardy + Cardy + com.aggtaa.cardy + com.aggtaa.cardy + diff --git a/mobile-client/android/app/src/main/res/values/styles.xml b/mobile-client/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..be874e5 --- /dev/null +++ b/mobile-client/android/app/src/main/res/values/styles.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/mobile-client/android/app/src/main/res/xml/file_paths.xml b/mobile-client/android/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000..bd0c4d8 --- /dev/null +++ b/mobile-client/android/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/mobile-client/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/mobile-client/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java new file mode 100644 index 0000000..0297327 --- /dev/null +++ b/mobile-client/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/mobile-client/android/build.gradle b/mobile-client/android/build.gradle new file mode 100644 index 0000000..f8f0e43 --- /dev/null +++ b/mobile-client/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/mobile-client/android/capacitor.settings.gradle b/mobile-client/android/capacitor.settings.gradle new file mode 100644 index 0000000..3ed849b --- /dev/null +++ b/mobile-client/android/capacitor.settings.gradle @@ -0,0 +1,9 @@ +// 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.5.2_@capacitor+core@8.5.2/node_modules/@capacitor/android/capacitor') + +include ':capacitor-app' +project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@8.1.1_@capacitor+core@8.5.2/node_modules/@capacitor/app/android') + +include ':capacitor-preferences' +project(':capacitor-preferences').projectDir = new File('../../node_modules/.pnpm/@capacitor+preferences@8.0.1_@capacitor+core@8.5.2/node_modules/@capacitor/preferences/android') diff --git a/mobile-client/android/gradle.properties b/mobile-client/android/gradle.properties new file mode 100644 index 0000000..2e87c52 --- /dev/null +++ b/mobile-client/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/mobile-client/android/gradle/wrapper/gradle-wrapper.jar b/mobile-client/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/mobile-client/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mobile-client/android/gradle/wrapper/gradle-wrapper.properties b/mobile-client/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..7705927 --- /dev/null +++ b/mobile-client/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/mobile-client/android/gradlew b/mobile-client/android/gradlew new file mode 100644 index 0000000..23d15a9 --- /dev/null +++ b/mobile-client/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/mobile-client/android/gradlew.bat b/mobile-client/android/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/mobile-client/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/mobile-client/android/settings.gradle b/mobile-client/android/settings.gradle new file mode 100644 index 0000000..3b4431d --- /dev/null +++ b/mobile-client/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/mobile-client/android/variables.gradle b/mobile-client/android/variables.gradle new file mode 100644 index 0000000..ee4ba41 --- /dev/null +++ b/mobile-client/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/mobile-client/capacitor.config.ts b/mobile-client/capacitor.config.ts new file mode 100644 index 0000000..3c5d7a7 --- /dev/null +++ b/mobile-client/capacitor.config.ts @@ -0,0 +1,13 @@ +import type { CapacitorConfig } from '@capacitor/cli'; + +const config: CapacitorConfig = { + appId: 'com.aggtaa.cardy', + appName: 'Cardy', + webDir: 'dist-capacitor', + backgroundColor: '#0f1115', + android: { + backgroundColor: '#0f1115', + }, +}; + +export default config; diff --git a/mobile-client/index.html b/mobile-client/index.html new file mode 100644 index 0000000..56721d6 --- /dev/null +++ b/mobile-client/index.html @@ -0,0 +1,15 @@ + + + + + + + + + Cardy + + +
+ + + diff --git a/mobile-client/package.json b/mobile-client/package.json new file mode 100644 index 0000000..a504083 --- /dev/null +++ b/mobile-client/package.json @@ -0,0 +1,38 @@ +{ + "name": "@cardy/mobile-client", + "version": "0.1.0", + "private": true, + "type": "module", + "scripts": { + "dev": "vite", + "build": "vite build", + "preview": "vite preview", + "start": "vite build && vite preview", + "build:android": "vite build --mode capacitor && cap sync android", + "typecheck": "tsc -p tsconfig.json", + "test": "vitest run" + }, + "dependencies": { + "@capacitor/android": "^8.5.2", + "@capacitor/app": "^8.1.1", + "@capacitor/core": "^8.5.2", + "@capacitor/preferences": "^8.0.1", + "@cardy/shared": "workspace:*", + "barcode-detector": "^3.2.2", + "bwip-js": "^4.11.4", + "idb-keyval": "^6.3.0", + "react": "^19.3.0", + "react-dom": "^19.3.0", + "zxing-wasm": "3.1.3" + }, + "devDependencies": { + "@capacitor/cli": "^8.5.2", + "@types/react": "^19.3.0", + "@types/react-dom": "^19.3.0", + "@vitejs/plugin-react": "^6.1.1", + "typescript": "^7.0.2", + "vite": "^8.3.1", + "vite-plugin-pwa": "^1.3.0", + "vitest": "^5.0.2" + } +} diff --git a/mobile-client/public/icon.svg b/mobile-client/public/icon.svg new file mode 100644 index 0000000..927cead --- /dev/null +++ b/mobile-client/public/icon.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/mobile-client/src/App.tsx b/mobile-client/src/App.tsx new file mode 100644 index 0000000..8f4aaab --- /dev/null +++ b/mobile-client/src/App.tsx @@ -0,0 +1,272 @@ +import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { parseLoginDeepLink, type Card } from '@cardy/shared'; +import { createApi } from './api.js'; +import { useNavigation, type LoginPrefill } from './navigation.js'; +import { onBackButton, onDeepLink, onResumeAfter } from './platform.js'; +import { cardImageIds, images, storage, type PinRecord, type Session, type UsageMap } from './storage.js'; +import { refreshCardList, syncImages } from './sync.js'; +import { CardScreen } from './screens/CardScreen.js'; +import { CardsScreen, type SyncState } from './screens/CardsScreen.js'; +import { EditScreen } from './screens/EditScreen.js'; +import { LoginScreen } from './screens/LoginScreen.js'; +import { PinEnterScreen, PinSetScreen } from './screens/PinScreens.js'; + +/** Lock again after the app was in the background this long. */ +const RELOCK_AFTER_MS = 30_000; + +interface Boot { + session: Session | null; + pin: PinRecord | null; + cards: Card[]; + usage: UsageMap; +} + +export function App() { + const [boot, setBoot] = useState(); + useEffect(() => { + void Promise.all([storage.getSession(), storage.getPin(), storage.getCards(), storage.getUsage()]).then( + ([session, pin, cards, usage]) => setBoot({ session, pin, cards, usage }), + ); + }, []); + if (!boot) return
; + return
; +} + +function Main({ boot }: { boot: Boot }) { + const [session, setSession] = useState(boot.session); + const [pin, setPin] = useState(boot.pin); + const [locked, setLocked] = useState(!!boot.pin); + const [cards, setCards] = useState(boot.cards); + const [usage, setUsage] = useState(boot.usage); + const [imageEpoch, setImageEpoch] = useState(0); + const [sync, setSync] = useState({ busy: false }); + const [pendingLogin, setPendingLogin] = useState(); + const refreshAfterPin = useRef(false); + + // After a reload the screen stack comes back from history (only when signed in). + const { nav, push, back, replaceTop, reset, openLockedLogin } = useNavigation( + boot.session ? [{ name: 'cards' }] : [{ name: 'login' }], + !!boot.session, + ); + const { stack, lockedLogin } = nav; + const route = stack[stack.length - 1]; + + const api = useMemo(() => (session ? createApi(session) : undefined), [session]); + + // ---- data ---- + + const refresh = useCallback(async () => { + if (!api) return; + setSync({ busy: true }); + let list: Card[]; + try { + list = await refreshCardList(api); + } catch (e) { + setSync({ busy: false, error: (e as Error).message }); + return; + } + setCards(list); + setUsage(await storage.getUsage()); + setSync({ busy: true, progress: { done: 0, total: 0 } }); + try { + const result = await syncImages( + api, + list, + () => setImageEpoch((e) => e + 1), + (done, total) => setSync({ busy: true, progress: { done, total } }), + ); + setSync( + result.failedFiles + ? { busy: false, error: `${result.failedFiles} image(s) could not be downloaded. Refresh again to retry.` } + : { busy: false, info: `${list.length} card${list.length === 1 ? '' : 's'} updated` }, + ); + } catch (e) { + setSync({ busy: false, error: (e as Error).message }); + } + }, [api]); + + /** Applies a card returned by the server after add/edit. */ + const saveCardLocally = useCallback(async (card: Card) => { + const list = await storage.getCards(); + const index = list.findIndex((c) => c.id === card.id); + if (index >= 0) list[index] = card; + else list.push(card); + await storage.setCards(list); + // Images uploaded from this device are stored already; record the version only if nothing is missing. + const stored = await images.storedKeys(); + if (cardImageIds(card).every((id) => stored.has(images.key(card.id, id)))) { + await images.prune(card.id, cardImageIds(card)); + const versions = await storage.getVersions(); + versions[card.id] = card.imagesVersion; + await storage.setVersions(versions); + } + setCards(list); + setImageEpoch((e) => e + 1); + }, []); + + const removeCardLocally = useCallback(async (id: string) => { + const [list, u, versions] = await Promise.all([storage.getCards(), storage.getUsage(), storage.getVersions()]); + const next = list.filter((c) => c.id !== id); + delete u[id]; + delete versions[id]; + await Promise.all([storage.setCards(next), storage.setUsage(u), storage.setVersions(versions), images.prune(id)]); + setCards(next); + setUsage({ ...u }); + }, []); + + // Showing the card screen (from the list, after creating or editing) counts as using the card. + const shownCardId = !locked && route?.name === 'card' ? route.id : undefined; + useEffect(() => { + if (!shownCardId) return; + void (async () => { + const u = await storage.getUsage(); + u[shownCardId] = new Date().toISOString(); + await storage.setUsage(u); + setUsage({ ...u }); + })(); + }, [shownCardId, stack.length]); + + // A card that no longer exists (deleted here or by a refresh, or an old history entry): leave its screen. + const missingCard = (route?.name === 'card' || route?.name === 'edit') && route.id && !cards.some((c) => c.id === route.id); + useEffect(() => { + if (missingCard && !back()) reset([{ name: 'cards' }]); + }, [missingCard, back, reset]); + + // ---- sign-in ---- + + const signedIn = useCallback( + async (next: Session) => { + await storage.clearAll(); + await storage.setSession(next); + setCards([]); + setUsage({}); + setPin(null); + setLocked(false); + setSync({ busy: false }); + setSession(next); + reset([{ name: 'cards' }]); + refreshAfterPin.current = true; + }, + [reset], + ); + + const pinCreated = useCallback(async (record: PinRecord) => { + await storage.setPin(record); + setPin(record); + }, []); + + useEffect(() => { + if (pin && !locked && refreshAfterPin.current) { + refreshAfterPin.current = false; + void refresh(); + } + }, [pin, locked, refresh]); + + // ---- platform events ---- + + useEffect( + () => + onDeepLink((url) => { + const parsed = parseLoginDeepLink(url); + if (parsed) setPendingLogin(parsed); + }), + [], + ); + + // A login link opens the login screen (it replaces the stored key only after a successful check). + useEffect(() => { + if (!pendingLogin) return; + setPendingLogin(undefined); + if (!session) reset([{ name: 'login', prefill: pendingLogin }]); + else if (locked) openLockedLogin(pendingLogin); + else push({ name: 'login', prefill: pendingLogin }); + }, [pendingLogin, session, locked, push, reset, openLockedLogin]); + + useEffect(() => onResumeAfter(RELOCK_AFTER_MS, () => pin && setLocked(true)), [pin]); + + // Android back button = history back; on the lock screen and at the root it exits the app. + const lockedRef = useRef({ locked, lockedLogin }); + lockedRef.current = { locked, lockedLogin }; + useEffect( + () => + onBackButton(() => { + const { locked: isLocked, lockedLogin: overLock } = lockedRef.current; + if (isLocked && !overLock) return false; + return back(); + }), + [back], + ); + + const goBack = useCallback(() => void back(), [back]); + + // ---- screens ---- + + if (!session || !api) { + const prefill = route?.name === 'login' ? route.prefill : undefined; + return ; + } + if (!pin) return ; + if (locked) { + if (lockedLogin) { + const prefill = lockedLogin.prefill; + return ; + } + return setLocked(false)} onForgot={() => openLockedLogin()} />; + } + + switch (route?.name) { + case 'login': + return ; + case 'card': { + const card = cards.find((c) => c.id === route.id); + if (!card) return null; + return ( + push({ name: 'edit', id: card.id })} + onDelete={async () => { + try { + await api.deleteCard(card.id); + } catch (e) { + // Already deleted elsewhere: drop it locally as well. + if ((e as { status?: number }).status !== 404) throw e; + } + await removeCardLocally(card.id); + }} + /> + ); + } + case 'edit': { + const card = route.id ? cards.find((c) => c.id === route.id) : undefined; + if (route.id && !card) return null; + return ( + (route.id ? goBack() : replaceTop({ name: 'card', id: saved.id }))} + onMissing={(id) => void removeCardLocally(id)} + /> + ); + } + default: + return ( + setSync({ busy: false })} + onRefresh={refresh} + onOpen={(id) => push({ name: 'card', id })} + onAdd={() => push({ name: 'edit' })} + onChangeKey={() => push({ name: 'login' })} + /> + ); + } +} diff --git a/mobile-client/src/PinPad.tsx b/mobile-client/src/PinPad.tsx new file mode 100644 index 0000000..446eea6 --- /dev/null +++ b/mobile-client/src/PinPad.tsx @@ -0,0 +1,86 @@ +import { useEffect, useRef, useState, type ReactNode } from 'react'; +import { PIN_LENGTH } from './pin.js'; +import { Icon } from './ui.js'; + +/** + * Four-dot PIN entry with an on-screen keypad (a hardware keyboard works too). + * Changing `attempt` clears the input (and shakes when `error` is set). + */ +export function PinPad({ + title, + subtitle, + error, + attempt, + busy, + onComplete, + footer, +}: { + title: string; + subtitle?: string; + error?: string; + attempt: number; + busy?: boolean; + onComplete: (pin: string) => void; + footer?: ReactNode; +}) { + const [pin, setPin] = useState(''); + const [shake, setShake] = useState(false); + const onCompleteRef = useRef(onComplete); + onCompleteRef.current = onComplete; + + useEffect(() => { + setPin(''); + if (!error) return; + setShake(true); + const t = setTimeout(() => setShake(false), 400); + return () => clearTimeout(t); + }, [attempt, error]); + + useEffect(() => { + if (pin.length !== PIN_LENGTH) return; + const t = setTimeout(() => onCompleteRef.current(pin), 120); + return () => clearTimeout(t); + }, [pin]); + + const press = (digit: string) => !busy && setPin((p) => (p.length >= PIN_LENGTH ? p : p + digit)); + const back = () => !busy && setPin((p) => p.slice(0, -1)); + + useEffect(() => { + const onKey = (e: KeyboardEvent) => { + if (/^\d$/.test(e.key)) press(e.key); + else if (e.key === 'Backspace') back(); + }; + window.addEventListener('keydown', onKey); + return () => window.removeEventListener('keydown', onKey); + }); + + return ( +
+
+

{title}

+ {subtitle &&

{subtitle}

} +
+
+ {Array.from({ length: PIN_LENGTH }, (_, i) => ( + + ))} +
+

+ {error} +

+
+ {['1', '2', '3', '4', '5', '6', '7', '8', '9'].map((d) => ( + + ))} + + + +
+
{footer}
+
+ ); +} diff --git a/mobile-client/src/ScannerView.tsx b/mobile-client/src/ScannerView.tsx new file mode 100644 index 0000000..113caa5 --- /dev/null +++ b/mobile-client/src/ScannerView.tsx @@ -0,0 +1,86 @@ +import { useEffect, useRef, useState } from 'react'; +import type { ScanResult } from './scanner.js'; +import { Icon } from './ui.js'; + +type Formats = 'card' | 'qr'; + +/** Fullscreen camera view that resolves with the first detected code. */ +export function ScannerView({ formats, hint, onResult, onClose }: { formats: Formats; hint: string; onResult: (result: ScanResult) => void; onClose: () => void }) { + const videoRef = useRef(null); + const [error, setError] = useState(); + const onResultRef = useRef(onResult); + onResultRef.current = onResult; + + useEffect(() => { + let stopped = false; + let stream: MediaStream | undefined; + let timer: ReturnType | undefined; + + (async () => { + try { + const { createDetector, CARD_FORMATS, QR_FORMATS } = await import('./scanner.js'); + const detect = createDetector(formats === 'qr' ? QR_FORMATS : CARD_FORMATS); + stream = await navigator.mediaDevices.getUserMedia({ + video: { facingMode: { ideal: 'environment' }, width: { ideal: 1280 }, height: { ideal: 720 } }, + audio: false, + }); + if (stopped) return; + const video = videoRef.current!; + video.srcObject = stream; + await video.play(); + + const tick = async () => { + if (stopped) return; + try { + if (video.readyState >= 2) { + const found = await detect(video); + if (found && !stopped) { + stopped = true; + onResultRef.current(found); + return; + } + } + } catch { + // a frame that could not be decoded + } + timer = setTimeout(tick, 200); + }; + void tick(); + } catch (e) { + const name = (e as Error).name; + setError( + name === 'NotAllowedError' + ? 'Camera access was denied. Allow it in the app or browser settings.' + : name === 'NotFoundError' + ? 'No camera found.' + : `Cannot start the camera: ${(e as Error).message}`, + ); + } + })(); + + return () => { + stopped = true; + if (timer) clearTimeout(timer); + stream?.getTracks().forEach((t) => t.stop()); + }; + }, [formats]); + + return ( +
+