Skip to content

Commit 9836856

Browse files
committed
Merge branch 'compose'
This migrates everything to Jetpack Compose, making it easy for us to fix the edge-to-edge behaviour broken by the recent SDK update. This also includes a broader UI refresh in quite a few places but nothing major, just tweaks.
2 parents 7e82e09 + fb5cfcb commit 9836856

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1955
-1905
lines changed

app/build.gradle.kts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.kotlin.compose)
45
id("kotlin-parcelize")
56
}
67

@@ -37,13 +38,16 @@ android {
3738
targetCompatibility = JavaVersion.VERSION_11
3839
}
3940

40-
kotlinOptions {
41-
jvmTarget = "11"
41+
kotlin {
42+
compilerOptions {
43+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
44+
}
4245
}
4346

4447
buildFeatures {
4548
viewBinding = true
4649
buildConfig = true
50+
compose = true
4751
}
4852
lint {
4953
lintConfig = file("./lint.xml")
@@ -57,6 +61,17 @@ dependencies {
5761
implementation(libs.kotlinx.coroutines.core)
5862
implementation(libs.kotlinx.coroutines.android)
5963
implementation(libs.appcompat)
64+
65+
// Compose
66+
implementation(platform(libs.compose.bom))
67+
implementation(libs.compose.ui)
68+
implementation(libs.compose.ui.tooling.preview)
69+
implementation(libs.compose.material3)
70+
implementation(libs.compose.material.icons.extended)
71+
implementation(libs.activity.compose)
72+
implementation(libs.accompanist.drawablepainter)
73+
implementation(libs.foundation)
74+
debugImplementation(libs.compose.ui.tooling)
6075
implementation(libs.core.ktx)
6176
implementation(libs.constraintlayout)
6277
implementation(libs.localbroadcastmanager)

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</service>
5454

5555
<activity
56-
android:name=".MainActivity"
56+
android:name=".main.MainActivity"
5757
android:launchMode="singleTask"
5858
android:exported="true">
5959
<intent-filter>
@@ -84,7 +84,7 @@
8484
-->
8585
<activity-alias
8686
android:name=".RemoteControlMainActivity"
87-
android:targetActivity=".MainActivity"
87+
android:targetActivity=".main.MainActivity"
8888
android:permission="android.permission.INJECT_EVENTS"
8989
android:exported="true">
9090
<intent-filter>
@@ -101,14 +101,14 @@
101101
</intent-filter>
102102
</activity-alias>
103103

104-
<activity android:name=".QRScanActivity" android:parentActivityName=".MainActivity">
104+
<activity android:name=".qrscan.QRScanActivity" android:parentActivityName=".main.MainActivity">
105105
<meta-data
106106
android:name="android.support.PARENT_ACTIVITY"
107-
android:value=".MainActivity" />
107+
android:value=".main.MainActivity" />
108108
</activity>
109109

110-
<activity android:name=".ApplicationListActivity" />
111-
<activity android:name=".PortListActivity" />
110+
<activity android:name=".appselection.ApplicationListActivity" />
111+
<activity android:name=".portfilter.PortListActivity" />
112112

113113
<meta-data android:name="search-engine" android:resource="@xml/noindex" />
114114

app/src/main/java/tech/httptoolkit/android/ApplicationListActivity.kt

Lines changed: 0 additions & 176 deletions
This file was deleted.

app/src/main/java/tech/httptoolkit/android/ApplicationListAdapter.kt

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)