From 015963839c874bf222b4cc7cf87b06713e841f3d Mon Sep 17 00:00:00 2001
From: fhfhfhfhgpdl <81856603+fhfhfhfhgpdl@users.noreply.github.com>
Date: Wed, 9 Jun 2021 16:48:10 +0900
Subject: [PATCH 1/7] commit

---
 app/src/main/AndroidManifest.xml              | 31 ++++++++++---------
 .../tutorial/intent/AnotherActivity.kt        | 13 ++++++++
 .../implude/tutorial/intent/MainActivity.kt   | 14 ++++++++-
 app/src/main/res/layout/activity_another.xml  | 22 +++++++++++++
 app/src/main/res/layout/activity_main.xml     |  1 +
 app/src/main/res/values/strings.xml           |  6 ++--
 6 files changed, 68 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
 create mode 100644 app/src/main/res/layout/activity_another.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 60e3954..9c73cec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.implude.tutorial.intent">
+    package="com.implude.tutorial.intent">
 
-	<application
-		android:allowBackup="false"
-		android:icon="@mipmap/ic_launcher"
-		android:label="@string/app_name"
-		android:roundIcon="@mipmap/ic_launcher_round"
-		android:supportsRtl="true"
-		android:theme="@style/Theme.Intent">
-		<activity android:name=".MainActivity">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
+    <application
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Intent">
+        <activity android:name=".AnotherActivity"></activity>
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-	</application>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt b/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
new file mode 100644
index 0000000..5f8c6fd
--- /dev/null
+++ b/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
@@ -0,0 +1,13 @@
+package com.implude.tutorial.intent
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class AnotherActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_another)
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
index 726dcaa..3becaa9 100644
--- a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
+++ b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
@@ -1,11 +1,23 @@
 package com.implude.tutorial.intent
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        val btn_open=findViewById<Button>(R.id.btn_open)
+
+        btn_open.setOnClickListener{
+            startActivity(Intent(this, AnotherActivity::class.java))
+        }
     }
-}
\ No newline at end of file
+
+}
+
+
+
diff --git a/app/src/main/res/layout/activity_another.xml b/app/src/main/res/layout/activity_another.xml
new file mode 100644
index 0000000..cb42563
--- /dev/null
+++ b/app/src/main/res/layout/activity_another.xml
@@ -0,0 +1,22 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".AnotherActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="AnotherActivity"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textSize="50dp"
+        ></TextView>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1999300..39bd6e1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,6 +17,7 @@
 		app:layout_constraintTop_toTopOf="parent" />
 
 	<Button
+		android:id="@+id/btn_open"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="@string/text_open_another_activity"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f21b178..56b2201 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-	<string name="app_name">Intent</string>
-	<string name="text_hello_intent">Hello Intent!</string>
-	<string name="text_open_another_activity">Open AnotherActivity</string>
+    <string name="app_name">Intent</string>
+    <string name="text_hello_intent">Hello Intent!</string>
+    <string name="text_open_another_activity">Open AnotherActivity</string>
 </resources>
\ No newline at end of file

From 624c989a04ee66a58b77c34691378d24a4bb7bf8 Mon Sep 17 00:00:00 2001
From: fhfhfhfhgpdl <81856603+fhfhfhfhgpdl@users.noreply.github.com>
Date: Thu, 10 Jun 2021 15:32:28 +0900
Subject: [PATCH 2/7] commit

---
 .../main/java/com/implude/tutorial/intent/MainActivity.kt    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
index 3becaa9..2abb03c 100644
--- a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
+++ b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
@@ -17,7 +17,4 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-}
-
-
-
+}
\ No newline at end of file

From 0fb2ff544fc3b039c4a1ad1a1b255797895d0d00 Mon Sep 17 00:00:00 2001
From: fhfhfhfhgpdl <81856603+fhfhfhfhgpdl@users.noreply.github.com>
Date: Thu, 10 Jun 2021 15:34:34 +0900
Subject: [PATCH 3/7] commit

---
 app/src/main/java/com/implude/tutorial/intent/MainActivity.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
