init #63

Merged
phoenix merged 9 commits from init into main 2026-11-12 17:18:19 -05:00
Showing only changes of commit 40dca0a534 - Show all commits
@@ -10,6 +10,7 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import com.example.mear.ui.theme.MearTheme import com.example.mear.ui.theme.MearTheme
@@ -21,7 +22,7 @@ class MainActivity : ComponentActivity() {
MearTheme { MearTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
Greeting( Greeting(
name = "Android", name = getName(),
modifier = Modifier.padding(innerPadding) modifier = Modifier.padding(innerPadding)
) )
} }
@@ -30,6 +31,12 @@ class MainActivity : ComponentActivity() {
} }
} }
@Composable
fun getName(): String {
val name = stringResource(com.example.mear.R.string.app_name);
return name
}
@Composable @Composable
fun Greeting(name: String, modifier: Modifier = Modifier) { fun Greeting(name: String, modifier: Modifier = Modifier) {
Text( Text(
@@ -42,6 +49,6 @@ fun Greeting(name: String, modifier: Modifier = Modifier) {
@Composable @Composable
fun GreetingPreview() { fun GreetingPreview() {
MearTheme { MearTheme {
Greeting("Android") Greeting(getName())
} }
} }