Athena: Rewrite

Change-Id: Ifdffd0690a1895ce6ce40c2139643b854ab36e41

Author: SebaUbuntu

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "app/src/main/cpp/cpu/cpuinfo"]
-	path = app/src/main/cpp/cpu/cpuinfo
+[submodule "cpuinfo"]
+	path = module-cpu/src/main/cpp/cpuinfo
 	url = https://github.com/pytorch/cpuinfo

app/build.gradle.kts

@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
 }
 
@@ -21,15 +22,6 @@ android {
         targetSdk = libs.versions.android.targetSdk.get().toInt()
         versionCode = 13
         versionName = "1.1.0"
-
-        externalNativeBuild {
-            cmake {
-                arguments(
-                    "-DANDROID_STL=c++_shared",
-                    "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
-                )
-            }
-        }
     }
 
     buildTypes {
@@ -64,25 +56,53 @@ android {
         }
     }
 
-    externalNativeBuild {
-        cmake {
-            path = file("src/main/cpp/CMakeLists.txt")
-            version = libs.versions.cmake.get()
-        }
+    buildFeatures {
+        compose = true
     }
 }
 
 dependencies {
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.biometric)
-    implementation(libs.androidx.constraintlayout)
+    implementation(project(":core"))
+    implementation(project(":module-audio"))
+    implementation(project(":module-biometrics"))
+    implementation(project(":module-bluetooth"))
+    implementation(project(":module-build"))
+    implementation(project(":module-camera"))
+    implementation(project(":module-cpu"))
+    implementation(project(":module-device"))
+    implementation(project(":module-display"))
+    implementation(project(":module-drm"))
+    implementation(project(":module-gnss"))
+    implementation(project(":module-gpu"))
+    implementation(project(":module-health"))
+    implementation(project(":module-input"))
+    implementation(project(":module-media"))
+    implementation(project(":module-nfc"))
+    implementation(project(":module-ril"))
+    implementation(project(":module-security"))
+    implementation(project(":module-sensors"))
+    implementation(project(":module-services"))
+    implementation(project(":module-storage"))
+    implementation(project(":module-systemproperties"))
+    implementation(project(":module-thermal"))
+    implementation(project(":module-treble"))
+    implementation(project(":module-user"))
+    implementation(project(":module-uwb"))
+    implementation(project(":module-wifi"))
+
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.material3)
+    //implementation(libs.androidx.compose.material3.adaptive.navigation3)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.core.uwb)
+    implementation(libs.androidx.datastore)
+    implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.lifecycle.livedata.ktx)
-    implementation(libs.androidx.navigation.fragment.ktx)
-    implementation(libs.androidx.navigation.ui.ktx)
-    implementation(libs.androidx.security.state)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.ui)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.material)
-    implementation(libs.okhttp)
 }

app/proguard-rules.pro

@@ -24,11 +24,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-
-# JNI
--keep public class dev.sebaubuntu.athena.models.cpu.* {
-    public *;
-}
--keep public class dev.sebaubuntu.athena.utils.VkUtils$VkPhysicalDevices {
-    public *;
-}

app/src/main/AndroidManifest.xml

@@ -6,36 +6,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.nfc"
-        android:required="false" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission
-        android:name="android.permission.BLUETOOTH"
-        android:maxSdkVersion="30" />
-    <uses-permission
-        android:name="android.permission.BLUETOOTH_ADMIN"
-        android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.BODY_SENSORS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"
-        tools:ignore="HighSamplingRate" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission
-        android:name="android.permission.USE_FINGERPRINT"
-        android:maxSdkVersion="28" />
-    <uses-permission android:name="android.permission.UWB_RANGING" />
-
     <application
         android:name=".AthenaApplication"
         android:enableOnBackInvokedCallback="true"
@@ -44,14 +14,18 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Athena"
         tools:targetApi="tiramisu">
+
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
     </application>
+
 </manifest>