diff options
Diffstat (limited to 'app/src/main')
5 files changed, 13 insertions, 12 deletions
diff --git a/app/src/main/java/com/example/alcagotchi/DrinkingActivity.kt b/app/src/main/java/com/example/alcagotchi/DrinkingActivity.kt index e09138a..d41abce 100644 --- a/app/src/main/java/com/example/alcagotchi/DrinkingActivity.kt +++ b/app/src/main/java/com/example/alcagotchi/DrinkingActivity.kt @@ -201,6 +201,9 @@ fun DrinkingOptions(viewModel: DrinkingViewModel, modifier: Modifier = Modifier) text = "Drink Lemonade" ) } + Button(onClick = { context.finish() }) { + Text("Go back") + } } } @@ -219,9 +222,6 @@ fun DrinkingGreeting(message: String, modifier: Modifier = Modifier) { ) - Button(onClick = { context.finish() }) { - Text("Go back") - } DrinkingOptions(viewModel = DrinkingViewModel()) } } diff --git a/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt b/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt index 0d7cec9..06dbf85 100644 --- a/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt +++ b/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt @@ -117,7 +117,7 @@ fun DrivingOptions(viewModel: DrivingViewModel, modifier: Modifier = Modifier) { Text("Yes please") } Button(onClick = { context.finish() }) { - Text("No I'm a wimp") + Text("No, I believe that I am under the influence of alcohol that would inhibit my ability to drive safely on the road.") } } } diff --git a/app/src/main/java/com/example/alcagotchi/MainActivity.kt b/app/src/main/java/com/example/alcagotchi/MainActivity.kt index 9dbf72d..626b843 100644 --- a/app/src/main/java/com/example/alcagotchi/MainActivity.kt +++ b/app/src/main/java/com/example/alcagotchi/MainActivity.kt @@ -127,8 +127,8 @@ fun GreetingText(viewModel: MainViewModel, message: String, from: String, modifi if (!connecting) { Text( text = message, - fontSize = 100.sp, - lineHeight = 116.sp, + fontSize = 50.sp, + lineHeight = 60.sp, textAlign = TextAlign.Center, color = Color(0xFF00FF00), modifier = Modifier.padding(top = 16.dp) @@ -136,6 +136,7 @@ fun GreetingText(viewModel: MainViewModel, message: String, from: String, modifi Text( text = from, fontSize = 36.sp, + lineHeight = 40.sp, color = Color(0xFF00FF00), modifier = Modifier .padding(top = 16.dp) diff --git a/app/src/main/java/com/example/alcagotchi/PartyActivity.kt b/app/src/main/java/com/example/alcagotchi/PartyActivity.kt index 38ade66..3a621a1 100644 --- a/app/src/main/java/com/example/alcagotchi/PartyActivity.kt +++ b/app/src/main/java/com/example/alcagotchi/PartyActivity.kt @@ -91,7 +91,7 @@ class PartyViewModel : ViewModel() { val coin = mutableIntStateOf(0) var amountInput = mutableIntStateOf(0) - fun name(context: Context) { + fun name(chosen_name: String, context: Context) { val alcoGotchi = AlcoGotchi.getInstance() viewModelScope.launch { runBlocking { @@ -134,9 +134,9 @@ fun PartyOptions(viewModel: PartyViewModel, modifier: Modifier = Modifier) { .padding(end = 16.dp) ) EditNumberField(Modifier) -// Button(onClick = { viewModel.name(amountInput.text, context) }) { -// Text("Enter name") -// } + Button(onClick = { viewModel.name(amountInput.text, context) }) { + Text("Enter name") + } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ad1db5e..8f7db27 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,8 +4,8 @@ <string name="casino_name">Genting</string> <string name="back_button">Back</string> - <string name="signature_text">Mes Amigos\n</string> - <string name="happy_birthday_text">It\'s Boozing Time</string> + <string name="signature_text">What would you like to do?</string> + <string name="happy_birthday_text">Welcome to AlcaGotchi, The uni student equivalent of alcagotchi\n</string> <string name="welcome_to_casino">It\'s Genting Time</string> <string name="welcome_to_pub">Welcome to the pub</string> </resources>
\ No newline at end of file |