button jalur evakuasi
This commit is contained in:
parent
f88e15d646
commit
edf5531a54
@ -8,8 +8,10 @@ import androidx.activity.compose.setContent
|
|||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
import androidx.compose.foundation.text.BasicTextField
|
import androidx.compose.foundation.text.BasicTextField
|
||||||
import androidx.compose.foundation.text.KeyboardOptions
|
import androidx.compose.foundation.text.KeyboardOptions
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@ -18,7 +20,6 @@ import androidx.compose.ui.Alignment
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.platform.LocalFocusManager
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.input.ImeAction
|
import androidx.compose.ui.text.input.ImeAction
|
||||||
import androidx.compose.ui.text.input.TextFieldValue
|
import androidx.compose.ui.text.input.TextFieldValue
|
||||||
@ -29,7 +30,6 @@ import okhttp3.OkHttpClient
|
|||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
import okhttp3.RequestBody
|
import okhttp3.RequestBody
|
||||||
|
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
@ -39,36 +39,39 @@ class MainActivity : ComponentActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun MyApp() {
|
fun MyApp() {
|
||||||
val focusManager = LocalFocusManager.current
|
val context = LocalContext.current
|
||||||
val context = LocalContext.current // Digunakan untuk tombol "Tutup" dan "Intent"
|
|
||||||
var message by remember { mutableStateOf("Kirim laporan untuk mendapatkan notifikasi") }
|
var message by remember { mutableStateOf("Kirim laporan untuk mendapatkan notifikasi") }
|
||||||
var selectedConditions by remember { mutableStateOf(mutableSetOf<String>()) }
|
var selectedConditions by remember { mutableStateOf(mutableSetOf<String>()) }
|
||||||
var additionalNotes by remember { mutableStateOf(TextFieldValue("")) }
|
var additionalNotes by remember { mutableStateOf(TextFieldValue("")) }
|
||||||
|
|
||||||
// ▼▼▼ PERUBAHAN 1: Sesuaikan Map dengan gambar terakhir ▼▼▼
|
// Map untuk mencocokkan teks UI dengan tag untuk API
|
||||||
val conditionToTagMap = mapOf(
|
val conditionToTagMap = mapOf(
|
||||||
"Kebakaran" to "fire",
|
"🔥 Kebakaran" to "fire",
|
||||||
"Banjir" to "cloud_with_rain",
|
"⛈️ Banjir" to "cloud_with_rain",
|
||||||
"Tsunami" to "ocean",
|
"🌊 Tsunami" to "ocean",
|
||||||
"Gunung Meletus" to "volcano",
|
"🌋 Gunung Meletus" to "volcano",
|
||||||
"Gempa Bumi" to "earth_asia",
|
"🌏 Gempa Bumi" to "earth_asia",
|
||||||
"Huru Hara" to "imp",
|
"👿 Huru Hara" to "imp",
|
||||||
"Binatang Buas" to "snake",
|
"🐍 Binatang Buas" to "snake",
|
||||||
"Radiasi Nuklir" to "radioactive",
|
"☢️ Radiasi Nuklir" to "radioactive",
|
||||||
"Biohazard" to "biohazard"
|
"☣️ Biohazard" to "biohazard"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Daftar kondisi untuk ditampilkan di UI
|
||||||
|
val conditions = conditionToTagMap.keys.toList()
|
||||||
|
val scrollState = rememberScrollState()
|
||||||
|
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(16.dp),
|
.padding(16.dp)
|
||||||
|
.verticalScroll(scrollState), // Membuat Column bisa di-scroll
|
||||||
verticalArrangement = Arrangement.Top,
|
verticalArrangement = Arrangement.Top,
|
||||||
horizontalAlignment = Alignment.Start
|
horizontalAlignment = Alignment.Start
|
||||||
) {
|
) {
|
||||||
// Judul (tidak ada perubahan)
|
// --- Bagian Judul ---
|
||||||
Text(
|
Text(
|
||||||
text = "Terjadi Kondisi Darurat",
|
text = "Terjadi Kondisi Darurat",
|
||||||
fontSize = 24.sp,
|
fontSize = 24.sp,
|
||||||
@ -77,42 +80,42 @@ fun MyApp() {
|
|||||||
modifier = Modifier.padding(bottom = 16.dp)
|
modifier = Modifier.padding(bottom = 16.dp)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// --- Bagian Daftar Checkbox ---
|
||||||
// ▼▼▼ PERUBAHAN 2: Sesuaikan daftar Checkbox dengan gambar terakhir ▼▼▼
|
// Perulangan ini HANYA untuk membuat baris Checkbox
|
||||||
listOf(
|
conditions.forEach { condition ->
|
||||||
"Kebakaran", "Banjir", "Tsunami", "Gunung Meletus", "Gempa Bumi",
|
|
||||||
"Huru Hara", "Binatang Buas", "Radiasi Nuklir", "Biohazard"
|
|
||||||
).forEach { condition ->
|
|
||||||
Row(
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.clickable {
|
.clickable {
|
||||||
focusManager.clearFocus()
|
// Logika untuk menambah/menghapus dari set
|
||||||
selectedConditions = selectedConditions.toMutableSet().apply {
|
val newSet = selectedConditions.toMutableSet()
|
||||||
if (contains(condition)) remove(condition) else add(condition)
|
if (newSet.contains(condition)) {
|
||||||
|
newSet.remove(condition)
|
||||||
|
} else {
|
||||||
|
newSet.add(condition)
|
||||||
}
|
}
|
||||||
|
selectedConditions = newSet
|
||||||
}
|
}
|
||||||
.padding(vertical = 4.dp),
|
.padding(vertical = 4.dp)
|
||||||
verticalAlignment = Alignment.CenterVertically
|
|
||||||
) {
|
) {
|
||||||
Checkbox(
|
Checkbox(
|
||||||
checked = selectedConditions.contains(condition),
|
checked = selectedConditions.contains(condition),
|
||||||
onCheckedChange = { isChecked ->
|
onCheckedChange = { isChecked ->
|
||||||
focusManager.clearFocus()
|
val newSet = selectedConditions.toMutableSet()
|
||||||
selectedConditions = selectedConditions.toMutableSet().apply {
|
if (isChecked) {
|
||||||
if (isChecked) add(condition) else remove(condition)
|
newSet.add(condition)
|
||||||
|
} else {
|
||||||
|
newSet.remove(condition)
|
||||||
}
|
}
|
||||||
|
selectedConditions = newSet
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
Text(
|
Text(text = condition, modifier = Modifier.padding(start = 8.dp))
|
||||||
text = condition,
|
|
||||||
modifier = Modifier.padding(start = 8.dp)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Bagian Catatan Tambahan ---
|
||||||
// Catatan tambahan (tidak ada perubahan)
|
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
Text(text = "Catatan tambahan:")
|
Text(text = "Catatan tambahan:")
|
||||||
BasicTextField(
|
BasicTextField(
|
||||||
@ -121,65 +124,61 @@ fun MyApp() {
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(100.dp)
|
.height(100.dp)
|
||||||
.padding(8.dp)
|
.padding(vertical = 8.dp)
|
||||||
.border(1.dp, Color.Gray),
|
.border(1.dp, Color.Gray),
|
||||||
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
|
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// --- Bagian Tombol Kirim Laporan ---
|
||||||
// Tombol Kirim (tidak ada perubahan)
|
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
Button(
|
Button(
|
||||||
onClick = {
|
onClick = {
|
||||||
val notes = additionalNotes.text
|
val notes = additionalNotes.text
|
||||||
val conditionsText = selectedConditions.joinToString(", ")
|
// Ambil tag yang sesuai dari map, bukan teks dari UI
|
||||||
val report = "Kondisi: $conditionsText\nCatatan: $notes"
|
|
||||||
val tags = selectedConditions.mapNotNull { conditionToTagMap[it] }.joinToString(",")
|
val tags = selectedConditions.mapNotNull { conditionToTagMap[it] }.joinToString(",")
|
||||||
|
val report = "Kondisi: ${selectedConditions.joinToString(", ")}\nCatatan: $notes"
|
||||||
|
|
||||||
|
// Panggilan ini sekarang berada di scope yang benar
|
||||||
sendNotification(report, tags) { response ->
|
sendNotification(report, tags) { response ->
|
||||||
message = response
|
message = response
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
colors = ButtonDefaults.buttonColors(containerColor = Color.Red)
|
colors = ButtonDefaults.buttonColors(containerColor = Color.Red),
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
) {
|
) {
|
||||||
Text(text = "Kirim Laporan", color = Color.White)
|
Text(text = "Kirim Laporan", color = Color.White)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Bagian Keterangan Evakuasi ---
|
||||||
// Keterangan (tidak ada perubahan)
|
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
Text(
|
Text(
|
||||||
text = "“JANGAN PANIK! SEGERA EVAKUASI\nDIRI ANDA KE TITIK KUMPUL”",
|
text = "“JANGAN PANIK! SEGERA EVAKUASI\nDIRI ANDA KE TITIK KUMPUL”",
|
||||||
color = Color.Red,
|
color = Color.Red,
|
||||||
fontSize = 15.sp,
|
fontSize = 15.sp,
|
||||||
fontWeight = FontWeight.Bold
|
fontWeight = FontWeight.Bold,
|
||||||
|
modifier = Modifier.align(Alignment.CenterHorizontally)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// --- Bagian Hasil Request ---
|
||||||
// Hasil request (tidak ada perubahan)
|
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
Text(text = message, Modifier.padding(top = 16.dp))
|
Text(text = message, modifier = Modifier.padding(top = 16.dp))
|
||||||
|
|
||||||
// Spacer (tidak ada perubahan)
|
// Spacer untuk mendorong tombol bawah ke dasar layar
|
||||||
Spacer(modifier = Modifier.weight(1f))
|
Spacer(modifier = Modifier.weight(1f))
|
||||||
|
|
||||||
// Tombol Lihat Jalur Evakuasi dan Tutup (tidak ada perubahan)
|
// --- Bagian Tombol Bawah ---
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
horizontalArrangement = Arrangement.SpaceBetween
|
horizontalArrangement = Arrangement.SpaceBetween
|
||||||
) {
|
) {
|
||||||
Button(
|
Button(onClick = {
|
||||||
onClick = {
|
context.startActivity(Intent(context, JalurEvakuasiActivity::class.java))
|
||||||
val intent = Intent(context, JalurEvakuasiActivity::class.java)
|
}) {
|
||||||
context.startActivity(intent)
|
|
||||||
}
|
|
||||||
) {
|
|
||||||
Text(text = "Lihat Jalur Evakuasi")
|
Text(text = "Lihat Jalur Evakuasi")
|
||||||
}
|
}
|
||||||
|
|
||||||
Button(
|
Button(
|
||||||
onClick = {
|
onClick = { (context as? Activity)?.finish() },
|
||||||
(context as? Activity)?.finish()
|
|
||||||
},
|
|
||||||
colors = ButtonDefaults.buttonColors(containerColor = Color.Gray)
|
colors = ButtonDefaults.buttonColors(containerColor = Color.Gray)
|
||||||
) {
|
) {
|
||||||
Text(text = "Tutup", color = Color.White)
|
Text(text = "Tutup", color = Color.White)
|
||||||
@ -189,17 +188,12 @@ fun MyApp() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Fungsi sendNotification (tidak ada perubahan)
|
// Fungsi sendNotification (tidak perlu diubah)
|
||||||
fun sendNotification(report: String, tags: String, onResult: (String) -> Unit) {
|
fun sendNotification(report: String, tags: String, onResult: (String) -> Unit) {
|
||||||
|
// ... implementasi sudah benar
|
||||||
val client = OkHttpClient()
|
val client = OkHttpClient()
|
||||||
val url = "https://ntfy.ubharajaya.ac.id/panic-button"
|
val url = "https://ntfy.ubharajaya.ac.id/panic-button"
|
||||||
|
val requestBody = RequestBody.create("text/plain".toMediaType(), report)
|
||||||
|
|
||||||
val requestBody = RequestBody.create(
|
|
||||||
"text/plain".toMediaType(),
|
|
||||||
report
|
|
||||||
)
|
|
||||||
|
|
||||||
val request = Request.Builder()
|
val request = Request.Builder()
|
||||||
.url(url)
|
.url(url)
|
||||||
.addHeader("Title", "Alert")
|
.addHeader("Title", "Alert")
|
||||||
@ -207,8 +201,6 @@ fun sendNotification(report: String, tags: String, onResult: (String) -> Unit) {
|
|||||||
.addHeader("Tags", tags)
|
.addHeader("Tags", tags)
|
||||||
.post(requestBody)
|
.post(requestBody)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
|
|
||||||
Thread {
|
Thread {
|
||||||
try {
|
try {
|
||||||
val response = client.newCall(request).execute()
|
val response = client.newCall(request).execute()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user