[Chore/#35] 코드정렬

Team-Umbba · Jul 10, 2023 · eb511ac · eb511ac
1 parent 25223ea
commit eb511ac
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 48 deletions.
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InputInfoActivity.kt
@@ -6,15 +6,16 @@ import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivityInputInfoBinding
 import com.sopt.umbba_android.util.binding.BindingActivity
 
-class InputInfoActivity : BindingActivity<ActivityInputInfoBinding>(R.layout.activity_input_info), View.OnClickListener  {
+class InputInfoActivity : BindingActivity<ActivityInputInfoBinding>(R.layout.activity_input_info),
+    View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.clickListener=this
+        binding.clickListener = this
     }
 
     override fun onClick(view: View?) {
-        when(view?.id){
-            R.id.iv_basic_back->finish()
+        when (view?.id) {
+            R.id.iv_basic_back -> finish()
         }
     }
 }
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/QuestActivity.kt
@@ -7,18 +7,19 @@ import androidx.fragment.app.Fragment
 import com.sopt.umbba_android.databinding.ActivityQuestBinding
 import com.sopt.umbba_android.util.binding.BindingActivity
 
-class QuestActivity : BindingActivity<ActivityQuestBinding>(R.layout.activity_quest), View.OnClickListener
-{
+class QuestActivity : BindingActivity<ActivityQuestBinding>(R.layout.activity_quest),
+    View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         changeFragment(QuestSubFragment())
     }
 
     override fun onClick(view: View?) {
-        when(view?.id){
-            R.id.iv_basic_back->finish()
+        when (view?.id) {
+            R.id.iv_basic_back -> finish()
         }
     }
+
     private fun changeFragment(fragment: Fragment) {
         supportFragmentManager.beginTransaction()
             .add(R.id.fragment_question, fragment)

diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/qna/AnswerActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/qna/AnswerActivity.kt
@@ -6,15 +6,17 @@ import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivityAnswerBinding
 import com.sopt.umbba_android.util.binding.BindingActivity
 
-class AnswerActivity: BindingActivity<ActivityAnswerBinding>(R.layout.activity_answer), View.OnClickListener {
+class AnswerActivity : BindingActivity<ActivityAnswerBinding>(R.layout.activity_answer),
+    View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.clickListener=this
+        binding.clickListener = this
     }
+
     override fun onClick(view: View?) {
-        when(view?.id){
-            R.id.iv_qna_back-> TODO("진짜 뒤로갈거냐는 Dialog 띄우기 ")
-            R.id.iv_check-> TODO("답변 이거 맞냐고 확인하는 Dialog 띄우기")
+        when (view?.id) {
+            R.id.iv_qna_back -> TODO("진짜 뒤로갈거냐는 Dialog 띄우기 ")
+            R.id.iv_check -> TODO("답변 이거 맞냐고 확인하는 Dialog 띄우기")
         }
     }
 }
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/setting/DeleteAccountActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/setting/DeleteAccountActivity.kt
@@ -6,15 +6,17 @@ import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivityDeleteAccountBinding
 import com.sopt.umbba_android.util.binding.BindingActivity
 
-class DeleteAccountActivity : BindingActivity<ActivityDeleteAccountBinding>(R.layout.activity_delete_account),
-    View.OnClickListener{
+class DeleteAccountActivity :
+    BindingActivity<ActivityDeleteAccountBinding>(R.layout.activity_delete_account),
+    View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.clickListener=this
+        binding.clickListener = this
     }
+
     override fun onClick(view: View?) {
-        when(view?.id){
-            R.id.iv_basic_back->{
+        when (view?.id) {
+            R.id.iv_basic_back -> {
                 finish()
             }
         }

diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/setting/SettingFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/setting/SettingFragment.kt
@@ -7,17 +7,18 @@ import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.FragmentSettingBinding
 import com.sopt.umbba_android.util.binding.BindingFragment
 
-class SettingFragment:BindingFragment<FragmentSettingBinding>(R.layout.fragment_setting) {
+class SettingFragment : BindingFragment<FragmentSettingBinding>(R.layout.fragment_setting) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setClickEvent()
     }
-    private fun setClickEvent(){
-        with(binding){
+
+    private fun setClickEvent() {
+        with(binding) {
             clManageAccount.setOnClickListener {
-                startActivity(Intent(requireActivity(),ManageAccountActivity::class.java))
+                startActivity(Intent(requireActivity(), ManageAccountActivity::class.java))
             }
-            clAboutUmbba.setOnClickListener{
+            clAboutUmbba.setOnClickListener {
                 TODO("엄빠소개 노션으로 이동하도록 만들기. Uri 연결하기")
             }
             clTos.setOnClickListener {

diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml
@@ -23,10 +23,10 @@
         <include
             android:id="@+id/layout_appbar"
             layout="@layout/basic_appbar"
+            app:clickListener="@{clickListener}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:clickListener="@{clickListener}"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/sv_introduce_user"

diff --git a/app/src/main/res/layout/activity_invite_code.xml b/app/src/main/res/layout/activity_invite_code.xml
@@ -2,6 +2,7 @@
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
+
         <variable
             name="clickListener"
             type="android.view.View.OnClickListener" />
@@ -20,11 +21,11 @@
         <include
             android:id="@+id/layout_appbar"
             layout="@layout/basic_appbar"
+            app:clickListener="@{clickListener}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:titleText="@{`초대코드 입력`}"
-            app:clickListener="@{clickListener}"/>
+            app:titleText="@{`초대코드 입력`}" />
 
         <TextView
             android:id="@+id/tv_title"

diff --git a/app/src/main/res/layout/activity_manage_account.xml b/app/src/main/res/layout/activity_manage_account.xml
@@ -9,7 +9,7 @@
 
         <variable
             name="clickListener"
-            type="android.view.View.OnClickListener"/>
+            type="android.view.View.OnClickListener" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -20,8 +20,8 @@
         <include
             android:id="@+id/layout_appbar"
             layout="@layout/basic_appbar"
-            app:titleText="@{`계정 관리`}"
-            app:clickListener="@{clickListener}" />
+            app:clickListener="@{clickListener}"
+            app:titleText="@{`계정 관리`}" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_logout"

diff --git a/app/src/main/res/layout/activity_notify_time.xml b/app/src/main/res/layout/activity_notify_time.xml
@@ -6,6 +6,7 @@
         <variable
             name="titleText"
             type="String" />
+
         <variable
             name="clickListener"
             type="android.view.View.OnClickListener" />
@@ -19,7 +20,7 @@
         <include
             android:id="@+id/layout_appbar"
             layout="@layout/basic_appbar"
-            app:clickListener="@{clickListener}"/>
+            app:clickListener="@{clickListener}" />
 
         <TextView
             android:id="@+id/tv_timemachine_description"

diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml
@@ -21,7 +21,7 @@
         <include
             android:id="@+id/layout_appbar"
             layout="@layout/basic_appbar"
-            app:clickListener="@{clickListener}"/>
+            app:clickListener="@{clickListener}" />
 
         <TextView
             android:id="@+id/tv_title"

diff --git a/app/src/main/res/layout/activity_set_time.xml b/app/src/main/res/layout/activity_set_time.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="clickListener"
             type="android.view.View.OnClickListener" />

diff --git a/app/src/main/res/layout/fragment_back_answer_dialog.xml b/app/src/main/res/layout/fragment_back_answer_dialog.xml
@@ -31,8 +31,8 @@
             android:layout_marginHorizontal="33dp"
             android:layout_marginTop="24dp"
             android:layout_marginBottom="24dp"
-            app:layout_constraintTop_toBottomOf="@id/tv_confirm"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_confirm">
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_cancel"

diff --git a/app/src/main/res/layout/fragment_invite_code_dialog.xml b/app/src/main/res/layout/fragment_invite_code_dialog.xml
@@ -52,11 +52,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@string/copy_invite_code"
-            android:textColor="@color/primary_500"
+            android:background="@drawable/shape_pri500_stroke_r56_rect"
             android:paddingHorizontal="16dp"
             android:paddingVertical="6dp"
-            android:background="@drawable/shape_pri500_stroke_r56_rect"
+            android:text="@string/copy_invite_code"
+            android:textColor="@color/primary_500"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_invite_code_image" />
@@ -78,14 +78,14 @@
             style="@style/AndroidBody1_2Regular16"
             android:layout_width="match_parent"
             android:layout_height="48dp"
-            android:background="@drawable/shape_pri500_btn_r50_rect"
-            android:text="@string/send_invitation"
-            android:textColor="@color/umbba_white"
-            android:stateListAnimator="@null"
             android:layout_marginHorizontal="32dp"
             android:layout_marginTop="40dp"
             android:layout_marginBottom="32dp"
-            app:layout_constraintTop_toBottomOf="@id/tv_invite_code"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            android:background="@drawable/shape_pri500_btn_r50_rect"
+            android:stateListAnimator="@null"
+            android:text="@string/send_invitation"
+            android:textColor="@color/umbba_white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_invite_code" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
@@ -10,8 +10,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".presentation.list.ListFragment"
-        android:background="@color/umbba_white">
+        android:background="@color/umbba_white"
+        tools:context=".presentation.list.ListFragment">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_image"

diff --git a/app/src/main/res/layout/item_question_list.xml b/app/src/main/res/layout/item_question_list.xml
@@ -23,8 +23,8 @@
         style="@style/AndroidBody1_2Regular16"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/umbba_black"
         android:layout_marginStart="12dp"
+        android:textColor="@color/umbba_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/tv_title_number"
         app:layout_constraintTop_toTopOf="parent"

diff --git a/app/src/main/res/layout/qna_appbar.xml b/app/src/main/res/layout/qna_appbar.xml
@@ -39,8 +39,8 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="16dp"
-                    android:src="@drawable/ic_arrow_back"
                     android:onClick="@{clickListener}"
+                    android:src="@drawable/ic_arrow_back"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -74,8 +74,8 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_check"
                     android:onClick="@{clickListener}"
+                    android:src="@drawable/ic_check"
                     android:visibility="@{visibleCheck ? View.VISIBLE : View.GONE }"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"