Migration to Jetpack Compose

build.gradle

@@ -1,18 +1,20 @@
 ext.oshCoreVersion = '2.0.0-beta'
 ext.compileSdkVersion = 34
 ext.minSdkVersion = 33
-ext.targetSdkVersion = 30
+ext.targetSdkVersion = 34
 ext.buildToolsVersion = "34.0.0"
 version = '4.0.2'
 
 buildscript {
+    ext.kotlin_version = '1.9.22'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
+android.nonTransitiveRClass=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sensorhub-android-app/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.sensorhub.android"
     android:hardwareAccelerated="true">
 
     <uses-feature android:name="android.hardware.location" />
@@ -28,6 +27,9 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -50,12 +52,12 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
-            android:name=".AppStatusActivity"
+            android:name=".ui.AppStatusActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="portrait"
             android:exported="false" />
@@ -71,15 +73,22 @@
             android:windowSoftInputMode="adjustResize"
             android:exported="false" />
         <activity
-            android:name=".AppPreferencesActivity"
+            android:name=".ui.HelpFaqActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="portrait"
             android:exported="false" />
         <activity
-            android:name=".HelpFaqActivity"
+            android:name=".ui.AppPreferencesActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="portrait"
             android:exported="false" />
+        <activity
+            android:name=".ComposeMainActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:exported="false"
+            android:theme="@style/AppTheme" />
         <!-- <activity android:name=".spotreport.SpotReportActivity" -->
         <!-- android:configChanges="orientation|screenSize"> -->
 

sensorhub-android-app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 description = 'OSH Android App'
 ext.details = 'OSH app for Android'
@@ -35,6 +36,18 @@ dependencies {
     implementation 'org.slf4j:slf4j-api:2.0.9'
     implementation 'com.github.tony19:logback-android:3.0.0'
 
+    // compose deps
+    implementation platform('androidx.compose:compose-bom:2024.02.02')
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.compose.material:material-icons-extended'
+    implementation 'androidx.activity:activity-compose:1.8.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
+    implementation("androidx.navigation:navigation-compose:2.8.4")
+
 }
 
 allprojects {
@@ -44,9 +57,9 @@ allprojects {
         exclude group: 'ch.qos.logback', module: 'logback-core'
 
         resolutionStrategy {
-            force "org.jetbrains.kotlin:kotlin-stdlib:1.8.10"
-            force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10"
-            force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10"
+            force "org.jetbrains.kotlin:kotlin-stdlib:1.9.22"
+            force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22"
+            force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22"
         }
     }
 }
@@ -69,10 +82,14 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    packagingOptions {
-        exclude 'META-INF/LICENSE'
-        exclude '**/empty'
-        exclude 'META-INF/rxjava.properties'
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
+    packaging {
+        resources {
+            excludes += ['META-INF/LICENSE', '**/empty', 'META-INF/rxjava.properties', 'META-INF/INDEX.LIST']
+        }
     }
 
 
@@ -85,17 +102,18 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         abortOnError false
     }
+
     buildFeatures {
         viewBinding true
+        compose true
+        buildConfig true
     }
 
-    packagingOptions {
-        resources {
-            excludes += ["META-INF/INDEX.LIST"]
-        }
+    composeOptions {
+        kotlinCompilerExtensionVersion = '1.5.10'
     }
 
 }