Remove androidx.appcompat as it is not needed (#686)

eygraber · May 8, 2024 · a187b90 · a187b90
1 parent bd1300c
commit a187b90
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -35,7 +35,6 @@ conventions = { id = "com.eygraber.conventions", version.ref = "conventions" }
 
 [libraries]
 androidx-activity-compose = "androidx.activity:activity-compose:1.9.0"
-androidx-appcompat = "androidx.appcompat:appcompat:1.7.0-beta01"
 
 buildscript-android = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 buildscript-androidCacheFix = { module = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin", version = "3.0.1" }

diff --git a/samples/kotlin-inject/android-app/build.gradle.kts b/samples/kotlin-inject/android-app/build.gradle.kts
@@ -54,7 +54,6 @@ dependencies {
   implementation(projects.samples.kotlinInject.shared)
 
   implementation(libs.androidx.activity.compose)
-  implementation(libs.androidx.appcompat)
 }
 
 gradleConventions.kotlin {

diff --git a/samples/kotlin-inject/android-app/src/main/AndroidManifest.xml b/samples/kotlin-inject/android-app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
-    android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
+    android:theme="@style/android:Theme.Material.NoActionBar"
     android:allowBackup="true"
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher_round"

diff --git a/...oid-app/src/main/kotlin/com/eygraber/portal/samples/kotlin/inject/KotlinInjectActivity.kt b/...oid-app/src/main/kotlin/com/eygraber/portal/samples/kotlin/inject/KotlinInjectActivity.kt
@@ -1,10 +1,10 @@
 package com.eygraber.portal.samples.kotlin.inject
 
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
 
-class KotlinInjectActivity : AppCompatActivity() {
+class KotlinInjectActivity : ComponentActivity() {
   private val mainPortal = appComponent.mainPortal
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)

diff --git a/samples/simple-portal/android-app/build.gradle.kts b/samples/simple-portal/android-app/build.gradle.kts
@@ -53,7 +53,6 @@ dependencies {
   implementation(projects.samples.simplePortal)
 
   implementation(libs.androidx.activity.compose)
-  implementation(libs.androidx.appcompat)
 
   testImplementation(libs.test.espresso)
   testImplementation(libs.test.compose.android.uiJunit)

diff --git a/samples/simple-portal/android-app/src/main/AndroidManifest.xml b/samples/simple-portal/android-app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
-    android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
+    android:theme="@style/android:Theme.Material.NoActionBar"
     android:allowBackup="true"
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher_round"

diff --git a/.../src/main/kotlin/com/eygraber/portal/samples/simpleportal/android/SimplePortalActivity.kt b/.../src/main/kotlin/com/eygraber/portal/samples/simpleportal/android/SimplePortalActivity.kt
@@ -1,11 +1,11 @@
 package com.eygraber.portal.samples.simpleportal.android
 
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
 import com.eygraber.portal.samples.simpleportal.SimplePortal
 
-class SimplePortalActivity : AppCompatActivity() {
+class SimplePortalActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)