Compare commits
3
Commits
main
..
2edc3aa7b6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2edc3aa7b6
|
||
|
|
3d57f4f7df
|
||
|
|
46431c1e06
|
No files matched your search
@@ -4,17 +4,17 @@ plugins {
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "us.kundeng.mear"
|
||||
namespace = "com.example.mear"
|
||||
compileSdk {
|
||||
version = release(37)
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "us.kundeng.mear"
|
||||
applicationId = "com.example.mear"
|
||||
minSdk = 34
|
||||
targetSdk = 37
|
||||
versionCode = 1
|
||||
versionName = "0.1"
|
||||
versionName = "1.0"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.Mear"
|
||||
android:windowSoftInputMode="adjustResize">
|
||||
<intent-filter>
|
||||
|
||||
+4
-10
@@ -1,4 +1,4 @@
|
||||
package us.kundeng.mear
|
||||
package com.example.mear
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
@@ -10,9 +10,8 @@ import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import us.kundeng.mear.ui.theme.MearTheme
|
||||
import com.example.mear.ui.theme.MearTheme
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@@ -22,7 +21,7 @@ class MainActivity : ComponentActivity() {
|
||||
MearTheme {
|
||||
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
|
||||
Greeting(
|
||||
name = getName(),
|
||||
name = "Android",
|
||||
modifier = Modifier.padding(innerPadding)
|
||||
)
|
||||
}
|
||||
@@ -31,11 +30,6 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun getName(): String {
|
||||
return stringResource(R.string.app_name)
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun Greeting(name: String, modifier: Modifier = Modifier) {
|
||||
Text(
|
||||
@@ -48,6 +42,6 @@ fun Greeting(name: String, modifier: Modifier = Modifier) {
|
||||
@Composable
|
||||
fun GreetingPreview() {
|
||||
MearTheme {
|
||||
Greeting(getName())
|
||||
Greeting("Android")
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package us.kundeng.mear.ui.theme
|
||||
package com.example.mear.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
package us.kundeng.mear.ui.theme
|
||||
package com.example.mear.ui.theme
|
||||
|
||||
import android.app.Activity
|
||||
import android.os.Build
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package us.kundeng.mear.ui.theme
|
||||
package com.example.mear.ui.theme
|
||||
|
||||
import androidx.compose.material3.Typography
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
Reference in new issue
Block a user