Merge branch 'connyduck-edge-to-edge'

This commit is contained in:
sim 2025-02-08 11:15:58 +00:00
commit e5016baca0
5 changed files with 4 additions and 7 deletions

View file

@ -84,7 +84,6 @@ dependencies {
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.work.runtime.ktx)
implementation(libs.appcompat)
implementation(libs.material)
implementation(libs.okhttp)
implementation(libs.androidx.material3.android)
implementation(libs.kotlinx.serialization.json)

View file

@ -22,7 +22,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Sunup"
android:theme="@android:style/Theme.Material.NoActionBar"
android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".activities.MainActivity"

View file

@ -4,6 +4,7 @@ import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.lifecycle.viewmodel.compose.viewModel
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@ -25,6 +26,8 @@ class MainActivity : ComponentActivity() {
RestartWorker.startPeriodic(this)
Migrations(this).run()
enableEdgeToEdge()
setContent {
val viewModel =
viewModel {

View file

@ -1,3 +0,0 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.Sunup" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
</resources>

View file

@ -9,7 +9,6 @@ unifiedpush_distributor_ui = "0.3.1"
kotlin = "2.1.0"
kotlinx_serializationJson = "1.8.0"
ktlint = "12.1.2"
material = "1.12.0"
material3Android = "1.3.1"
okhttp = "5.0.0-alpha.14"
uiTooling = "1.7.7"
@ -27,7 +26,6 @@ unifiedpush-distributor-ui = { module = "org.unifiedpush.android:distributor-ui"
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx_serializationJson" }
ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint"}
material = { module = "com.google.android.material:material", version.ref = "material" }
okhttp = { module = "com.squareup.okhttp3:okhttp-sse", version.ref = "okhttp" }
[plugins]