diff options
Diffstat (limited to 'app/src')
4 files changed, 27 insertions, 18 deletions
diff --git a/app/src/main/java/com/example/alcagotchi/AlcoGotchi.kt b/app/src/main/java/com/example/alcagotchi/AlcoGotchi.kt index 42536f5..a101f6c 100644 --- a/app/src/main/java/com/example/alcagotchi/AlcoGotchi.kt +++ b/app/src/main/java/com/example/alcagotchi/AlcoGotchi.kt @@ -115,9 +115,8 @@ class AlcoGotchi private constructor() { handleStateResponse(client.newCall(request).execute()) } } - suspend fun postDrive() { + suspend fun getDrive() { val body = JSONObject() -// body.put("drive", drink) val request = Request.Builder() .url(buildUrl("drive")) @@ -128,4 +127,15 @@ class AlcoGotchi private constructor() { handleStateResponse(client.newCall(request).execute()) } } + suspend fun getClub() { + val body = JSONObject() + val request = Request.Builder() + .url(buildUrl("club")) + .get() + .build() + + return withContext(Dispatchers.IO) { + handleStateResponse(client.newCall(request).execute()) + } + } } diff --git a/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt b/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt index 86ace74..3d77986 100644 --- a/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt +++ b/app/src/main/java/com/example/alcagotchi/DrivingActivity.kt @@ -49,7 +49,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.example.alcagotchi.ui.theme.AlcaGotchiTheme import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking class DrivingActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -77,7 +76,7 @@ class DrivingViewModel : ViewModel() { viewModelScope.launch { kotlin.run { try { - alcoGotchi.postDrive() + alcoGotchi.getDrive() } catch (e: Exception) { val alertDialog = AlertDialog.Builder(context) diff --git a/app/src/main/java/com/example/alcagotchi/MainActivity.kt b/app/src/main/java/com/example/alcagotchi/MainActivity.kt index 626b843..891e374 100644 --- a/app/src/main/java/com/example/alcagotchi/MainActivity.kt +++ b/app/src/main/java/com/example/alcagotchi/MainActivity.kt @@ -178,7 +178,7 @@ fun GreetingText(viewModel: MainViewModel, message: String, from: String, modifi val intent = Intent(context, PartyActivity::class.java) context.startActivity(intent) }) { - Text("Start a Party") + Text("Join the Party") } } else { Text( diff --git a/app/src/main/java/com/example/alcagotchi/PartyActivity.kt b/app/src/main/java/com/example/alcagotchi/PartyActivity.kt index 3a621a1..2c2036c 100644 --- a/app/src/main/java/com/example/alcagotchi/PartyActivity.kt +++ b/app/src/main/java/com/example/alcagotchi/PartyActivity.kt @@ -20,7 +20,6 @@ import android.app.Activity import android.app.AlertDialog import android.content.Context import android.os.Bundle -import android.provider.Telephony.Mms.Part import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.Image @@ -46,13 +45,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import androidx.lifecycle.viewmodel.compose.viewModel import com.example.alcagotchi.ui.theme.AlcaGotchiTheme import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -66,7 +63,7 @@ class PartyActivity() : ComponentActivity() { modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background ) { - PartyGreeting( + PartyGreeting(viewModel = PartyViewModel() ) } } @@ -91,12 +88,12 @@ class PartyViewModel : ViewModel() { val coin = mutableIntStateOf(0) var amountInput = mutableIntStateOf(0) - fun name(chosen_name: String, context: Context) { + fun party(context: Context) { val alcoGotchi = AlcoGotchi.getInstance() viewModelScope.launch { - runBlocking { + kotlin.run { try { - alcoGotchi.postDrive() + alcoGotchi.getClub() } catch (e: Exception) { val alertDialog = AlertDialog.Builder(context) @@ -126,28 +123,31 @@ fun PartyOptions(viewModel: PartyViewModel, modifier: Modifier = Modifier) { val context = LocalContext.current as Activity Text( - text = "What is your name?", + text = "Welcome to the club", fontSize = 36.sp, color = Color(0xFF00FF00), modifier = Modifier .padding(top = 16.dp) .padding(end = 16.dp) ) - EditNumberField(Modifier) - Button(onClick = { viewModel.name(amountInput.text, context) }) { - Text("Enter name") + Button(onClick = { context.finish() }) { + Text("Leave the club") } } } @Composable -fun PartyGreeting(modifier: Modifier = Modifier) { +fun PartyGreeting(modifier: Modifier = Modifier, viewModel: PartyViewModel) { + val context = LocalContext.current as Activity + + viewModel.party(context) // Create a box to overlap image and texts Box(modifier) { + Image( - painter = painterResource(id = R.drawable.driving), + painter = painterResource(id = R.drawable.theclub), contentDescription = null, contentScale = ContentScale.Crop, alpha = 1F, |