Applied requirements specified in assignment 3

app/src/main/java/de/luh/hci/mi/vibrationpattern/MainActivity.kt

@@ -5,28 +5,28 @@ import android.os.VibrationEffect
 import android.os.Vibrator
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.material.Button
+import androidx.compose.foundation.layout.padding
-import androidx.compose.material.ButtonDefaults
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.RadioButton
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 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.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import de.luh.hci.mi.vibrationpattern.ui.theme.VibrationPatternTheme
 
 class MainActivity : ComponentActivity() {
@@ -36,59 +36,84 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         vibrator = getSystemService(Vibrator::class.java)
         setContent {
-            View()
+            View(vibrator.hasVibrator(), vibrator.hasAmplitudeControl())
         }
     }
 
     @Preview(showBackground = true)
     @Composable
-    fun View() {
+    fun PreviewView() {
-        var isVibrating by remember { mutableStateOf(false)}
+
-        VibrationPatternTheme {
+        View(hasVibrator = true, hasAmplitudeControl = true)
-            Surface(
-                modifier = Modifier.fillMaxSize(),
-                color = MaterialTheme.colors.background,
-            ) {
-                Column(
-                    modifier = Modifier.fillMaxSize(),
-                    verticalArrangement = Arrangement.Center,
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    Text(text = "Select vibration pattern")
-                    if (vibrator.hasVibrator()){
-                        Text(text = "✅ Supports vibration")
-                    } else {
-                        Text(text = "❌ Vibration not supported")
-                    }
-                    if (vibrator.hasAmplitudeControl()){
-                        Text(text = "✅ Supports amplitude control")
-                    } else {
-                        Text(text = "❌ Amplitude control not supported")
-                    }
-                    Button(
-                        onClick = { vibrator.vibrate(HEART); isVibrating = true },
-                    ) {
-                        Text("Heartbeat")
-                    }
-                    Button(
-                        onClick = { vibrator.vibrate(SOS); isVibrating = true },
-                    ) {
-                        Text("SOS")
-                    }
-                    Button(
-                        onClick = { vibrator.vibrate(WALTZ); isVibrating = true },
-                    ) {
-                        Text("Waltz")
-                    }
-                    Spacer(modifier = Modifier.height(50.dp))
-                    Button(
-                        enabled = isVibrating,
-                        onClick = { vibrator.cancel(); isVibrating = false },
-                        colors = ButtonDefaults.buttonColors(backgroundColor = Color.Red, contentColor = Color.White)
-                    ) {
-                        Text("Stop")
     }
 
+    @Composable
+    fun View(hasVibrator: Boolean, hasAmplitudeControl: Boolean) {
+
+        VibrationPatternTheme {
+            Surface(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(8.dp),
+                color = MaterialTheme.colors.background,
+            ) {
+                Column {
+                    Text(
+                        text = "Play vibration pattern",
+                        fontSize = 32.sp,
+                        color = MaterialTheme.colors.primary
+                    )
+                    Text(
+                        text = "has vibrator: $hasVibrator",
+                        fontSize = 12.sp,
+                        color = MaterialTheme.colors.secondary
+                    )
+                    Text(
+                        text = "has amplitude control: $hasAmplitudeControl",
+                        fontSize = 12.sp,
+                        color = MaterialTheme.colors.secondary
+                    )
+
+                    Spacer(modifier = Modifier.height(20.dp))
+
+                    val radioOptions =
+                        listOf("None", "Heartbeat", "SOS", "Waltz", "Angry", "Chill", "Random")
+                    val (selectedOption, onOptionSelected) = remember {
+                        mutableStateOf(radioOptions[0])
+                    }
+                    Column(Modifier.selectableGroup()) {
+                        radioOptions.forEach { text ->
+                            Row(
+                                Modifier
+                                    .fillMaxWidth()
+                                    .height(48.dp)
+                                    .padding(horizontal = 16.dp)
+                                    .selectable(
+                                        selected = (text == selectedOption),
+                                        onClick = {
+                                            onOptionSelected(text)
+                                            when (text) {
+                                                "Heartbeat" -> vibrator.vibrate(HEART)
+                                                "SOS" -> vibrator.vibrate(SOS)
+                                                "Waltz" -> vibrator.vibrate(WALTZ)
+                                                "Angry" -> vibrator.vibrate(ANGRY)
+                                                "Chill" -> vibrator.vibrate(CHILL)
+                                                "Random" -> vibrator.vibrate(vibes.random())
+                                                else -> vibrator.cancel()
+                                            }
+                                        },
+                                        role = Role.RadioButton
+                                    ),
+                                verticalAlignment = Alignment.CenterVertically
+                            ) {
+                                RadioButton(selected = (text == selectedOption), onClick = null)
+                                Text(
+                                    text = text,
+                                    modifier = Modifier.padding(start = 16.dp)
+                                )
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -97,15 +122,36 @@ class MainActivity : ComponentActivity() {
     companion object {
         private val HEART = VibrationEffect.createWaveform(
             longArrayOf(
-                0, 65, 297, 44, 552 // wait 0ms, vibrate 65 ms, pause 297 ms, vibrate 44 ms, pause 552 ms
+                0,
+                65,
+                297,
+                44,
+                552 // wait 0ms, vibrate 65 ms, pause 297 ms, vibrate 44 ms, pause 552 ms
             ), 1
         )
         private val SOS = VibrationEffect.createWaveform(
             longArrayOf(
-                0, 100, 100, 100, 100, 100, 100,
+                0,
-                300, 100, 300, 100, 300, 100,
+                100,
-                100, 100, 100, 100, 100, 100,
+                100,
-                0, 1000
+                100,
+                100,
+                100,
+                100,
+                300,
+                100,
+                300,
+                100,
+                300,
+                100,
+                100,
+                100,
+                100,
+                100,
+                100,
+                100,
+                0,
+                1000
             ), 1
         )
         private val WALTZ = VibrationEffect.createWaveform(
@@ -113,7 +159,19 @@ class MainActivity : ComponentActivity() {
                 0, 100, 200, 70, 230, 70, 230
             ), 1
         )
-        private val vibes = arrayOf(HEART, SOS, WALTZ)
+        private val ANGRY = VibrationEffect.createWaveform(
+            longArrayOf(
+                0, 500, 100
+            ), 1
+        )
+        private val CHILL = VibrationEffect.createWaveform(
+            longArrayOf(
+                0, 100, 50, 150, 1600
+            ), intArrayOf(
+                0, 50, 0, 150, 0
+            ), 1
+        )
+        private val vibes = arrayOf(HEART, SOS, WALTZ, ANGRY, CHILL)
     }
 
 }