From 6c7b7323c85ca6222464605d847a70f4b622a8c1 Mon Sep 17 00:00:00 2001
From: jinsu4755 <parkjinsu4755@gmail.com>
Date: Wed, 30 Dec 2020 14:56:11 +0900
Subject: [PATCH] =?UTF-8?q?[Fix]=20rebase...=20=EA=B8=89=ED=95=98=EA=B2=8C?=
 =?UTF-8?q?=20=ED=95=98=EB=8A=94=20=EC=BB=A4=EB=B0=8B=EC=9D=B4=EB=9D=BC=20?=
 =?UTF-8?q?=EC=B0=B8=EA=B3=A0=ED=95=98=EC=A7=80=20=EB=A7=88=EC=85=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   8 +-
 .../practicegitanddatabinding/MainActivity.kt |  44 ++++----
 app/src/main/res/layout/activity_main.xml     | 100 +++++++++---------
 3 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 70d63be..2b9d8a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,8 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'kotlin-kapt'
+    /*TODO step1 kotlin kapt 추가하기
+    *  코틀린 어노테이션을 사용하기 위함*/
 }
 
 android {
@@ -31,10 +32,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-
-    buildFeatures{
-        dataBinding = true
-    }
+    /*TODO step2 DataBinding 활성화 하기*/
 }
 
 dependencies {
diff --git a/app/src/main/java/sotp/semina/practicegitanddatabinding/MainActivity.kt b/app/src/main/java/sotp/semina/practicegitanddatabinding/MainActivity.kt
index 3097e6a..1b2442c 100644
--- a/app/src/main/java/sotp/semina/practicegitanddatabinding/MainActivity.kt
+++ b/app/src/main/java/sotp/semina/practicegitanddatabinding/MainActivity.kt
@@ -1,50 +1,46 @@
 package sotp.semina.practicegitanddatabinding
 
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 import android.widget.EditText
-import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.databinding.DataBindingUtil
 import com.bumptech.glide.Glide
-import sotp.semina.practicegitanddatabinding.databinding.ActivityMainBinding
-
+/*TODO step4 데이터 바인딩 직접 적용해보기.*/
 class MainActivity : AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val binding: ActivityMainBinding =
-            DataBindingUtil.setContentView(this, R.layout.activity_main)
-        initProfileImage(binding.imageProfileImage)
-        setProfileName(binding.textProfileName, DEFAULT_USER_NAME)
-        addButtonClickEvent(binding)
+        setContentView(R.layout.activity_main)
+        initView()
+    }
+
+    private fun initView() {
+        initProfileImage()
+        setProfileName(DEFAULT_USER_NAME)
+        addButtonClickEvent()
     }
 
-    private fun initProfileImage(profileImage: ImageView) {
+    private fun initProfileImage() {
         Glide.with(this)
             .load(IMAGE_URL)
-            .into(profileImage)
+            .into(findViewById(R.id.image_profile_image))
     }
 
-    private fun setProfileName(profileName: TextView, content: String) {
-        profileName.text = content
+    private fun setProfileName(content:String) {
+        findViewById<TextView>(R.id.text_profile_name).text = content
     }
 
-    private fun addButtonClickEvent(binding: ActivityMainBinding) {
-        binding.buttonProfileChangeButton.setOnClickListener {
-            setProfileName(
-                binding.textProfileName,
-                getEditTextToString(binding.inputChangedProfile)
-            )
+    private fun addButtonClickEvent() {
+        findViewById<Button>(R.id.button_profile_change_button).setOnClickListener {
+            setProfileName(getEditTextToString(findViewById(R.id.input_changed_profile)))
         }
     }
 
-    private fun getEditTextToString(content: EditText): String = content.text.toString()
+    private fun getEditTextToString(content:EditText):String = content.text.toString()
 
 
     companion object {
-        private const val IMAGE_URL =
-            "https://avatars3.githubusercontent.com/u/45380072?s=460&u=b9fc82996ec2cc568a7dfcbf8846944dc16a7ccd&v=4"
+        private const val IMAGE_URL = "https://avatars3.githubusercontent.com/u/45380072?s=460&u=b9fc82996ec2cc568a7dfcbf8846944dc16a7ccd&v=4"
         private const val DEFAULT_USER_NAME = "Default User Name"
     }
 }
\ 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 bf205fa..47724c3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<!--TODO step3 데이터 바인딩을 위한 레이아웃으로 감싸기-->
+<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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".MainActivity">
-
-        <ImageView
-            android:id="@+id/image_profile_image"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:layout_marginTop="100dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@mipmap/ic_launcher" />
+    <ImageView
+        android:id="@+id/image_profile_image"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_marginTop="100dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src = "@mipmap/ic_launcher"
+        />
 
-        <TextView
-            android:id="@+id/text_profile_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/image_profile_image"
-            tools:text="profile name" />
+    <TextView
+        android:id="@+id/text_profile_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/image_profile_image"
+        tools:text="profile name" />
 
-        <EditText
-            android:id="@+id/input_changed_profile"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_profile_name" />
+    <EditText
+        android:id="@+id/input_changed_profile"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_profile_name" />
 
-        <Button
-            android:id="@+id/button_profile_change_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:text="Change"
-            app:layout_constraintTop_toBottomOf="@+id/input_changed_profile" />
+    <Button
+        android:id="@+id/button_profile_change_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Change"
+        app:layout_constraintTop_toBottomOf="@+id/input_changed_profile" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file