Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,12 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run Unit Tests
run: ./gradlew test
- name: Run unit test, lint check and build
run: ./gradlew test lintDebug assembleDebug

- name: Upload Lint Report Artifact
if: always()
uses: actions/upload-artifact@v4
with:
name: lint-report
path: app/build/reports/lint-results-debug.html
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,5 @@ dependencies {
implementation(libs.squareup.retrofit2)
implementation(libs.squareup.retrofit2.converter.gson)
implementation(libs.google.gson)
lintChecks(libs.slack.lint)
}
34 changes: 5 additions & 29 deletions app/src/main/java/com/debatetimer/app/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.navigation.compose.rememberNavController
import com.debatetimer.app.navigation.MainNavHost
import com.debatetimer.app.ui.theme.DebateTimerTheme
import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.HiltAndroidApp
Expand All @@ -25,30 +20,11 @@ class MainActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
val navController = rememberNavController()

DebateTimerTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
Greeting(
name = "Android",
modifier = Modifier.padding(innerPadding)
)
}
MainNavHost(navController = navController)
}
}
}
}

@Composable
fun Greeting(name: String, modifier: Modifier = Modifier) {
Text(
text = "Hello $name!",
modifier = modifier
)
}

@Preview(showBackground = true)
@Composable
fun GreetingPreview() {
DebateTimerTheme {
Greeting("Android")
}
}
15 changes: 15 additions & 0 deletions app/src/main/java/com/debatetimer/app/navigation/MainNavHost.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.debatetimer.app.navigation

import androidx.compose.runtime.Composable
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable

@Composable
fun MainNavHost(navController: NavHostController) {
NavHost(
navController = navController,
startDestination = NavItem.Login.route
) {
}
}
8 changes: 8 additions & 0 deletions app/src/main/java/com/debatetimer/app/navigation/NavItem.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.debatetimer.app.navigation

sealed class NavItem(
val route: String,
) {
object Home : NavItem("home")
object Login : NavItem("login")
}
7 changes: 5 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
# Default
agp = "8.11.1"
agp = "8.12.0"
kotlin = "2.2.0"
coreKtx = "1.16.0"
junit = "4.13.2"
Expand All @@ -9,6 +9,7 @@ espressoCore = "3.7.0"
lifecycleRuntimeKtx = "2.9.2"
activityCompose = "1.10.1"
composeBom = "2025.07.00"
material = "1.5.0-alpha01"
# New
icon = "1.7.8"
ksp = "2.2.0-2.0.2"
Expand All @@ -17,6 +18,7 @@ hilt = "2.57"
androidxHilt = "1.2.0"
retrofit2 = "3.0.0"
gson = "2.13.1"
lint = "1.4.2"

[libraries]
# Default
Expand All @@ -33,7 +35,7 @@ androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material" }
# New
androidx-material3-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "icon" }
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
Expand All @@ -43,6 +45,7 @@ dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-andro
squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit2" }
squareup-retrofit2-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit2" }
google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
slack-lint = { group = "com.slack.lint.compose", name = "compose-lint-checks", version.ref = "lint" }

[plugins]
# Default
Expand Down