Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt
This commit is contained in:
sathwikcs
2024-10-07 13:26:14 +05:30

View File

@@ -1,14 +1,16 @@
package `in`.sminnovations.attendanceapp
import android.os.Bundle
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.tooling.preview.Preview
import `in`.sminnovations.attendanceapp.ui.theme.SMIAttendanceTheme
class MainActivity : ComponentActivity() {
@@ -17,14 +19,7 @@ class MainActivity : ComponentActivity() {
enableEdgeToEdge()
setContent {
SMIAttendanceTheme {
IconButton(
onClick = {
Toast.makeText(this, "Button", Toast.LENGTH_SHORT).show()
},
modifier = Modifier.padding(5.dp),
enabled = true,
) {
Button(onClick = { Toast.makeText(this@MainActivity, "Button Clicked", Toast.LENGTH_SHORT).show()}) {
}
}