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
style: use normal centered buttons instead of full-width blocks
  • Loading branch information
@AchoArnold
AchoArnold committed Jul 7, 2026
commit 8597b7802682d92a4826a7fad92db278f8122ba8
1 change: 1 addition & 0 deletions android/app/src/main/java/com/httpsms/ui/login/LoginActivityContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import androidx.compose.material.icons.filled.QrCodeScanner
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.material.icons.Icons
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
Expand All @@ -38,7 +39,7 @@
import com.httpsms.ui.theme.Pink500

@Composable
fun LoginScreen(

Check notice on line 42 in android/app/src/main/java/com/httpsms/ui/login/LoginActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/login/LoginActivityContent.kt#L42 

The function LoginScreen is missing documentation.

Check warning on line 42 in android/app/src/main/java/com/httpsms/ui/login/LoginActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/login/LoginActivityContent.kt#L42 

The function LoginScreen is too long (147). The maximum length is 60.
viewModel: LoginViewModel,
onQrScanClick: () -> Unit,
onLoginClick: () -> Unit
Expand Down
6 changes: 3 additions & 3 deletions android/app/src/main/java/com/httpsms/ui/main/MainActivityContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.*

@Composable
fun MainScreen(

Check notice on line 33 in android/app/src/main/java/com/httpsms/ui/main/MainActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/main/MainActivityContent.kt#L33 

The function MainScreen is missing documentation.

Check warning on line 33 in android/app/src/main/java/com/httpsms/ui/main/MainActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/main/MainActivityContent.kt#L33 

The function MainScreen is too long (124). The maximum length is 60.
viewModel: MainViewModel,
onSettingsClick: () -> Unit,
onSmsPermissionClick: () -> Unit,
Expand Down Expand Up @@ -81,7 +81,7 @@
if (!uiState.isSmsPermissionGranted) {
Button(
onClick = onSmsPermissionClick,
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.align(Alignment.CenterHorizontally),
colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF4CAF50)),
contentPadding = PaddingValues(horizontal = 32.dp, vertical = 16.dp)
) {
Expand All @@ -103,7 +103,7 @@
if (!uiState.isBatteryOptimizationDisabled) {
Button(
onClick = onBatteryOptimizationClick,
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.align(Alignment.CenterHorizontally),
colors = ButtonDefaults.buttonColors(containerColor = Pink500),
contentPadding = PaddingValues(horizontal = 32.dp, vertical = 16.dp)
) {
Expand All @@ -127,7 +127,7 @@

Button(
onClick = onHeartbeatClick,
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.align(Alignment.CenterHorizontally),
enabled = !uiState.isHeartbeatLoading,
colors = ButtonDefaults.buttonColors(containerColor = Blue500),
contentPadding = PaddingValues(horizontal = 32.dp, vertical = 16.dp)
Expand Down Expand Up @@ -178,7 +178,7 @@
}

@Composable
fun PhoneCard(

Check notice on line 181 in android/app/src/main/java/com/httpsms/ui/main/MainActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/main/MainActivityContent.kt#L181 

The function PhoneCard is missing documentation.
phoneNumber: String,
isActive: Boolean,
refreshTime: String
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/httpsms/ui/settings/SettingsActivityContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SettingsScreen(

Check notice on line 22 in android/app/src/main/java/com/httpsms/ui/settings/SettingsActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/settings/SettingsActivityContent.kt#L22 

The function SettingsScreen is missing documentation.

Check warning on line 22 in android/app/src/main/java/com/httpsms/ui/settings/SettingsActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/settings/SettingsActivityContent.kt#L22 

The function SettingsScreen is too long (108). The maximum length is 60.
viewModel: SettingsViewModel,
onBackClick: () -> Unit,
onLogoutClick: () -> Unit
Expand Down Expand Up @@ -134,7 +134,7 @@

Button(
onClick = onLogoutClick,
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.align(Alignment.CenterHorizontally),
colors = ButtonDefaults.buttonColors(containerColor = Color.Black),
contentPadding = PaddingValues(horizontal = 32.dp, vertical = 16.dp)
) {
Expand All @@ -149,7 +149,7 @@
}

@Composable
fun SwitchSetting(

Check notice on line 152 in android/app/src/main/java/com/httpsms/ui/settings/SettingsActivityContent.kt

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

android/app/src/main/java/com/httpsms/ui/settings/SettingsActivityContent.kt#L152 

The function SwitchSetting is missing documentation.
text: String,
checked: Boolean,
onCheckedChange: (Boolean) -> Unit,
Expand Down
Loading