Receipt UI

app/build.gradle.kts

@@ -81,9 +81,13 @@ dependencies {
  implementation("androidx.core:core-ktx:1.12.0")
  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
  implementation("androidx.activity:activity-compose:1.8.2")
+
+ implementation("androidx.compose.material3:material3:1.2.1")
+ implementation("androidx.compose.material3:material3-android:1.2.1")
+ implementation("androidx.navigation:navigation-compose:2.6.0-rc01")
+
  implementation("androidx.compose.ui:ui:1.6.4")
  implementation("androidx.compose.ui:ui-tooling-preview:1.6.4")
- implementation("androidx.compose.material:material:1.6.4")
  implementation("androidx.compose.material3:material3:1.2.1")
  implementation("androidx.navigation:navigation-compose:2.7.7")
 

app/src/androidTest/java/com/github/se/assocify/screens/ReceiptScreenTest.kt

@@ -0,0 +1,60 @@
+package com.github.se.assocify.screens
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.github.se.assocify.navigation.NavigationActions
+import com.github.se.assocify.ui.screens.treasury.receipt.ReceiptScreen
+import com.kaspersky.components.composesupport.config.withComposeSupport
+import com.kaspersky.kaspresso.kaspresso.Kaspresso
+import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ReceiptScreenTest : TestCase(kaspressoBuilder = Kaspresso.Builder.withComposeSupport()) {
+ @get:Rule val composeTestRule = createComposeRule()
+
+ private val navActions = mockk<NavigationActions>()
+ private var tabSelected = false
+
+ @Before
+ fun testSetup() {
+ every { navActions.back() } answers { tabSelected = true }
+ composeTestRule.setContent { ReceiptScreen(navActions = navActions) }
+ }
+
+ @Test
+ fun display() {
+ with(composeTestRule) {
+ onNodeWithTag("receiptScreen").assertIsDisplayed()
+ onNodeWithTag("titleField").assertIsDisplayed()
+ onNodeWithTag("descriptionField").assertIsDisplayed()
+ onNodeWithTag("dateField").assertIsDisplayed()
+ onNodeWithTag("backButton").assertIsDisplayed()
+ }
+ }
+
+ @Test
+ fun back() {
+ with(composeTestRule) {
+ onNodeWithTag("backButton").performClick()
+ assert(tabSelected)
+ }
+ }
+
+ @Test
+ fun datePicker() {
+ with(composeTestRule) {
+ onNodeWithTag("dateField").performClick()
+ onNodeWithTag("datePickerDialog").assertIsDisplayed()
+ onNodeWithTag("datePickerDialogDismiss").performClick()
+ }
+ }
+}

app/src/main/java/com/github/se/assocify/navigation/Destination.kt

@@ -21,7 +21,9 @@ sealed class Destination(
  data object Profile :
  Destination("profile", R.string.profile_tab_label, R.drawable.profile_tab_icon)
 
- data object Login : Destination("login", R.string.login_page_label)
+ data object Login : Destination("login")
+
+ // data class Receipt(val id: String) : Destination("receipt/$id")
 }
 
 val MAIN_TABS_LIST =

app/src/main/java/com/github/se/assocify/navigation/NavigationActions.kt

@@ -24,4 +24,8 @@ class NavigationActions(private val navController: NavHostController) {
  fun onAuthError() {
  /* Handle auth error */
  }
+
+ fun back() {
+ /*TODO handle back navigation*/
+ }
 }

app/src/main/java/com/github/se/assocify/ui/composables/DatePickerWithDialog.kt

@@ -0,0 +1,86 @@
+package com.github.se.assocify.ui.composables
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.Button
+import androidx.compose.material3.DatePicker
+import androidx.compose.material3.DatePickerDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.SelectableDates
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberDatePickerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.platform.testTag
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DatePickerWithDialog(
+ modifier: Modifier = Modifier,
+ label: @Composable () -> Unit,
+ dateValue: String,
+ onDateSelected: (LocalDate?) -> Unit
+) {
+ var showDialog by remember { mutableStateOf(false) }
+ val datePickerState =
+ rememberDatePickerState(
+ selectableDates =
+ object : SelectableDates {
+ override fun isSelectableDate(utcTimeMillis: Long): Boolean {
+ return utcTimeMillis >=
+ LocalDate.now()
+ .atStartOfDay()
+ .atZone(ZoneId.systemDefault())
+ .toInstant()
+ .toEpochMilli()
+ }
+ })
+ val selectedDate =
+ datePickerState.selectedDateMillis?.let {
+ Instant.ofEpochMilli(it).atZone(ZoneId.systemDefault()).toLocalDate()
+ }
+
+ Box {
+ OutlinedTextField(
+ modifier = modifier,
+ value = dateValue,
+ onValueChange = {},
+ readOnly = true,
+ label = { label() },
+ placeholder = { Text("--/--/--") })
+ Box(modifier = Modifier.matchParentSize().alpha(0f).clickable(onClick = { showDialog = true }))
+ }
+
+ if (showDialog) {
+ DatePickerDialog(
+ modifier = Modifier.testTag("datePickerDialog"),
+ onDismissRequest = { showDialog = false },
+ confirmButton = {
+ Button(
+ onClick = {
+ showDialog = false
+ onDateSelected(selectedDate)
+ }) {
+ Text(text = "OK")
+ }
+ },
+ dismissButton = {
+ Button(
+ modifier = Modifier.testTag("datePickerDialogDismiss"),
+ onClick = { showDialog = false }) {
+ Text(text = "Cancel")
+ }
+ }) {
+ DatePicker(state = datePickerState, showModeToggle = true)
+ }
+ }
+}

app/src/main/java/com/github/se/assocify/ui/screens/treasury/TreasuryScreen.kt

@@ -1,6 +1,10 @@
 package com.github.se.assocify.ui.screens.treasury
 
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -20,6 +24,11 @@ fun TreasuryScreen(navActions: NavigationActions) {
  onTabSelect = { navActions.navigateToMainTab(it) },
  tabList = MAIN_TABS_LIST,
  selectedTab = Destination.Treasury)
+ },
+ floatingActionButton = {
+ FloatingActionButton(onClick = { /*TODO*/}) {
+ Icon(Icons.Filled.Add, contentDescription = "Add")
+ }
  }) {
  Text(modifier = Modifier.padding(it), text = "Treasury Screen")
  }

