Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions krillnotes-desktop/android-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,20 @@ case "${1:-}" in
;;
--emulator)
if ! adb devices | grep -q "^emulator-"; then
echo "❌ No emulator found. Start one from Android Studio first." >&2
exit 1
AVD=$("$ANDROID_HOME/emulator/emulator" -list-avds 2>/dev/null | head -1)
if [ -z "$AVD" ]; then
echo "❌ No AVDs found. Create one in Android Studio first." >&2
exit 1
fi
echo "📱 Starting emulator: $AVD"
"$ANDROID_HOME/emulator/emulator" -avd "$AVD" &
echo "⏳ Waiting for emulator to boot..."
adb wait-for-device
while [ "$(adb shell getprop sys.boot_completed 2>/dev/null)" != "1" ]; do sleep 1; done
echo "✅ Emulator ready"
else
echo "📱 Targeting running emulator"
fi
echo "📱 Targeting emulator"
;;
*)
echo "📱 Auto-detecting target (use --device or --emulator to override)"
Expand Down
4 changes: 2 additions & 2 deletions krillnotes-desktop/src-tauri/gen/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ val tauriProperties = Properties().apply {

android {
compileSdk = 36
namespace = "com.twopisoftware.krillnotes"
namespace = "io.opswarm.krillnotes"
defaultConfig {
manifestPlaceholders["usesCleartextTraffic"] = "false"
applicationId = "com.twopisoftware.krillnotes"
applicationId = "io.opswarm.krillnotes"
minSdk = 24
targetSdk = 36
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.twopisoftware.krillnotes
package io.opswarm.krillnotes

import android.os.Bundle
import androidx.core.view.ViewCompat
Expand Down
4 changes: 2 additions & 2 deletions krillnotes-desktop/src-tauri/gen/apple/project.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: krillnotes-desktop
options:
bundleIdPrefix: com.twopisoftware.krillnotes
bundleIdPrefix: io.opswarm.krillnotes
deploymentTarget:
iOS: 14.0
fileGroups: [../../src]
Expand All @@ -11,7 +11,7 @@ settingGroups:
app:
base:
PRODUCT_NAME: Krillnotes
PRODUCT_BUNDLE_IDENTIFIER: com.twopisoftware.krillnotes
PRODUCT_BUNDLE_IDENTIFIER: io.opswarm.krillnotes
targetTemplates:
app:
type: application
Expand Down
4 changes: 1 addition & 3 deletions krillnotes-desktop/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,7 @@ pub fn run() {
// Use the standard app-private files directory.
std::env::var("HOME").ok().map(std::path::PathBuf::from)
})
.unwrap_or_else(|| {
std::path::PathBuf::from("/data/data/com.twopisoftware.krillnotes/files")
});
.unwrap_or_else(|| std::path::PathBuf::from("/data/data/io.opswarm.krillnotes/files"));
settings::set_mobile_data_dir(data_dir);
}

Expand Down
2 changes: 1 addition & 1 deletion krillnotes-desktop/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://schema.tauri.app/config/2",
"productName": "Krillnotes",
"version": "1.1.1",
"identifier": "com.twopisoftware.krillnotes",
"identifier": "io.opswarm.krillnotes",
"build": {
"beforeDevCommand": "npm run dev",
"devUrl": "http://localhost:1420",
Expand Down
Loading