Merge branch 'master' of https://git.lab.ubharajaya.ac.id/administrator/UAS

# Conflicts:
#	.idea/inspectionProfiles/Project_Default.xml
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/example/siamobile/KHSActivity.kt
#	app/src/main/java/com/example/siamobile/Mhs000000000000.kt
#	gradle/libs.versions.toml

.idea/inspectionProfiles/Project_Default.xml

@@ -3,19 +3,15 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
@@ -31,23 +27,18 @@
     </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
   </profile>
 </component>

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:theme="@style/Theme.SIAMobile"
         tools:targetApi="31">
         <activity
-            android:name=".Mhs202210715136"
+            android:name=".Mhs202210715298"
             android:exported="false" />
         <activity
             android:name=".Mhs000000000000"

app/src/main/java/com/example/siamobile/KHSActivity.kt

@@ -106,7 +106,7 @@ fun KHSItem(mahasiswaName: String) {
     val context = LocalContext.current
     val mahasiswaActivityMap = mapOf(
         "000000000000 EXAMPLE" to Mhs000000000000::class.java,
-        "202210715136 MUHAMAD RAJWA ATHORIQ" to Mhs202210715136::class.java
+        "202210715298 ISMA RAUDHATUL JANAH" to Mhs202210715298::class.java
         //"202210715185 AHMAD DIMAS RAMADHAN" to Mhs202210715185::class.java,
         // silahkan ditambahkan di sini untuk NPM yang lain
     )

app/src/main/java/com/example/siamobile/Mhs000000000000.kt

@@ -51,22 +51,13 @@ class Mhs000000000000 : ComponentActivity() {
 fun DetailMahasiswaScreen(mahasiswaName: String) {
     val context = LocalContext.current
     val matakuliahList = listOf(
-        Triple(1, "Aljabar Linear", 1),
+        Triple(1, "Manajemen Sekuriti", 5),
-        Triple(2, "Character Building", 1),
+        Triple(2, "Pembelajaran Mesin", 5),
-        Triple(3, "Dasar Pemrograman", 1),
+        Triple(3, "Interaksi Manusia dan Komputer", 5),
-        Triple(4, "Fisika", 1),
+        Triple(4, "Pemrograman Mobile", 5),
-        Triple(5, "Kalkulus 1", 1),
+        Triple(5, "Kecerdasan Buatan", 5),
-        Triple(6, "Kewarganegaraan", 1),
+        Triple(6, "Keamanan Siber", 5),
-        Triple(7, "Pengantar Teknologi Informasi", 1),
+        Triple(7, "Manajemen Proyek Perangkat Lunak", 5)
-        Triple(8, "Struktur Data dan Algoritma", 1),
-        Triple(9, "Bahasa Indonesia", 2),
-        Triple(10, "Desain dan Analisis Algoritma", 2),
-        Triple(11, "Kalkulus II", 2),
-        Triple(12, "Logika Matematika", 2),
-        Triple(13, "Matematika Diskrit", 2),
-        Triple(14, "Pendidikan Agama", 2),
-        Triple(15, "Sistem Basis Data", 2),
-        Triple(16, "Analisa Numerik", 3)
     )
 
     Column(

app/src/main/java/com/example/siamobile/Mhs202210715298.kt

@@ -0,0 +1,180 @@
+package com.example.siamobile
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+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.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.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.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.example.siamobile.ui.theme.SIAMobileTheme
+
+class Mhs202210715298 : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val mahasiswaName = intent.getStringExtra("mahasiswaName") ?: "NPM: 202210715298 Nama: Isma Raudhatul Janah"
+        setContent {
+            SIAMobileTheme {
+                DetailMahasiswaScreen(mahasiswaName)
+            }
+        }
+    }
+}
+
+@Composable
+fun DetailMahasiswaScreenIsma(mahasiswaName: String) {
+    val context = LocalContext.current
+    val matakuliahList = listOf(
+        Triple(1, "Manajemen Sekuriti", 5),
+        Triple(2, "Pembelajaran Mesin", 5),
+        Triple(3, "Interaksi Manusia dan Komputer", 5),
+        Triple(4, "Pemrograman Mobile", 5),
+        Triple(5, "Kecerdasan Buatan", 5),
+        Triple(6, "Keamanan Siber", 5),
+        Triple(7, "Manajemen Proyek Perangkat Lunak", 5)
+    )
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        verticalArrangement = Arrangement.SpaceBetween
+    ) {
+        Column {
+            Text(
+                text = "KHS Mahasiswa",
+                style = MaterialTheme.typography.headlineMedium,
+                fontWeight = FontWeight.Bold
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            Text(
+                text = mahasiswaName,
+                style = MaterialTheme.typography.bodyLarge,
+                fontWeight = FontWeight.Medium
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+
+            // Table Header
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(MaterialTheme.colorScheme.primaryContainer, RoundedCornerShape(8.dp))
+                    .padding(vertical = 8.dp, horizontal = 16.dp),
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                Text(
+                    text = "No",
+                    style = MaterialTheme.typography.bodyMedium.copy(
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colorScheme.onPrimaryContainer
+                    ),
+                    modifier = Modifier.weight(0.2f)
+                )
+                Text(
+                    text = "Mata Kuliah",
+                    style = MaterialTheme.typography.bodyMedium.copy(
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colorScheme.onPrimaryContainer
+                    ),
+                    modifier = Modifier.weight(0.6f)
+                )
+                Text(
+                    text = "Sem.",
+                    style = MaterialTheme.typography.bodyMedium.copy(
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colorScheme.onPrimaryContainer
+                    ),
+                    modifier = Modifier.weight(0.2f)
+                )
+            }
+            Spacer(modifier = Modifier.height(8.dp))
+
+            // Table Rows
+            LazyColumn(
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                items(matakuliahList) { (no, course, semester) ->
+                    var isSelected by remember { mutableStateOf(false) }
+
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 4.dp)
+                            .clickable {
+                                isSelected = !isSelected
+                            }
+                            .background(
+                                if (isSelected) MaterialTheme.colorScheme.secondaryContainer
+                                else Color.Transparent,
+                                RoundedCornerShape(8.dp)
+                            )
+                            .padding(vertical = 12.dp, horizontal = 16.dp)
+                            .animateContentSize(),
+                        horizontalArrangement = Arrangement.SpaceBetween
+                    ) {
+                        Text(
+                            text = no.toString(),
+                            style = MaterialTheme.typography.bodyMedium,
+                            fontSize = 16.sp,
+                            modifier = Modifier.weight(0.2f)
+                        )
+                        Text(
+                            text = course,
+                            style = MaterialTheme.typography.bodyMedium,
+                            fontSize = 16.sp,
+                            modifier = Modifier.weight(0.6f)
+                        )
+                        Text(
+                            text = semester.toString(),
+                            style = MaterialTheme.typography.bodyMedium,
+                            fontSize = 16.sp,
+                            modifier = Modifier.weight(0.2f)
+                        )
+                    }
+                }
+            }
+        }
+
+        // Interactive Back Button with visual feedback
+        Button(
+            onClick = { (context as? ComponentActivity)?.finish() },
+            modifier = Modifier
+                .align(Alignment.CenterHorizontally)
+                .padding(top = 16.dp),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = MaterialTheme.colorScheme.primary,
+                contentColor = MaterialTheme.colorScheme.onPrimary
+            )
+        ) {
+            Text(text = "Kembali")
+        }
+    }
+}
+
+

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.0"
+agp = "8.6.1"
 kotlin = "2.0.0"
 coreKtx = "1.15.0"
 junit = "4.13.2"
@@ -7,7 +7,7 @@ junitVersion = "1.2.1"
 espressoCore = "3.6.1"
 lifecycleRuntimeKtx = "2.8.7"
 activityCompose = "1.9.3"
-composeBom = "2024.04.01"
+composeBom = "2024.12.01"
 appcompat = "1.7.0"
 material = "1.12.0"
 activity = "1.9.3"