diff options
| -rw-r--r-- | android/app/build.gradle | 26 | ||||
| -rw-r--r-- | android/app/src/main/java/dev/ediblemonad/owynlauncher/MainActivity.kt (renamed from android/app/src/main/java/com/owynlauncherrewrite/MainActivity.kt) | 2 | ||||
| -rw-r--r-- | android/app/src/main/java/dev/ediblemonad/owynlauncher/MainApplication.kt (renamed from android/app/src/main/java/com/owynlauncherrewrite/MainApplication.kt) | 2 | ||||
| -rw-r--r-- | android/app/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | android/build.gradle | 2 | ||||
| -rw-r--r-- | app.json | 2 | ||||
| -rwxr-xr-x | bun.lockb | bin | 399052 -> 399052 bytes | |||
| -rw-r--r-- | flake.nix | 14 | ||||
| -rw-r--r-- | justfile | 32 |
9 files changed, 62 insertions, 20 deletions
diff --git a/android/app/build.gradle b/android/app/build.gradle index 57743c6..7ade26d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -71,14 +71,18 @@ def enableProguardInReleaseBuilds = true */ def jscFlavor = 'org.webkit:android-jsc:+' +// Local properties +def Properties localProperties = new Properties() +localProperties.load(project.rootProject.file("local.properties").newDataInputStream()) + android { ndkVersion rootProject.ext.ndkVersion buildToolsVersion rootProject.ext.buildToolsVersion compileSdk rootProject.ext.compileSdkVersion - namespace "com.owynlauncherrewrite" + namespace "dev.ediblemonad.owynlauncher" defaultConfig { - applicationId "com.owynlauncherrewrite" + applicationId "dev.ediblemonad.owynlauncher" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 @@ -91,7 +95,14 @@ android { keyAlias 'androiddebugkey' keyPassword 'android' } + release { + storeFile file("release.keystore") + storePassword localProperties.getProperty('OWYN_STORE_PASS') + keyAlias 'releasekey' + keyPassword localProperties.getProperty('OWYN_KEY_PASS') + } } + buildTypes { debug { signingConfig signingConfigs.debug @@ -99,11 +110,20 @@ android { release { // Caution! In production, you need to generate your own keystore file. // see https://reactnative.dev/docs/signed-apk-android. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } + + splits { + abi { + reset() + enable true + universalApk true + include "armeabi-v7a", "arm64-v8a", "x86", "x86_64" + } + } } dependencies { diff --git a/android/app/src/main/java/com/owynlauncherrewrite/MainActivity.kt b/android/app/src/main/java/dev/ediblemonad/owynlauncher/MainActivity.kt index c784bb9..c72d8ee 100644 --- a/android/app/src/main/java/com/owynlauncherrewrite/MainActivity.kt +++ b/android/app/src/main/java/dev/ediblemonad/owynlauncher/MainActivity.kt @@ -1,4 +1,4 @@ -package com.owynlauncherrewrite +package dev.ediblemonad.owynlauncher import com.facebook.react.ReactActivity import com.facebook.react.ReactActivityDelegate diff --git a/android/app/src/main/java/com/owynlauncherrewrite/MainApplication.kt b/android/app/src/main/java/dev/ediblemonad/owynlauncher/MainApplication.kt index 4583c39..34763cb 100644 --- a/android/app/src/main/java/com/owynlauncherrewrite/MainApplication.kt +++ b/android/app/src/main/java/dev/ediblemonad/owynlauncher/MainApplication.kt @@ -1,4 +1,4 @@ -package com.owynlauncherrewrite +package dev.ediblemonad.owynlauncher import android.app.Application import com.facebook.react.PackageList diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index bd75c71..4890b05 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ <resources> - <string name="app_name">OwynLauncherRewrite</string> + <string name="app_name">Owyn Launcher</string> </resources> diff --git a/android/build.gradle b/android/build.gradle index f536a79..ece1ef8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { buildToolsVersion = "34.0.0" - minSdkVersion = 23 + minSdkVersion = 29 compileSdkVersion = 34 targetSdkVersion = 34 ndkVersion = "26.1.10909125" @@ -1,4 +1,4 @@ { "name": "OwynLauncherRewrite", - "displayName": "OwynLauncherRewrite" + "displayName": "Owyn Launcher" } Binary files differ@@ -27,19 +27,19 @@ cmakeVersions = [ "3.22.1" ]; }; in pkgs.mkShell rec { - buildInputs = with pkgs; [ - bun - nodePackages."@tailwindcss/language-server" - nodePackages.typescript - nodePackages.typescript-language-server + buildInputs = [ + pkgs.bun + pkgs.nodePackages."@tailwindcss/language-server" + pkgs.nodePackages.typescript + pkgs.nodePackages.typescript-language-server androidComposition.androidsdk androidComposition.platform-tools jdk - just + pkgs.just - libxml2 + pkgs.libxml2 ]; nativeBuildInputs = with pkgs; [ clang ]; @@ -1,11 +1,33 @@ +set positional-arguments + +dev: + bun start + +build: + bunx react-native build-android --mode=release --tasks 'assembleRelease'; + +clean: + cd android && ./gradlew clean; + # bunx react-native clean; + +apks: + @echo "=== Generated APKs ===" + ls -la android/app/build/outputs/apk/* 2>/dev/null || true + +install: + #!/usr/bin/env bash + apk="$(ls android/app/build/outputs/apk/**/*.apk | fzf)"; + if ! [ -z "$apk" ]; then + adb install "$apk" && just open; + fi; + +open: + adb shell am start -a android.intent.action.MAIN -n dev.ediblemonad.owynlauncher/.MainActivity; android-setup: sdkmanager "$MY_ANDROID_AVD_PKG" && \ - avdmanager create avd -n channels -k "$MY_ANDROID_AVD_PKG" --device 26 --force; + avdmanager create avd -n owyn -k "$MY_ANDROID_AVD_PKG" --device 26 --force; emu: - emulator -gpu swiftshader_indirect @channels - -build: - bun run react-native build-android --mode release + emulator -gpu swiftshader_indirect @owyn |