Skip to content

feat(android): migrate XML layouts to Jetpack Compose #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AchoArnold merged 20 commits into from
Jul 11, 2026
Merged

feat(android): migrate XML layouts to Jetpack Compose #943

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cb0cdf0
feat: migrate XML layouts to Jetpack Compose
AchoArnold Jul 7, 2026
4c72697
fix(theme): correct status bar icon color logic
AchoArnold Jul 7, 2026
79adcd8
fix: use painterResource for platform drawables to avoid crash
AchoArnold Jul 7, 2026
b43b601
feat: use proper material design icons
AchoArnold Jul 7, 2026
a43abcf
style: increase top margin for logo in main screen
AchoArnold Jul 7, 2026
cfd0f25
style: increase top loggo padding
AchoArnold Jul 7, 2026
4d33137
style: increase button sizes and icons consistency
AchoArnold Jul 7, 2026
8597b78
style: use normal centered buttons instead of full-width blocks
AchoArnold Jul 7, 2026
2b3a3ce
feat: auto-detect phone numbers on login screen
AchoArnold Jul 7, 2026
4e2ef9d
style: add icons to buttons and improve heartbeat loader width
AchoArnold Jul 7, 2026
fadb2fd
style: heart icon color matches button content when disabled
AchoArnold Jul 7, 2026
4a8fe5c
style: update settings screen colors and status bar
AchoArnold Jul 7, 2026
54433fc
fix: address PR review comments\n\n- Improved URL validation in Login…
AchoArnold Jul 8, 2026
0e91686
fix: address more review comments from Copilot and Greptile
AchoArnold Jul 8, 2026
5af4f75
style: set custom status bar color for Android < 12
AchoArnold Jul 9, 2026
795b7f4
style: ensure status bar is white in light mode and matches backgroun…
AchoArnold Jul 9, 2026
db7e2f0
style: change top padding to n4 in heartbeats page
AchoArnold Jul 9, 2026
4c74c42
chore: upgrade target/compile SDK to 37 and update all dependencies
AchoArnold Jul 9, 2026
db7f800
chore(android): remove unused navigation-compose dependency
AchoArnold Jul 11, 2026
a533a2e
style: ensure phone number text color follows theme in MainActivity
AchoArnold Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: upgrade target/compile SDK to 37 and update all dependencies
  • Loading branch information
@AchoArnold
AchoArnold committed Jul 9, 2026
commit 4c74c42205cf4e369d892af01b6139636635fa44
26 changes: 13 additions & 13 deletions android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("com.android.application")
id("com.google.gms.google-services")
id("io.sentry.android.gradle") version "6.2.0"
id("io.sentry.android.gradle") version "6.14.0"
id("org.jetbrains.kotlin.plugin.compose")
}
Comment on lines 1 to 6

@AchoArnold AchoArnold Jul 8, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding \org.jetbrains.kotlin.android\ here actually causes a build conflict: 'Cannot add extension with name \kotlin, as there is an extension already registered'. It seems the plugin is already being applied or configured by the root build file or the Android application plugin. I'll keep it as is since it builds successfully.


Expand All @@ -10,12 +10,12 @@ val gitHash = providers.exec {
}.standardOutput.asText.map { it.trim() }

android {
compileSdk = 36
compileSdk = 37

defaultConfig {
applicationId = "com.httpsms"
minSdk = 28
targetSdk = 36
targetSdk = 37
versionCode = 1
versionName = gitHash.getOrElse("unknown")
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -44,7 +44,7 @@ android {
}

dependencies {
val composeBom = platform("androidx.compose:compose-bom:2024.10.01")
val composeBom = platform("androidx.compose:compose-bom:2026.06.01")
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -53,26 +53,26 @@ dependencies {
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.9.3")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
implementation("androidx.navigation:navigation-compose:2.8.3")
implementation("androidx.activity:activity-compose:1.13.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0")
implementation("androidx.navigation:navigation-compose:2.9.8")

implementation(platform("com.google.firebase:firebase-bom:34.11.0"))
implementation(platform("com.google.firebase:firebase-bom:34.15.0"))
implementation("com.journeyapps:zxing-android-embedded:4.3.0")
implementation("com.google.firebase:firebase-analytics")
implementation("com.google.firebase:firebase-messaging")
implementation("com.squareup.okhttp3:okhttp:5.3.2")
implementation("com.squareup.okhttp3:okhttp:5.4.0")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("androidx.preference:preference-ktx:1.2.1")
implementation("androidx.work:work-runtime-ktx:2.11.1")
implementation("androidx.core:core-ktx:1.18.0")
implementation("androidx.work:work-runtime-ktx:2.11.2")
implementation("androidx.core:core-ktx:1.19.0")
implementation("androidx.cardview:cardview:1.0.0")
implementation("com.beust:klaxon:5.6")
implementation("androidx.appcompat:appcompat:1.7.1")
implementation("org.apache.commons:commons-text:1.15.0")
implementation("com.google.android.material:material:1.13.0")
implementation("com.google.android.material:material:1.14.0")
implementation("androidx.constraintlayout:constraintlayout:2.2.1")
implementation("com.googlecode.libphonenumber:libphonenumber:9.0.26")
implementation("com.googlecode.libphonenumber:libphonenumber:9.0.34")
implementation("com.klinkerapps:android-smsmms:5.2.6")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.3.0")
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.google.gms:google-services:4.4.2")
classpath("com.google.gms:google-services:4.5.0")
}
}

plugins {
id("com.android.application") version "9.2.1" apply false
id("com.android.library") version "9.2.1" apply false
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
id("org.jetbrains.kotlin.android") version "2.4.0" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.4.0" apply false
}

tasks.register<Delete>("clean") {
Expand Down
Loading