ssMerge branch 'master' of ssh://git.smartsoltech.kr:2222/trevor/woman_safety_app

This commit is contained in:
2025-09-25 17:01:34 +09:00
3 changed files with 17 additions and 9 deletions

View File

@@ -2,10 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<!-- Internet permissions for API calls -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
@@ -14,8 +10,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.WomanSafe"
android:usesCleartextTraffic="true">
android:theme="@style/Theme.WomanSafe">
<activity
android:name=".MainActivity"
android:exported="true"

View File

@@ -7,10 +7,10 @@ import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.example.womansafe.ui.screens.ApiTestScreen
import com.example.womansafe.ui.theme.WomanSafeTheme
class MainActivity : ComponentActivity() {
@@ -20,7 +20,8 @@ class MainActivity : ComponentActivity() {
setContent {
WomanSafeTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
ApiTestScreen(
Greeting(
name = "Android",
modifier = Modifier.padding(innerPadding)
)
}
@@ -29,10 +30,18 @@ class MainActivity : ComponentActivity() {
}
}
@Composable
fun Greeting(name: String, modifier: Modifier = Modifier) {
Text(
text = "Hello $name!",
modifier = modifier
)
}
@Preview(showBackground = true)
@Composable
fun GreetingPreview() {
WomanSafeTheme {
ApiTestScreen()
Greeting("Android")
}
}