From 3774d77d19477faf33c5ea42a91e5b3a42eaf2a1 Mon Sep 17 00:00:00 2001
From: JaeYoung290 <2159wodud@gmail.com>
Date: Mon, 23 Dec 2024 18:22:55 +0900
Subject: [PATCH 1/2] commit test

---
 newProject/.idea/compiler.xml          |  2 +-
 newProject/.idea/gradle.xml            |  2 ++
 newProject/.idea/misc.xml              |  2 +-
 newProject/.idea/runConfigurations.xml | 17 +++++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 newProject/.idea/runConfigurations.xml

diff --git a/newProject/.idea/compiler.xml b/newProject/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/newProject/.idea/compiler.xml
+++ b/newProject/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/newProject/.idea/gradle.xml b/newProject/.idea/gradle.xml
index 32522c1..7b3006b 100644
--- a/newProject/.idea/gradle.xml
+++ b/newProject/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/newProject/.idea/misc.xml b/newProject/.idea/misc.xml
index 0ad17cb..74dd639 100644
--- a/newProject/.idea/misc.xml
+++ b/newProject/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/newProject/.idea/runConfigurations.xml b/newProject/.idea/runConfigurations.xml
new file mode 100644
index 0000000..16660f1
--- /dev/null
+++ b/newProject/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file

From 68f393e7536b1d02853364ff8f028b14ccf1c421 Mon Sep 17 00:00:00 2001
From: JaeYoung290 <2159wodud@gmail.com>
Date: Mon, 23 Dec 2024 19:03:25 +0900
Subject: [PATCH 2/2] =?UTF-8?q?8=EC=A3=BC=EC=B0=A8=20=EA=B3=BC=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 newProject/app/build.gradle.kts               |  3 +
 newProject/app/src/main/AndroidManifest.xml   |  3 +-
 .../com/example/assignment/MainActivity.kt    | 85 ++++++++++++++++--
 .../example/assignment/NotificationHelper.kt  | 86 +++++++++++++++++++
 .../com/example/assignment/RandomActivity.kt  | 36 ++++++++
 .../app/src/main/res/drawable/btn_custom.xml  |  6 ++
 .../app/src/main/res/layout/activity_main.xml | 42 ++++++++-
 .../src/main/res/layout/activity_random.xml   | 33 +++++++
 newProject/app/src/main/res/values/colors.xml |  6 ++
 .../app/src/main/res/values/strings.xml       |  7 ++
 newProject/app/src/main/res/values/themes.xml |  7 ++
 11 files changed, 302 insertions(+), 12 deletions(-)
 create mode 100644 newProject/app/src/main/java/com/example/assignment/NotificationHelper.kt
 create mode 100644 newProject/app/src/main/java/com/example/assignment/RandomActivity.kt
 create mode 100644 newProject/app/src/main/res/drawable/btn_custom.xml
 create mode 100644 newProject/app/src/main/res/layout/activity_random.xml

diff --git a/newProject/app/build.gradle.kts b/newProject/app/build.gradle.kts
index 85372cb..02deeee 100644
--- a/newProject/app/build.gradle.kts
+++ b/newProject/app/build.gradle.kts
@@ -33,6 +33,9 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    viewBinding {
+        enable = true
+    }
 }
 
 dependencies {
diff --git a/newProject/app/src/main/AndroidManifest.xml b/newProject/app/src/main/AndroidManifest.xml
index c909994..24be12d 100644
--- a/newProject/app/src/main/AndroidManifest.xml
+++ b/newProject/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -21,6 +21,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".RandomActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/newProject/app/src/main/java/com/example/assignment/MainActivity.kt b/newProject/app/src/main/java/com/example/assignment/MainActivity.kt
index 6164f33..f3e9788 100644
--- a/newProject/app/src/main/java/com/example/assignment/MainActivity.kt
+++ b/newProject/app/src/main/java/com/example/assignment/MainActivity.kt
@@ -1,20 +1,87 @@
 package com.example.assignment
 
+import android.Manifest
+import android.app.NotificationManager
+import android.content.Context
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import com.example.assignment.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityMainBinding
+    private lateinit var notificationHelper: NotificationHelper
+    private var count: Int = 0
+
+    private val postResultLauncher: ActivityResultLauncher<String> =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+            if (isGranted)
+                Toast.makeText(this, "Permission granted", Toast.LENGTH_SHORT).show()
+            else
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show()
+        }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        setContentView(R.layout.activity_main)
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        notificationHelper = NotificationHelper(this)
+        setContentView(binding.root)
+
+        if (intent.getBooleanExtra("closeNotification", false)) {
+            val activityData = getSharedPreferences("activityData", Context.MODE_PRIVATE)
+            count = activityData.getInt("count", 0)
+
+            val notificationManager =
+                getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.cancel(NotificationHelper.NOTIFICATION_ID)
+        } else {
+            count = 0
+        }
+        binding.countText.text = count.toString()
+
+        if (shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)) {
+            showRationaleDialog(
+                "Permission Demo requires Notification Permission",
+                "Notification Permission is denied"
+            )
+        } else {
+            postResultLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+        }
+
+        val btnShowToast = binding.toastButton
+        btnShowToast.setOnClickListener() {
+            Toast.makeText(this, "toast message", Toast.LENGTH_SHORT).show()
         }
