diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index a55e7a1..6e6eec1 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector (SFConflict ispatel 2025-03-03-12-04-56).xml b/.idea/deploymentTargetSelector (SFConflict ispatel 2025-03-03-12-04-56).xml new file mode 100644 index 0000000..32eae5e --- /dev/null +++ b/.idea/deploymentTargetSelector (SFConflict ispatel 2025-03-03-12-04-56).xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index cba12a7..40eaa1f 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@ diff --git a/.idea/workspace (SFConflict ispatel 2025-03-03-12-04-56).xml b/.idea/workspace (SFConflict ispatel 2025-03-03-12-04-56).xml new file mode 100644 index 0000000..5ee3411 --- /dev/null +++ b/.idea/workspace (SFConflict ispatel 2025-03-03-12-04-56).xml @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 0 +} + + + + + + + + + + + + + + + + + 1741017174616 + + + + + + + \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5fba8fa..4e02246 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.8.0" +agp = "8.8.1" kotlin = "2.0.0" coreKtx = "1.13.1" junit = "4.13.2" diff --git a/mobile/build.gradle (SFConflict ispatel 2025-03-03-12-04-55).kts b/mobile/build.gradle (SFConflict ispatel 2025-03-03-12-04-55).kts new file mode 100644 index 0000000..55baadc --- /dev/null +++ b/mobile/build.gradle (SFConflict ispatel 2025-03-03-12-04-55).kts @@ -0,0 +1,73 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.birdsounds.identify" + compileSdk = 34 + + defaultConfig { + applicationId = "com.birdsounds.identify" + minSdk = 34 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.appcompat) + implementation(libs.play.services.wearable) + implementation(libs.material) + implementation(libs.androidx.activity) + implementation(libs.androidx.constraintlayout) + implementation(libs.androidx.work.runtime.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation("uk.me.berndporr:iirj:1.7") + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.litert) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + implementation("org.tensorflow:tensorflow-lite-gpu:2.12.0") + implementation("org.tensorflow:tensorflow-lite-support:0.4.4") + implementation("org.tensorflow:tensorflow-lite-task-vision:0.4.4") + implementation("org.tensorflow:tensorflow-lite-task-text:0.4.4") + implementation("com.google.android.gms:play-services-tflite-gpu:16.2.0") + implementation("com.google.android.gms:play-services-tflite-java:16.0.0-beta01") + wearApp(project(":wear")) +} \ No newline at end of file diff --git a/mobile/src/main/ic_launcher-playstore.png b/mobile/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..ff13f11 Binary files /dev/null and b/mobile/src/main/ic_launcher-playstore.png differ diff --git a/mobile/src/main/java/com/birdsounds/identify/Downloader.java b/mobile/src/main/java/com/birdsounds/identify/Downloader.java index 754e12a..151808d 100644 --- a/mobile/src/main/java/com/birdsounds/identify/Downloader.java +++ b/mobile/src/main/java/com/birdsounds/identify/Downloader.java @@ -63,6 +63,8 @@ public class Downloader { public static void downloadModels(final Activity activity) { File modelFile = new File(activity.getDir("filesdir", Context.MODE_PRIVATE) + "/" + modelFILE); Log.d("Heyy","Model file checking"); + modelFile.delete(); + if (!modelFile.exists()) { Log.d("whoBIRD", "model file does not exist"); Thread thread = new Thread(() -> { diff --git a/mobile/src/main/res/drawable/ic_launcher_background.xml b/mobile/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..ca3826a 100644 --- a/mobile/src/main/res/drawable/ic_launcher_background.xml +++ b/mobile/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/src/main/res/mipmap-anydpi/ic_launcher.xml b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 56% rename from mobile/src/main/res/mipmap-anydpi/ic_launcher.xml rename to mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..c4a603d 100644 --- a/mobile/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/mobile/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 56% rename from mobile/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..c4a603d 100644 --- a/mobile/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp b/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..35aefa2 100644 Binary files a/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp and b/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..6477769 Binary files /dev/null and b/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d..c582120 100644 Binary files a/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp b/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..7b824f3 100644 Binary files a/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp and b/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..129b544 Binary files /dev/null and b/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611d..1ab6cf8 100644 Binary files a/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..0f1befd 100644 Binary files a/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..d4043e0 Binary files /dev/null and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a695..cf247ce 100644 Binary files a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..9753bd7 100644 Binary files a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..7ec4529 Binary files /dev/null and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f50..2d2c6d3 100644 Binary files a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..5ae8919 100644 Binary files a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..5068c90 Binary files /dev/null and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae3..0a0a9ee 100644 Binary files a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/wear/src/main/ic_launcher-playstore.png b/wear/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..ff13f11 Binary files /dev/null and b/wear/src/main/ic_launcher-playstore.png differ diff --git a/wear/src/main/res/drawable/ic_launcher_background.xml b/wear/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..ca3826a --- /dev/null +++ b/wear/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..c4a603d --- /dev/null +++ b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..c4a603d --- /dev/null +++ b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher.webp b/wear/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..35aefa2 100644 Binary files a/wear/src/main/res/mipmap-hdpi/ic_launcher.webp and b/wear/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..6477769 Binary files /dev/null and b/wear/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..c582120 Binary files /dev/null and b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher.webp b/wear/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..5cff6b7 100644 Binary files a/wear/src/main/res/mipmap-mdpi/ic_launcher.webp and b/wear/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..129b544 Binary files /dev/null and b/wear/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1ab6cf8 Binary files /dev/null and b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp b/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..79d2da6 100644 Binary files a/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..d4043e0 Binary files /dev/null and b/wear/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..cf247ce Binary files /dev/null and b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..9753bd7 100644 Binary files a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..7ec4529 Binary files /dev/null and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..2d2c6d3 Binary files /dev/null and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..5ae8919 100644 Binary files a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..5068c90 Binary files /dev/null and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..0a0a9ee Binary files /dev/null and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