Skip to content

Commit efd5c5f

Browse files
committed
Migrate port & applist to compose to fix edge-to-edge properly
We have to do this sometime, since the world has clearly moved on, and it's very much the properly supported route now. The edge to edge solutions without this are a mess, and this is now a play store requirement, so it's update time.
1 parent 26a018a commit efd5c5f

24 files changed

+721
-691
lines changed

app/build.gradle.kts

Lines changed: 12 additions & 0 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

@@ -46,6 +47,7 @@ android {
4647
buildFeatures {
4748
viewBinding = true
4849
buildConfig = true
50+
compose = true
4951
}
5052
lint {
5153
lintConfig = file("./lint.xml")
@@ -59,6 +61,16 @@ dependencies {
5961
implementation(libs.kotlinx.coroutines.core)
6062
implementation(libs.kotlinx.coroutines.android)
6163
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+
debugImplementation(libs.compose.ui.tooling)
6274
implementation(libs.core.ktx)
6375
implementation(libs.constraintlayout)
6476
implementation(libs.localbroadcastmanager)

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
android:value=".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.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import android.widget.TextView
1111
import com.google.android.material.card.MaterialCardView
1212
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1313
import androidx.core.net.toUri
14+
import tech.httptoolkit.android.portfilter.DEFAULT_PORTS
1415

1516
private val isLineageOs = Build.HOST.startsWith("lineage")
1617

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import java.util.Locale
2525
import java.util.concurrent.atomic.AtomicBoolean
2626
import kotlin.coroutines.resume
2727
import kotlin.coroutines.suspendCoroutine
28+
import tech.httptoolkit.android.portfilter.DEFAULT_PORTS
2829

2930
private const val VPN_START_TIME_PREF = "vpn-start-time"
3031
private const val LAST_UPDATE_CHECK_TIME_PREF = "update-check-time"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ import java.security.cert.Certificate
4141
import java.security.cert.X509Certificate
4242
import androidx.core.view.isVisible
4343
import androidx.core.net.toUri
44+
import tech.httptoolkit.android.appselection.ApplicationListActivity
45+
import tech.httptoolkit.android.portfilter.PortListActivity
4446

4547

4648
const val START_VPN_REQUEST = 123

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

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

0 commit comments

Comments
 (0)