app/src/main/java/com/github/se/assocify/ui/screens/treasury/receipt/ReceiptScreen.kt

@@ -0,0 +1,61 @@
+package com.github.se.assocify.ui.screens.treasury.receipt
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MediumTopAppBar
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import com.github.se.assocify.navigation.NavigationActions
+import com.github.se.assocify.ui.composables.DatePickerWithDialog
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ReceiptScreen(navActions: NavigationActions) {
+ Scaffold(
+ modifier = Modifier.testTag("receiptScreen"),
+ topBar = {
+ MediumTopAppBar(
+ title = { Text("New Receipt") },
+ navigationIcon = {
+ IconButton(
+ modifier = Modifier.testTag("backButton"), onClick = { navActions.back() }) {
+ Icon(Icons.Default.ArrowBack, contentDescription = "Back")
+ }
+ })
+ },
+ ) {
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = it,
+ horizontalAlignment = Alignment.CenterHorizontally) {
+ item {
+ OutlinedTextField(
+ modifier = Modifier.testTag("titleField"),
+ value = "",
+ onValueChange = { /*TODO*/},
+ label = { Text("Title") })
+ OutlinedTextField(
+ modifier = Modifier.testTag("descriptionField"),
+ value = "",
+ onValueChange = { /*TODO*/},
+ label = { Text("Description") },
+ minLines = 3)
+ DatePickerWithDialog(
+ modifier = Modifier.testTag("dateField"),
+ label = { Text("Date") },
+ dateValue = "",
+ onDateSelected = { /*TODO*/})
+ }
+ }
+ }
+}

app/src/test/java/com/github/se/assocify/navigation/NavigationActionsTest.kt

@@ -35,5 +35,7 @@ class NavigationActionsTest {
 
  navActions.onAuthError()
  navActions.onLogin(user)
+
+ navActions.back()
  }
 }