index 2abb03c..f3d9e83 100644
--- a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
+++ b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
@@ -11,6 +11,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         val btn_open=findViewById<Button>(R.id.btn_open)
+        val a=1
 
         btn_open.setOnClickListener{
             startActivity(Intent(this, AnotherActivity::class.java))

From 82e19f144b9bc4550141b92b36c88e359d176765 Mon Sep 17 00:00:00 2001
From: fhfhfhfhgpdl <81856603+fhfhfhfhgpdl@users.noreply.github.com>
Date: Thu, 10 Jun 2021 15:37:20 +0900
Subject: [PATCH 4/7] commit

---
 app/src/main/java/com/implude/tutorial/intent/MainActivity.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
index f3d9e83..2abb03c 100644
--- a/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
+++ b/app/src/main/java/com/implude/tutorial/intent/MainActivity.kt
@@ -11,7 +11,6 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         val btn_open=findViewById<Button>(R.id.btn_open)
-        val a=1
 
         btn_open.setOnClickListener{
             startActivity(Intent(this, AnotherActivity::class.java))

From c889bc07139656bf061f9052535080b6f1307bc2 Mon Sep 17 00:00:00 2001
From: fhfhfhfhgpdl <81856603+fhfhfhfhgpdl@users.noreply.github.com>
Date: Tue, 15 Jun 2021 12:01:10 +0900
Subject: [PATCH 5/7] commit

---
 .../com/implude/tutorial/intent/AnotherActivity.kt     |  6 ++++++
 app/src/main/res/layout/activity_another.xml           | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt b/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
index 5f8c6fd..6beb235 100644
--- a/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
+++ b/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
@@ -1,13 +1,19 @@
 package com.implude.tutorial.intent
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 
 class AnotherActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_another)
 
+        val go_back=findViewById<Button>(R.id.go_back)
 
+        go_back.setOnClickListener{
+            startActivity(Intent(this, MainActivity::class.java))
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_another.xml b/app/src/main/res/layout/activity_another.xml
index cb42563..c675513 100644
--- a/app/src/main/res/layout/activity_another.xml
+++ b/app/src/main/res/layout/activity_another.xml
@@ -17,6 +17,14 @@
         android:textSize="50dp"
         ></TextView>
 
-
+    <Button
+        android:id="@+id/go_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Back"
+        tools:ignore="MissingConstraints"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"></Button>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From ecfb12c2ba278e994e31413765aca30c02db81c0 Mon Sep 17 00:00:00 2001
From: fhfhfhfhgpdl <81856603+fhfhfhfhgpdl@users.noreply.github.com>
Date: Tue, 15 Jun 2021 12:25:18 +0900
Subject: [PATCH 6/7] commit

---
 app/src/main/res/layout/activity_another.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_another.xml b/app/src/main/res/layout/activity_another.xml
index c675513..f0a819f 100644
--- a/app/src/main/res/layout/activity_another.xml
+++ b/app/src/main/res/layout/activity_another.xml
@@ -14,7 +14,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:textSize="50dp"
+        android:textSize="25dp"
         ></TextView>
 
     <Button

From c49f8604eae6799e2d701b1ad84001b0d1fcb219 Mon Sep 17 00:00:00 2001
From: fhfhfhfhgpdl <81856603+fhfhfhfhgpdl@users.noreply.github.com>
Date: Tue, 15 Jun 2021 21:33:34 +0900
Subject: [PATCH 7/7] Revert "intend-tutorial"

---
 .../com/implude/tutorial/intent/AnotherActivity.kt   |  6 ------
 app/src/main/res/layout/activity_another.xml         | 12 ++----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt b/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
index 6beb235..5f8c6fd 100644
--- a/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
+++ b/app/src/main/java/com/implude/tutorial/intent/AnotherActivity.kt
@@ -1,19 +1,13 @@
 package com.implude.tutorial.intent
 
-import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Button
 
 class AnotherActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_another)
 
-        val go_back=findViewById<Button>(R.id.go_back)
 
-        go_back.setOnClickListener{
-            startActivity(Intent(this, MainActivity::class.java))
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_another.xml b/app/src/main/res/layout/activity_another.xml
index f0a819f..cb42563 100644
--- a/app/src/main/res/layout/activity_another.xml
+++ b/app/src/main/res/layout/activity_another.xml
@@ -14,17 +14,9 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:textSize="25dp"
+        android:textSize="50dp"
         ></TextView>
 
-    <Button
-        android:id="@+id/go_back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Back"
-        tools:ignore="MissingConstraints"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"></Button>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file