Refactor stuff

ai/.gitignore

@@ -0,0 +1 @@
+/build

ai/build.gradle.kts

@@ -0,0 +1,62 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "nethical.questphone.ai"
+    compileSdk = 36
+
+    defaultConfig {
+        minSdk = 26
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    splits {
+        abi {
+            isEnable = true
+            reset()
+            include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+            isUniversalApk = true
+        }
+    }
+
+    sourceSets["main"].jniLibs.srcDirs("src/main/jniLibs")
+
+    externalNativeBuild {
+        cmake {
+            path = file("src/main/cpp/CMakeLists.txt")
+        }
+    }
+
+    ndkVersion = "29.0.13599879 rc2"
+}
+
+dependencies {
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

ai/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

ai/src/androidTest/java/nethical/questphone/ai/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package nethical.questphone.ai
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("nethical.questphone.ai.test", appContext.packageName)
+    }
+}

ai/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

app/src/main/cpp/sentencepiece_jni.cpp → ai/src/main/cpp/sentencepiece_jni.cpp

@@ -5,15 +5,15 @@
 sentencepiece::SentencePieceProcessor sp;
 
 extern "C" JNIEXPORT jint JNICALL
-Java_neth_iecal_questphone_utils_ai_SentencePieceProcessor_load(JNIEnv *env, jobject, jstring modelPath) {
+Java_nethical_questphone_ai_SentencePieceProcessor_load(JNIEnv *env, jobject, jstring modelPath) {
     const char *path = env->GetStringUTFChars(modelPath, nullptr);
     auto status = sp.Load(path);
     env->ReleaseStringUTFChars(modelPath, path);
     return status.ok() ? 0 : -1;
 }
 
 extern "C" JNIEXPORT jintArray JNICALL
-Java_neth_iecal_questphone_utils_ai_SentencePieceProcessor_encodeAsIds(JNIEnv *env, jobject, jstring input) {
+Java_nethical_questphone_ai_SentencePieceProcessor_encodeAsIds(JNIEnv *env, jobject, jstring input) {
     const char *text = env->GetStringUTFChars(input, nullptr);
     std::vector<int> ids;
     sp.Encode(text, &ids);

app/src/main/java/neth/iecal/questphone/utils/ai/OneShotTools.kt → ai/src/main/java/nethical/questphone/ai/OneShotTools.kt

@@ -1,4 +1,4 @@
-package neth.iecal.questphone.utils.ai
+package nethical.questphone.ai
 
 import android.content.Context
 import android.graphics.Bitmap

ai/src/test/java/nethical/questphone/ai/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package nethical.questphone.ai
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

app/build.gradle.kts

@@ -1,21 +1,14 @@
 
-import java.io.FileInputStream
-import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 
     kotlin("plugin.serialization") version "2.0.20"
+    id("com.google.devtools.ksp")
+    id("com.google.dagger.hilt.android")
 
-    id("com.google.devtools.ksp") version "2.1.21-2.0.1"
-}
-
-val localProperties = Properties()
-val localPropertiesFile = rootProject.file("local.properties")
-if (localPropertiesFile.exists()) {
-    localProperties.load(FileInputStream(localPropertiesFile))
 }
 
 android {
@@ -30,9 +23,6 @@ android {
         versionName = "1.6"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        buildConfigField("String", "SUPABASE_URL", "\"${localProperties["SUPABASE_URL"]}\"")
-        buildConfigField("String", "SUPABASE_API_KEY", "\"${localProperties["SUPABASE_API_KEY"]}\"")
-        buildConfigField("String", "API_URL", "\"${localProperties["API_URL"]}\"")
     }
 
     flavorDimensions += "distribution"
@@ -50,14 +40,6 @@ android {
         }
 
     }
-    splits {
-        abi {
-            isEnable = true
-            reset()
-            include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-            isUniversalApk = true
-        }
-    }
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -77,16 +59,8 @@ android {
     buildFeatures {
         compose = true
         buildConfig = true
-    }
-    sourceSets["main"].jniLibs.srcDirs("src/main/jniLibs")
 
-    externalNativeBuild {
-        cmake {
-            path = file("src/main/cpp/CMakeLists.txt")
-        }
     }
-
-    ndkVersion = "29.0.13599879 rc2"
 }
 
 dependencies {
@@ -107,7 +81,7 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
 
     implementation (libs.kotlinx.serialization.json)
 
@@ -140,7 +114,15 @@ dependencies {
     implementation(libs.androidx.room.runtime)
     implementation(libs.androidx.room.ktx)
 
+    implementation(libs.hilt.android)
+    implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.hilt.android.compiler)
+
     ksp(libs.androidx.room.compiler)
     implementation (libs.androidx.ui.text.google.fonts)
 
+    implementation(project(":data"))
+    implementation(project(":core"))
+    implementation(project(":backend"))
+    implementation(project(":ai"))
 }

app/src/main/AndroidManifest.xml

@@ -104,26 +104,18 @@
 
                 <category android:name="android.intent.category.HEALTH_PERMISSIONS" />
             </intent-filter>
-        </activity-alias> <!-- <service -->
-        <!-- android:name=".services.AccessibilityService" -->
-        <!-- android:exported="true" -->
-        <!-- android:label="App Blocker" -->
-        <!-- android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"> -->
-        <!-- <intent-filter> -->
-        <!-- <action android:name="android.accessibilityservice.AccessibilityService" /> -->
-        <!-- </intent-filter> -->
-        <!-- <meta-data -->
-        <!-- android:name="android.accessibilityservice" -->
-        <!-- android:resource="@xml/app_blocker_service_config" /> -->
-        <!-- </service> -->
+        </activity-alias>
+
+
+
         <service
-            android:name=".services.AppBlockerService"
+            android:name="neth.iecal.questphone.core.services.AppBlockerService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
 
         <service
-            android:name=".services.LockScreenService"
+            android:name="neth.iecal.questphone.core.services.LockScreenService"
             android:exported="false"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
@@ -136,12 +128,12 @@
         </service>
 
         <receiver
-            android:name=".utils.reminder.ReminderBroadcastReceiver"
+            android:name=".core.utils.reminder.ReminderBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
 
         <receiver
-            android:name=".utils.reminder.BootReceiver"
+            android:name=".core.utils.reminder.BootReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -150,6 +142,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".core.utils.receiver.NewDayReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.DATE_CHANGED" />
+                <action android:name="android.intent.action.TIME_SET" />
+                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>