[MOVE/#1] 패키지 정리 및 xml layout 태그 추가

GO-SOPT-ANDROID · Apr 3, 2023 · 3f1c66c · 3f1c66c
1 parent 56f262d
commit 3f1c66c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 33 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:theme="@style/Theme.GOSOPTAndroid"
         tools:targetApi="31">
         <activity
-            android:name=".LoginActivity"
+            android:name=".presentation.login.LoginActivity"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -22,7 +22,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
     </application>

diff --git a/...java/org/android/go/sopt/LoginActivity.kt → .../sopt/presentation/login/LoginActivity.kt b/...java/org/android/go/sopt/LoginActivity.kt → .../sopt/presentation/login/LoginActivity.kt
@@ -1,8 +1,10 @@
-package org.android.go.sopt
+package org.android.go.sopt.presentation.login
 
 import android.content.Intent
 import android.os.Bundle
+import org.android.go.sopt.R
 import org.android.go.sopt.databinding.ActivityLoginBinding
+import org.android.go.sopt.presentation.main.MainActivity
 import org.android.go.sopt.util.binding.BindingActivity
 import org.android.go.sopt.util.extension.setOnSingleClickListener
 

diff --git a/.../java/org/android/go/sopt/MainActivity.kt → ...go/sopt/presentation/main/MainActivity.kt b/.../java/org/android/go/sopt/MainActivity.kt → ...go/sopt/presentation/main/MainActivity.kt
@@ -1,7 +1,8 @@
-package org.android.go.sopt
+package org.android.go.sopt.presentation.main
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import org.android.go.sopt.R
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout 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"
+    tools:context=".presentation.login.LoginActivity">
 
     <data>
 
@@ -11,8 +12,7 @@
         android:id="@+id/layout_login"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingHorizontal="40dp"
-        tools:context=".LoginActivity">
+        android:paddingHorizontal="40dp">
 
         <TextView
             android:id="@+id/tv_login_welcome_msg"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,32 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout 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:id="@+id/layout_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.main.MainActivity">
 
-    <TextView
-        android:id="@+id/tv_test1"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:gravity="center"
-        android:text="@string/main_test"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/tv_test2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <data>
 
-    <TextView
-        android:id="@+id/tv_test2"
-        android:layout_width="100dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:text="@string/main_test"
-        app:layout_constraintBottom_toBottomOf="@id/tv_test1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tv_test1"
-        app:layout_constraintTop_toTopOf="@id/tv_test1" />
+    </data>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/tv_test1"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:gravity="center"
+            android:text="@string/main_test"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tv_test2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_test2"
+            android:layout_width="100dp"
+            android:layout_height="0dp"
+            android:gravity="center"
+            android:text="@string/main_test"
+            app:layout_constraintBottom_toBottomOf="@id/tv_test1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/tv_test1"
+            app:layout_constraintTop_toTopOf="@id/tv_test1" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>