Skip to content

Commit

Permalink
Add message when there are no cards
Browse files Browse the repository at this point in the history
  • Loading branch information
andras-adam committed Oct 13, 2022
1 parent 25a7b25 commit 35a93d4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ fun CardContainer(
elevation = 2.dp,
modifier = Modifier
.fillMaxWidth()
.padding(top = 4.dp, bottom = 4.dp),
.padding(top = 4.dp, bottom = 4.dp)
.padding(horizontal = 12.dp),
onClick = onClick,
backgroundColor = color,
enabled = enabled
Expand Down
28 changes: 22 additions & 6 deletions app/src/main/java/com/virtualtag/app/ui/screens/HomeScreen.kt
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
package com.virtualtag.app.ui.screens

import android.nfc.NfcAdapter
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.outlined.ErrorOutline
import androidx.compose.runtime.*
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.modifier.modifierLocalConsumer
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.virtualtag.app.ui.theme.BlackBG
import com.virtualtag.app.utils.stringToColor
import com.virtualtag.app.viewmodels.CardViewModel
Expand All @@ -38,7 +43,13 @@ fun HomeScreen(model: CardViewModel, viewCard: (id: String) -> Unit, scanCard: (
errorDialogOpen = true
}

Scaffold {
Scaffold(
floatingActionButton = {
FloatingActionButton(onClick = { onScanClick() }, backgroundColor = MaterialTheme.colors.primary) {
Icon(Icons.Filled.Add, contentDescription = null)
}
}
) {
Surface(
modifier = Modifier
.padding(it)
Expand All @@ -52,11 +63,16 @@ fun HomeScreen(model: CardViewModel, viewCard: (id: String) -> Unit, scanCard: (
horizontalAlignment = Alignment.CenterHorizontally,
) {
Logo(modifier = Modifier.padding(top = 16.dp, bottom = 16.dp))
PrimaryButton(
text = stringResource(R.string.scan_new_card),
onClick = { onScanClick() },
modifier = Modifier.padding(top = 8.dp, bottom = 8.dp)
)
if (cardList.value.isEmpty()) {
Spacer(modifier = Modifier.height(24.dp))
Text("( つ ◕_◕ )つ", color = Color.LightGray, fontSize = 32.sp)
Spacer(modifier = Modifier.height(24.dp))
Text("This is VirtualTag blob.", color = Color.LightGray, fontStyle = FontStyle.Italic, fontSize = 24.sp)
Spacer(modifier = Modifier.height(12.dp))
Text("He needs some NFC cards.", color = Color.LightGray, fontStyle = FontStyle.Italic, fontSize = 24.sp)
Spacer(modifier = Modifier.height(12.dp))
Text("Press + to help him.", color = Color.LightGray, fontStyle = FontStyle.Italic, fontSize = 24.sp)
}
// List of all cards in the database
LazyColumn {
items(cardList.value) { card ->
Expand Down

0 comments on commit 35a93d4

Please sign in to comment.