diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 398b755..fee4c1a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,12 +14,17 @@ tools:targetApi="31"> + android:exported="true"> + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/android_25_2/MainActivity.kt b/app/src/main/java/com/example/android_25_2/MainActivity.kt index aed359b..cf17083 100644 --- a/app/src/main/java/com/example/android_25_2/MainActivity.kt +++ b/app/src/main/java/com/example/android_25_2/MainActivity.kt @@ -1,12 +1,21 @@ package com.example.android_25_2 +import android.content.Intent import android.os.Bundle +import android.util.Log +import android.widget.Button +import android.widget.TextView +import android.widget.Toast import androidx.activity.enableEdgeToEdge +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat +import kotlin.random.Random class MainActivity : AppCompatActivity() { + private lateinit var launcher: ActivityResultLauncher override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() @@ -16,5 +25,33 @@ class MainActivity : AppCompatActivity() { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) insets } + + launcher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {} + + val textView: TextView = findViewById(R.id.textView_main) + + val toastButton: Button = findViewById(R.id.button_toast) + toastButton.setOnClickListener { + Toast.makeText(this, getString(R.string.toast_message), Toast.LENGTH_SHORT).show() + } + + val countButton: Button = findViewById(R.id.button_count) + countButton.setOnClickListener { + val currentText1 = textView.text.toString().toInt() + val newCount = currentText1 + 1 + textView.text = newCount.toString() + } + + val randomButton: Button = findViewById(R.id.button_random) + randomButton.setOnClickListener { + val randomNumber = Random.nextInt(0, 15) + launchSecondActivity(randomNumber) + } + } + + private fun launchSecondActivity(randomNumber: Int) { + val intent = Intent(this, SecondActivity::class.java) + intent.putExtra("random_number", randomNumber) + launcher.launch(intent) } } \ No newline at end of file diff --git a/app/src/main/java/com/example/android_25_2/SecondActivity.kt b/app/src/main/java/com/example/android_25_2/SecondActivity.kt new file mode 100644 index 0000000..b398334 --- /dev/null +++ b/app/src/main/java/com/example/android_25_2/SecondActivity.kt @@ -0,0 +1,43 @@ +package com.example.android_25_2 + +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import android.util.Log +import android.widget.Button +import android.widget.TextView +import androidx.activity.result.ActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.activity.result.registerForActivityResult +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import kotlin.random.Random + +class SecondActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_second) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.Second)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + Log.e("MYLOG","done3") + + val textView: TextView = findViewById(R.id.textView_main) + val randomButton: Button = findViewById(R.id.button_random) + + val receivedRandomNumber = intent.getIntExtra("random_number", 0) + textView.text = receivedRandomNumber.toString() + + randomButton.setOnClickListener { + val randomNumber = Random.nextInt(0, 15) + textView.text = randomNumber.toString() + } + + val resultIntent = Intent() + resultIntent.putExtra("random_number", textView.text) + setResult(Activity.RESULT_OK, resultIntent) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logo_google.png b/app/src/main/res/drawable/ic_logo_google.png new file mode 100644 index 0000000..f39297a Binary files /dev/null and b/app/src/main/res/drawable/ic_logo_google.png differ diff --git a/app/src/main/res/drawable/ic_logo_kakao.png b/app/src/main/res/drawable/ic_logo_kakao.png new file mode 100644 index 0000000..712c565 Binary files /dev/null and b/app/src/main/res/drawable/ic_logo_kakao.png differ diff --git a/app/src/main/res/drawable/ic_logo_naver.png b/app/src/main/res/drawable/ic_logo_naver.png new file mode 100644 index 0000000..ac4036e Binary files /dev/null and b/app/src/main/res/drawable/ic_logo_naver.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9affce0..b184c3c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,10 +1,63 @@ - + + +