+
+        val btnIncrementCount = binding.countButton
+        val countText = binding.countText
+        btnIncrementCount.setOnClickListener() {
+            count++
+            countText.text = count.toString()
+        }
+
+        val randomData = intent.getIntExtra("randomData", 0)
+        if (randomData != 0) {
+            count = randomData
+            countText.text = count.toString()
+        }
+
+        val btnNavigateToRandom = binding.randomButton
+        btnNavigateToRandom.setOnClickListener() {
+            notificationHelper.showNotification(count)
+        }
+    }
+
+    private fun showRationaleDialog(title: String, message: String) {
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+        builder.setTitle(title)
+            .setMessage(message)
+            .setPositiveButton("Cancel") { dialog, _ ->
+                dialog.dismiss()
+            }
+        builder.create().show()
     }
 }
\ No newline at end of file
diff --git a/newProject/app/src/main/java/com/example/assignment/NotificationHelper.kt b/newProject/app/src/main/java/com/example/assignment/NotificationHelper.kt
new file mode 100644
index 0000000..fc41934
--- /dev/null
+++ b/newProject/app/src/main/java/com/example/assignment/NotificationHelper.kt
@@ -0,0 +1,86 @@
+package com.example.assignment
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+
+class NotificationHelper(private val context: Context) {
+    companion object {
+        private const val CHANNEL_ID = "random_channel_id"
+        private const val CHANNEL_NAME = "Random Channel"
+        private const val CHANNEL_DESCRIPTION = "Generate and send random numbers"
+        const val NOTIFICATION_ID = 1
+    }
+
+    init {
+        createNotificationChannel()
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val name = CHANNEL_NAME
+            val descriptionText = CHANNEL_DESCRIPTION
+            val importance = NotificationManager.IMPORTANCE_DEFAULT
+            val channel = NotificationChannel(CHANNEL_ID, name, importance).apply {
+                description = descriptionText
+            }
+            val notificationManager: NotificationManager =
+                context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.createNotificationChannel(channel)
+        }
+    }
+
+    fun showNotification(count: Int) {
+        val activityData = context.getSharedPreferences("activityData", Context.MODE_PRIVATE)
+        activityData.edit().putInt("count", count).apply()
+
+        val randomIntent = Intent(context, RandomActivity::class.java).apply {
+            putExtra("countData", count)
+        }
+        val randomPendingIntent: PendingIntent =
+            PendingIntent.getActivity(
+                context,
+                0,
+                randomIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+
+        val closeIntent = Intent(context, MainActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            putExtra("closeNotification", true)
+        }
+        val closePendingIntent: PendingIntent =
+            PendingIntent.getActivity(
+                context,
+                1,
+                closeIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+
+        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setContentTitle(context.getString(R.string.notification_title))
+            .setContentText(context.getString((R.string.notification_content)))
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setContentIntent(randomPendingIntent)
+            .setAutoCancel(true)
+            .addAction(
+                R.drawable.ic_launcher_foreground,
+                context.getString(R.string.btn_more),
+                randomPendingIntent
+            )
+            .addAction(
+                R.drawable.ic_launcher_foreground,
+                context.getString(R.string.btn_close),
+                closePendingIntent
+            )
+
+        val notificationManager =
+            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.notify(NOTIFICATION_ID, builder.build())
+    }
+}
diff --git a/newProject/app/src/main/java/com/example/assignment/RandomActivity.kt b/newProject/app/src/main/java/com/example/assignment/RandomActivity.kt
new file mode 100644
index 0000000..ed7a548
--- /dev/null
+++ b/newProject/app/src/main/java/com/example/assignment/RandomActivity.kt
@@ -0,0 +1,36 @@
+package com.example.assignment
+
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.example.assignment.databinding.ActivityRandomBinding
+
+class RandomActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityRandomBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityRandomBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(NotificationHelper.NOTIFICATION_ID)
+
+        val receivedCount = intent.getIntExtra("countData", 0)
+        val randomNumberTextView = binding.countTextRandomView
+        val randomNum = (0..receivedCount).random()
+        randomNumberTextView.text = randomNum.toString()
+
+        val btnBack = binding.backButtonRandomView
+        btnBack.setOnClickListener() {
+            val intent = Intent(this, MainActivity::class.java).apply {
+                putExtra("randomData", randomNum)
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            }
+            startActivity(intent)
+            finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/newProject/app/src/main/res/drawable/btn_custom.xml b/newProject/app/src/main/res/drawable/btn_custom.xml
new file mode 100644
index 0000000..7b3ffe6
--- /dev/null
+++ b/newProject/app/src/main/res/drawable/btn_custom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/main_button_color" />
+    <corners android:radius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/newProject/app/src/main/res/layout/activity_main.xml b/newProject/app/src/main/res/layout/activity_main.xml
index 86a5d97..93e8834 100644
--- a/newProject/app/src/main/res/layout/activity_main.xml
+++ b/newProject/app/src/main/res/layout/activity_main.xml
@@ -5,15 +5,53 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/main_background_color"
     tools:context=".MainActivity">
 
     <TextView
+        android:id="@+id/count_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:text="0"
+        android:textColor="@color/text_color"
+        android:textSize="60sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.3" />
+
+    <android.widget.Button
+        android:id="@+id/toast_button"
+        style="@style/custom_button_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Toast"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/count_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/count_text" />
+
+    <android.widget.Button
+        android:id="@+id/count_button"
+        style="@style/custom_button_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="COUNT"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/random_button"
+        app:layout_constraintStart_toEndOf="@id/toast_button"
+        app:layout_constraintTop_toBottomOf="@id/count_text" />
+
+    <android.widget.Button
+        android:id="@+id/random_button"
+        style="@style/custom_button_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="RANDOM"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/count_button"
+        app:layout_constraintTop_toBottomOf="@id/count_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newProject/app/src/main/res/layout/activity_random.xml b/newProject/app/src/main/res/layout/activity_random.xml
new file mode 100644
index 0000000..cd32791
--- /dev/null
+++ b/newProject/app/src/main/res/layout/activity_random.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/main_background_color">
+
+    <TextView
+        android:id="@+id/count_text_random_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="0"
+        android:textColor="@color/text_color"
+        android:textSize="100sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.3" />
+
+    <android.widget.Button
+        android:id="@+id/back_button_random_view"
+        style="@style/custom_button_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="BACK"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/count_text_random_view" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/newProject/app/src/main/res/values/colors.xml b/newProject/app/src/main/res/values/colors.xml
index c8524cd..80f84db 100644
--- a/newProject/app/src/main/res/values/colors.xml
+++ b/newProject/app/src/main/res/values/colors.xml
@@ -2,4 +2,10 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <!--메인 화면 색상 정의-->
+    <color name="main_background_color">#2E5077</color>
+    <color name="main_button_color">#4DA1A9</color>
+    <color name="main_button_color_2">#79D7BE</color>
+    <color name="text_color">#F6F4F0</color>
 </resources>
\ No newline at end of file
diff --git a/newProject/app/src/main/res/values/strings.xml b/newProject/app/src/main/res/values/strings.xml
index a33dffd..739ea4d 100644
--- a/newProject/app/src/main/res/values/strings.xml
+++ b/newProject/app/src/main/res/values/strings.xml
@@ -1,3 +1,10 @@
 <resources>
     <string name="app_name">assignment</string>
+
+    <string name="notification_channel_name">Notification</string>
+    <string name="notification_channel_description">Random notifications</string>
+    <string name="notification_title">알림</string>
+    <string name="notification_content">랜덤 결과 화면으로 이동</string>
+    <string name="btn_more">더 보기</string>
+    <string name="btn_close">닫기</string>
 </resources>
\ No newline at end of file
diff --git a/newProject/app/src/main/res/values/themes.xml b/newProject/app/src/main/res/values/themes.xml
index fb2dd50..a91a009 100644
--- a/newProject/app/src/main/res/values/themes.xml
+++ b/newProject/app/src/main/res/values/themes.xml
@@ -6,4 +6,11 @@
     </style>
 
     <style name="Theme.Assignment" parent="Base.Theme.Assignment" />
+
+    <style name="custom_button_style" parent="Widget.AppCompat.Button">
+        <item name="android:background">@drawable/btn_custom</item>
+        <item name="android:textColor">@color/text_color</item>
+        <item name="android:outlineProvider">none</item>
+        <item name="layout_constraintVertical_bias">0.15</item>
+    </style>
 </resources>
\ No newline at end of file