Skip to content

Commit d658470

Browse files
BlazeCodeDevBlazeCodeDev
committed
Merge branch 'development'
2 parents 8866195 + c546651 commit d658470

File tree

9 files changed

+117
-73
lines changed

9 files changed

+117
-73
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313
applicationId "com.blazecode.eventtool"
1414
minSdk 33
1515
targetSdk 33
16-
versionCode 12
17-
versionName "1.0.2"
16+
versionCode 13
17+
versionName "1.1.0"
1818

1919
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2020
vectorDrawables {

‎app/src/main/java/com/blazecode/eventtool/enums/EventType.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package com.blazecode.eventtool.enums
88

99
enum class EventType {
1010
UNKNOWN,
11+
RESERVED,
1112
BIRTHDAY,
1213
WEDDING,
1314
COMPANY_EVENT,

‎app/src/main/java/com/blazecode/eventtool/reminders/ReminderManager.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ class ReminderManager {
4343
val HOURS_TO_SUBSTRACT: Long = context.resources.getInteger(R.integer.REMINDER_AMOUNT_HOURS_BEFORE_TIME_READY).toLong()
4444
alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
4545

46+
val id = if(event.id != null) event.id else 0
4647
alarmIntent = Intent(context, ReminderBroadcastReceiver::class.java)
4748
.putExtra("reminderEvent", event as Parcelable)
4849
.let { intent ->
49-
PendingIntent.getBroadcast(context, event.id!!, intent, PendingIntent.FLAG_IMMUTABLE)
50+
PendingIntent.getBroadcast(context, id!!, intent, PendingIntent.FLAG_IMMUTABLE)
5051
}
5152
Log.i("RECEIVER", "GAVE ${event}")
5253

‎app/src/main/java/com/blazecode/eventtool/screens/Home.kt‎

Lines changed: 49 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,17 @@ fun ListView(eventList: MutableList<Event>){
358358
modifier = Modifier.padding(8.dp))
359359
}
360360
// NAME
361-
Box (modifier = Modifier.fillMaxWidth().padding(0.dp,0.dp,40.dp,0.dp), contentAlignment = Alignment.Center){
362-
val name = if(item.eventType == EventType.WEDDING) "${item.firstName1} / ${item.firstName2} ${item.lastName}" else item.name
363-
Text(text = name, style = Typography.titleLarge, modifier = Modifier.padding(0.dp, 8.dp, 0.dp, 0.dp))
361+
if(item.eventType != EventType.RESERVED){
362+
Box (modifier = Modifier.fillMaxWidth().padding(0.dp,0.dp,40.dp,0.dp), contentAlignment = Alignment.Center){
363+
val name = if(item.eventType == EventType.WEDDING) "${item.firstName1} / ${item.firstName2} ${item.lastName}" else item.name
364+
Text(text = name, style = Typography.titleLarge, modifier = Modifier.padding(0.dp, 8.dp, 0.dp, 0.dp))
365+
}
366+
} else {
367+
Box (modifier = Modifier.fillMaxWidth().padding(0.dp,0.dp,40.dp,0.dp), contentAlignment = Alignment.Center) {
368+
Text(text = item.comments, style = Typography.titleLarge, modifier = Modifier.padding(0.dp, 8.dp, 0.dp, 0.dp))
369+
}
364370
}
371+
365372
}
366373

367374
// EVENT TYPE & DATE
@@ -379,15 +386,17 @@ fun ListView(eventList: MutableList<Event>){
379386
}
380387
}
381388

382-
// VENUE & READY TIME
383-
Row (modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically){
384-
// VENUE
385-
Box {
386-
Text(text = item.venue, style = Typography.bodyMedium, modifier = Modifier.padding(8.dp))
387-
}
388-
// VENUE & READY TIME TIME
389-
Box (modifier = Modifier.fillMaxWidth(), Alignment.CenterEnd){
390-
Text(text = "${stringResource(R.string.time_ready)}: ${item.timeReady}", style = Typography.bodyMedium, modifier = Modifier.padding(8.dp))
389+
if(item.eventType != EventType.RESERVED){
390+
// VENUE & READY TIME
391+
Row (modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically){
392+
// VENUE
393+
Box {
394+
Text(text = item.venue, style = Typography.bodyMedium, modifier = Modifier.padding(8.dp))
395+
}
396+
// VENUE & READY TIME TIME
397+
Box (modifier = Modifier.fillMaxWidth(), Alignment.CenterEnd){
398+
Text(text = "${stringResource(R.string.time_ready)}: ${item.timeReady}", style = Typography.bodyMedium, modifier = Modifier.padding(8.dp))
399+
}
391400
}
392401
}
393402

@@ -434,12 +443,17 @@ fun EventDetails(navController: NavController, viewModel: HomeViewModel, printer
434443
onDismissRequest = {},
435444
title = {
436445
Row (modifier = Modifier.fillMaxWidth()){
437-
Text(text = ("$name\n$eventType"), modifier = Modifier.weight(5f))
438-
Box(modifier = Modifier.size(dimensionResource(R.dimen.icon_button_size)).weight(1f)){
439-
IconButton(onClick = { viewModel.printPdf(printer, event) }){
440-
Icon(painterResource(R.drawable.ic_print), "settings")
446+
if(event.eventType != EventType.RESERVED){
447+
Text(text = ("$name\n$eventType"), modifier = Modifier.weight(5f))
448+
Box(modifier = Modifier.size(dimensionResource(R.dimen.icon_button_size)).weight(1f)){
449+
IconButton(onClick = { viewModel.printPdf(printer, event) }){
450+
Icon(painterResource(R.drawable.ic_print), "settings")
451+
}
441452
}
453+
} else {
454+
Text(text = ("${event.comments}\n$eventType"), modifier = Modifier.weight(5f))
442455
}
456+
443457
}
444458
},
445459
text = {
@@ -466,24 +480,27 @@ fun EventDetails(navController: NavController, viewModel: HomeViewModel, printer
466480
}
467481

468482
//TIMES
469-
Row(modifier = Modifier.fillMaxWidth().padding(4.dp)) {
470-
Icon(painter = painterResource(R.drawable.ic_time), "times")
471-
Column (modifier = Modifier.weight(2f).padding(24.dp,0.dp,0.dp,0.dp)){
472-
Text(stringResource(R.string.time_ready))
473-
val time_guest = if(event.eventType == EventType.WEDDING || com.blazecode.eventtool.eventType.value == EventType.BIRTHDAY)
474-
stringResource(R.string.time_buffet) else stringResource(R.string.time_guests)
475-
Text(time_guest)
476-
Text(stringResource(R.string.time_start))
477-
Text(stringResource(R.string.time_end))
478-
}
479-
Column (modifier = Modifier.weight(2f).fillMaxWidth(), horizontalAlignment = Alignment.End){
480-
Text( event.timeReady.toString())
481-
Text( event.timeGuests.toString())
482-
Text( event.timeStart.toString())
483-
Text( event.timeEnd.toString())
483+
if(event.eventType != EventType.RESERVED){
484+
Row(modifier = Modifier.fillMaxWidth().padding(4.dp)) {
485+
Icon(painter = painterResource(R.drawable.ic_time), "times")
486+
Column (modifier = Modifier.weight(2f).padding(24.dp,0.dp,0.dp,0.dp)){
487+
Text(stringResource(R.string.time_ready))
488+
val time_guest = if(event.eventType == EventType.WEDDING || com.blazecode.eventtool.eventType.value == EventType.BIRTHDAY)
489+
stringResource(R.string.time_buffet) else stringResource(R.string.time_guests)
490+
Text(time_guest)
491+
Text(stringResource(R.string.time_start))
492+
Text(stringResource(R.string.time_end))
493+
}
494+
Column (modifier = Modifier.weight(2f).fillMaxWidth(), horizontalAlignment = Alignment.End){
495+
Text( event.timeReady.toString())
496+
Text( event.timeGuests.toString())
497+
Text( event.timeStart.toString())
498+
Text( event.timeEnd.toString())
499+
}
484500
}
501+
Spacer(modifier = Modifier.size(8.dp))
485502
}
486-
Spacer(modifier = Modifier.size(8.dp))
503+
487504
// GUESTS
488505
if(event.guestAmount != "0") {
489506
Row(modifier = Modifier.fillMaxWidth().padding(4.dp)) {

‎app/src/main/java/com/blazecode/eventtool/screens/NewEvent.kt‎

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -90,49 +90,53 @@ private fun MainLayout(viewModel: NewEventViewModel, navController: NavControlle
9090
Column (horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(0.dp,0.dp,0.dp, dimensionResource(R.dimen.fab_height_padding))){
9191
when (targetState) {
9292
EventType.WEDDING -> {
93-
DatePickerLayout(viewModel, context)
94-
WeddingNameLayout(viewModel)
95-
VenueLayout(viewModel)
96-
TimePickerLayout(viewModel, context)
97-
GuestAmountLayout(viewModel)
98-
WishMusicLayout(viewModel)
99-
CommentsLayout(viewModel)
100-
AdditionsLayout(viewModel)
101-
ContactLayout(viewModel)
102-
if(viewModel.editMode) DeleteLayout(viewModel, navController)
93+
DatePickerLayout(viewModel, context)
94+
WeddingNameLayout(viewModel)
95+
VenueLayout(viewModel)
96+
TimePickerLayout(viewModel, context)
97+
GuestAmountLayout(viewModel)
98+
WishMusicLayout(viewModel)
99+
CommentsLayout(viewModel)
100+
AdditionsLayout(viewModel)
101+
ContactLayout(viewModel)
102+
if(viewModel.editMode) DeleteLayout(viewModel, navController)
103103
}
104104
EventType.CLUB, EventType.FOLKFEST -> {
105-
DatePickerLayout(viewModel, context)
106-
SimpleNameLayout(viewModel)
107-
VenueLayout(viewModel)
108-
TimePickerLayout(viewModel, context)
109-
WishMusicLayout(viewModel)
110-
CommentsLayout(viewModel)
111-
AdditionsLayout(viewModel)
112-
ContactLayout(viewModel)
113-
if(viewModel.editMode) DeleteLayout(viewModel, navController)
105+
DatePickerLayout(viewModel, context)
106+
SimpleNameLayout(viewModel)
107+
VenueLayout(viewModel)
108+
TimePickerLayout(viewModel, context)
109+
WishMusicLayout(viewModel)
110+
CommentsLayout(viewModel)
111+
AdditionsLayout(viewModel)
112+
ContactLayout(viewModel)
113+
if(viewModel.editMode) DeleteLayout(viewModel, navController)
114114
}
115115
EventType.RENTAL -> {
116-
DatePickerLayout(viewModel, context)
117-
SimpleNameLayout(viewModel)
118-
VenueLayout(viewModel)
119-
TimePickerLayout(viewModel, context)
120-
CommentsLayout(viewModel)
121-
AdditionsLayout(viewModel)
122-
ContactLayout(viewModel)
123-
if(viewModel.editMode) DeleteLayout(viewModel, navController)
116+
DatePickerLayout(viewModel, context)
117+
SimpleNameLayout(viewModel)
118+
VenueLayout(viewModel)
119+
TimePickerLayout(viewModel, context)
120+
CommentsLayout(viewModel)
121+
AdditionsLayout(viewModel)
122+
ContactLayout(viewModel)
123+
if(viewModel.editMode) DeleteLayout(viewModel, navController)
124+
}
125+
EventType.RESERVED -> {
126+
CommentsLayout(viewModel)
127+
if(viewModel.editMode) DeleteLayout(viewModel, navController)
124128
}
125129
else -> {
126-
DatePickerLayout(viewModel, context)
127-
SimpleNameLayout(viewModel)
128-
VenueLayout(viewModel)
129-
TimePickerLayout(viewModel, context)
130-
GuestAmountLayout(viewModel)
131-
WishMusicLayout(viewModel)
132-
CommentsLayout(viewModel)
133-
AdditionsLayout(viewModel)
134-
ContactLayout(viewModel)
135-
if(viewModel.editMode) DeleteLayout(viewModel, navController)
130+
DatePickerLayout(viewModel, context)
131+
SimpleNameLayout(viewModel)
132+
VenueLayout(viewModel)
133+
TimePickerLayout(viewModel, context)
134+
GuestAmountLayout(viewModel)
135+
WishMusicLayout(viewModel)
136+
CommentsLayout(viewModel)
137+
AdditionsLayout(viewModel)
138+
ContactLayout(viewModel)
139+
if(viewModel.editMode) DeleteLayout(viewModel, navController)
136140
}
137141
}
138142
}
@@ -633,7 +637,9 @@ private fun SaveFAB(viewModel: NewEventViewModel, navController: NavController){
633637
if(save.value){
634638
// INPUT RULES
635639
if((viewModel.event.date != LocalDate.now() && (viewModel.event.name.isNotEmpty() || viewModel.event.lastName.isNotEmpty()) &&
636-
viewModel.event.venue.isNotEmpty() && (viewModel.event.email.isNotEmpty() || viewModel.event.phone.isNotEmpty()))) {
640+
viewModel.event.venue.isNotEmpty() && (viewModel.event.email.isNotEmpty() || viewModel.event.phone.isNotEmpty())) ||
641+
viewModel.event.eventType == EventType.RESERVED) {
642+
637643
viewModel.saveEvent()
638644
navController.popBackStack()
639645
} else {

‎app/src/main/res/drawable-v24/ic_reserved.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--
2+
~ /*
3+
~ * Copyright (c) BlazeCode / Ralf Lehmann, 2022.
4+
~ */
5+
-->
6+
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
9+
android:height="24dp"
10+
android:viewportWidth="24"
11+
android:viewportHeight="24"
12+
android:tint="?attr/colorControlNormal">
13+
<path
14+
android:fillColor="@android:color/white"
15+
android:pathData="M12,22.475Q9.825,22.475 7.913,21.65Q6,20.825 4.588,19.4Q3.175,17.975 2.35,16.062Q1.525,14.15 1.525,11.975Q1.525,9.8 2.35,7.9Q3.175,6 4.588,4.587Q6,3.175 7.913,2.35Q9.825,1.525 12,1.525Q14.175,1.525 16.087,2.35Q18,3.175 19.413,4.587Q20.825,6 21.65,7.9Q22.475,9.8 22.475,11.975Q22.475,14.15 21.65,16.062Q20.825,17.975 19.413,19.4Q18,20.825 16.087,21.65Q14.175,22.475 12,22.475ZM12,19.825Q15.275,19.825 17.55,17.538Q19.825,15.25 19.825,11.975Q19.825,10.75 19.463,9.6Q19.1,8.45 18.375,7.45L7.475,18.35Q8.425,19.1 9.6,19.462Q10.775,19.825 12,19.825ZM5.625,16.5 L16.5,5.575Q15.5,4.875 14.363,4.525Q13.225,4.175 12,4.175Q8.725,4.175 6.45,6.437Q4.175,8.7 4.175,11.975Q4.175,13.2 4.537,14.35Q4.9,15.5 5.625,16.5Z"/>
16+
</vector>

‎app/src/main/res/values-de-rDE/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,5 @@
9494
<string name="reminders_channel">Erinnerungen</string>
9595
<string name="update_available">Update %s verfügbar</string>
9696
<string name="download">Herunterladen</string>
97+
<string name="reserved">Reserviert</string>
9798
</resources>

‎app/src/main/res/values/colors.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<resources>
99
<color name="unknown">#00000000</color>
10+
<color name="reserved">#00000000</color>
1011
<color name="birthday">#66FFE06F</color>
1112
<color name="wedding">#669C9C9C</color>
1213
<color name="company_event">#66316650</color>

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<string name="choose_event_type">Choose Event Type</string>
2727
<string name="event_type">Event Type</string>
2828
<string name="unknown">Unknown</string>
29+
<string name="reserved">Reserved</string>
2930
<string name="birthday">Birthday</string>
3031
<string name="wedding">Wedding</string>
3132
<string name="company_event">Corporate Event</string>

0 commit comments

Comments
 (0)