Merge pull request #48 from Team-Umbba/feat/#46

[Feat/#46] 화면 연결 및 버튼 활성화

app/src/main/AndroidManifest.xml

@@ -15,13 +15,17 @@
  android:theme="@style/Theme.Umbbaandroid"
  tools:targetApi="31">
  <activity
- android:name=".presentation.login.AgreePrivacyUseActivity"
+ android:name=".presentation.onboarding.CommunicationActivity"
  android:exported="false"
  android:screenOrientation="portrait"/>
+ <activity
+ android:name=".presentation.login.AgreePrivacyUseActivity"
+ android:exported="false"
+ android:screenOrientation="portrait" />
  <activity
  android:name=".presentation.onboarding.OnboardingFinishActivity"
  android:exported="false"
- android:screenOrientation="portrait"/>
+ android:screenOrientation="portrait" />
  <activity
  android:name=".presentation.onboarding.SetTimeActivity"
  android:exported="false"

app/src/main/java/com/sopt/umbba_android/presentation/invite/InviteActivity.kt

@@ -1,13 +1,29 @@
 package com.sopt.umbba_android.presentation.invite
 
+import android.content.Intent
 import android.os.Bundle
 import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivityInviteBinding
+import com.sopt.umbba_android.presentation.onboarding.CommunicationActivity
 import com.sopt.umbba_android.util.binding.BindingActivity
 
 class InviteActivity : BindingActivity<ActivityInviteBinding>(R.layout.activity_invite) {
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
 
+ goCommunicationActivity()
+ goInviteCodeActivity()
+ }
+
+ private fun goCommunicationActivity() {
+ binding.btnStart.setOnClickListener {
+ startActivity(Intent(this, CommunicationActivity::class.java))
+ }
+ }
+
+ private fun goInviteCodeActivity() {
+ binding.btnInputCode.setOnClickListener {
+ startActivity(Intent(this, InviteCodeActivity::class.java))
+ }
  }
 }

app/src/main/java/com/sopt/umbba_android/presentation/login/AgreePrivacyUseActivity.kt

@@ -1,16 +1,17 @@
 package com.sopt.umbba_android.presentation.login
 
+import android.content.Intent
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.style.StyleSpan
 import android.text.util.Linkify
-import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivityAgreePrivacyUseBinding
+import com.sopt.umbba_android.presentation.invite.InviteActivity
 import com.sopt.umbba_android.util.binding.BindingActivity
 import java.util.regex.Pattern
 
@@ -19,8 +20,65 @@ class AgreePrivacyUseActivity : BindingActivity<ActivityAgreePrivacyUseBinding>(
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
 
+ clickAllAgreeButton()
+ clickCircleButton()
  setHyperLinkAndColorInTermsTextView()
  setHyperLinkAndColorInPrivacyTextView()
+ goInviteActivity()
+ }
+
+ private fun clickAllAgreeButton() {
+ with(binding) {
+ btnAllAgreeCheck.setOnClickListener {
+ btnAllAgreeCheck.isSelected = !btnAllAgreeCheck.isSelected
+ checkAllAgreeButton()
+ }
+ }
+ }
+
+ private fun checkAllAgreeButton() {
+ with(binding) {
+ if (btnAllAgreeCheck.isSelected) {
+ btnUp14.isSelected = true
+ btnAgreeTermsAndCondition.isSelected = true
+ btnAgreePrivacy.isSelected = true
+ btnNext.isEnabled = true
+ } else {
+ btnUp14.isSelected = false
+ btnAgreeTermsAndCondition.isSelected = false
+ btnAgreePrivacy.isSelected = false
+ btnNext.isEnabled = false
+ }
+ }
+ }
+
+ private fun clickCircleButton() {
+ with(binding) {
+ btnUp14.setOnClickListener {
+ btnUp14.isSelected = !btnUp14.isSelected
+ checkAllCircleButton()
+ }
+ btnAgreeTermsAndCondition.setOnClickListener {
+ btnAgreeTermsAndCondition.isSelected = !btnAgreeTermsAndCondition.isSelected
+ checkAllCircleButton()
+ }
+ btnAgreePrivacy.setOnClickListener {
+ btnAgreePrivacy.isSelected = !btnAgreePrivacy.isSelected
+ checkAllCircleButton()
+ }
+ }
+ }
+
+ private fun checkAllCircleButton() {
+ with(binding) {
+ if (btnUp14.isSelected && btnAgreeTermsAndCondition.isSelected && btnAgreePrivacy.isSelected) {
+ btnAllAgreeCheck.isSelected = true
+ btnNext.isEnabled = true
+ } else {
+ btnAllAgreeCheck.isSelected = false
+ btnNext.isEnabled = false
+ }
+ }
  }
 
  private fun setHyperLinkAndColorInTermsTextView() {
@@ -55,4 +113,10 @@ class AgreePrivacyUseActivity : BindingActivity<ActivityAgreePrivacyUseBinding>(
  sentence.setSpan(StyleSpan(Typeface.BOLD), 5, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
  view.text = sentence
  }
+
+ private fun goInviteActivity() {
+ binding.btnNext.setOnClickListener {
+ startActivity(Intent(this, InviteActivity::class.java))
+ }
+ }
 }

app/src/main/java/com/sopt/umbba_android/presentation/login/LoginActivity.kt

@@ -1,5 +1,6 @@
 package com.sopt.umbba_android.presentation.login
 
+import android.content.Intent
 import android.os.Bundle
 import com.sopt.umbba_android.R
 import com.sopt.umbba_android.databinding.ActivityLoginBinding
@@ -8,5 +9,18 @@ import com.sopt.umbba_android.util.binding.BindingActivity
 class LoginActivity : BindingActivity<ActivityLoginBinding>(R.layout.activity_login) {
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
+
+ loginWithKaKao()
+ }
+
+ private fun loginWithKaKao() {
+ //TODO("카카오 로그인 및 자동 로그인 진행")
+ goAgreePrivacyUseActivity()
+ }
+
+ private fun goAgreePrivacyUseActivity() {
+ binding.btnKakaoLogin.setOnClickListener {
+ startActivity(Intent(this, AgreePrivacyUseActivity::class.java))
+ }
  }
 }

app/src/main/java/com/sopt/umbba_android/presentation/onboarding/CommunicationActivity.kt

@@ -0,0 +1,21 @@
+package com.sopt.umbba_android.presentation.onboarding
+
+import android.content.Intent
+import android.os.Bundle
+import com.sopt.umbba_android.R
+import com.sopt.umbba_android.databinding.ActivityCommunicationBinding
+import com.sopt.umbba_android.util.binding.BindingActivity
+
+class CommunicationActivity : BindingActivity<ActivityCommunicationBinding>(R.layout.activity_communication) {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ goInputInfoActivity()
+ }
+
+ private fun goInputInfoActivity() {
+ binding.btnStart.setOnClickListener {
+ startActivity(Intent(this, InputInfoActivity::class.java))
+ }
+ }
+}

app/src/main/res/color/sel_btn_pri500_text.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/umbba_white" android:state_enabled="true" />
- <item android:color="@color/primary_500" android:state_enabled="false"/>
+ <item android:color="@color/umbba_white" android:state_enabled="false" />
+ <item android:color="@color/primary_500" android:state_enabled="true"/>
 </selector>

app/src/main/res/color/sel_btn_white_text.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/primary_500" android:state_enabled="false"/>
+ <item android:color="@color/umbba_white" android:state_enabled="true" />
+</selector>

app/src/main/res/drawable/sel_btn_agree.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_no_check_48" android:state_selected="false" />
+ <item android:drawable="@drawable/ic_check_48" android:state_selected="true" />
+</selector>

app/src/main/res/drawable/sel_btn_agree_circle.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_no_circle_check_48" android:state_selected="false" />
+ <item android:drawable="@drawable/ic_circle_check_48" android:state_selected="true" />
+</selector>

app/src/main/res/layout/activity_agree_privacy_use.xml

@@ -75,7 +75,8 @@
  android:layout_height="wrap_content"
  android:layout_marginTop="33dp"
  android:layout_marginEnd="28dp"
- android:src="@drawable/ic_no_check_48"
+ android:clickable="true"
+ android:src="@drawable/sel_btn_agree"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toBottomOf="@id/iv_line1" />
 
@@ -111,7 +112,8 @@
  android:layout_height="wrap_content"
  android:layout_marginTop="12dp"
  android:layout_marginEnd="28dp"
- android:src="@drawable/ic_no_circle_check_48"
+ android:clickable="true"
+ android:src="@drawable/sel_btn_agree_circle"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toBottomOf="@id/tv_all_agree_description" />
 
@@ -147,7 +149,8 @@
  android:layout_height="wrap_content"
  android:layout_marginTop="12dp"
  android:layout_marginEnd="28dp"
- android:src="@drawable/ic_no_circle_check_48"
+ android:clickable="true"
+ android:src="@drawable/sel_btn_agree_circle"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toBottomOf="@id/tv_up_14_description" />
 
@@ -156,20 +159,21 @@
  style="@style/AndroidBody2_2Regular12"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:text="@string/agree_privacy"
- android:textColor="@color/umbba_black"
  android:layout_marginStart="28dp"
  android:layout_marginTop="34dp"
- app:layout_constraintTop_toBottomOf="@id/tv_agree_terms_and_condition"
- app:layout_constraintStart_toStartOf="parent"/>
+ android:text="@string/agree_privacy"
+ android:textColor="@color/umbba_black"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_agree_terms_and_condition" />
 
  <ImageView
  android:id="@+id/btn_agree_privacy"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:src="@drawable/ic_no_circle_check_48"
- android:layout_marginEnd="28dp"
  android:layout_marginTop="17dp"
+ android:layout_marginEnd="28dp"
+ android:clickable="true"
+ android:src="@drawable/sel_btn_agree_circle"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintTop_toBottomOf="@id/tv_agree_terms_and_condition" />
 
@@ -178,14 +182,14 @@
  style="@style/AndroidCaptionRegular10"
  android:layout_width="0dp"
  android:layout_height="wrap_content"
- android:text="@string/agree_privacy_description"
- android:textColor="@color/grey_800"
- android:layout_marginTop="9dp"
  android:layout_marginStart="28dp"
+ android:layout_marginTop="9dp"
  android:layout_marginEnd="7dp"
- app:layout_constraintTop_toBottomOf="@id/tv_agree_privacy"
+ android:text="@string/agree_privacy_description"
+ android:textColor="@color/grey_800"
+ app:layout_constraintEnd_toStartOf="@id/btn_agree_privacy"
  app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@id/btn_agree_privacy"/>
+ app:layout_constraintTop_toBottomOf="@id/tv_agree_privacy" />
 
  <androidx.appcompat.widget.AppCompatButton
  android:id="@+id/btn_next"
@@ -197,7 +201,7 @@
  android:background="@drawable/sel_btn_next_agree"
  android:enabled="false"
  android:stateListAnimator="@null"
- android:text="@string/btn_start_code"
+ android:text="@string/btn_next"
  android:textColor="@color/sel_btn_pri500_text"
  app:layout_constraintBottom_toBottomOf="parent" />
  </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_communication.xml

@@ -0,0 +1,39 @@
+<?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">
+
+ <data>
+
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/black_opacity60"
+ tools:context=".presentation.onboarding.CommunicationActivity">
+
+ <ImageView
+ android:id="@+id/iv_communication"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <androidx.appcompat.widget.AppCompatButton
+ android:id="@+id/btn_start"
+ style="@style/AndroidBody3Bold16"
+ android:layout_width="match_parent"
+ android:layout_height="60dp"
+ android:layout_marginHorizontal="24dp"
+ android:layout_marginBottom="24dp"
+ android:background="@drawable/shape_gradient_btn_r50_rect"
+ android:enabled="true"
+ android:stateListAnimator="@null"
+ android:text="@string/answer_phone"
+ android:textColor="@color/white"
+ app:layout_constraintBottom_toBottomOf="parent" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/activity_invite.xml

@@ -51,7 +51,7 @@
  style="@style/AndroidBody3Bold16"
  android:layout_width="match_parent"
  android:layout_height="60dp"
- android:layout_marginHorizontal="21dp"
+ android:layout_marginHorizontal="24dp"
  android:layout_marginBottom="12dp"
  android:background="@drawable/shape_gradient_btn_r50_rect"
  android:enabled="true"
@@ -88,7 +88,7 @@
  android:id="@+id/btn_input_code"
  android:layout_width="match_parent"
  android:layout_height="60dp"
- android:layout_marginHorizontal="21dp"
+ android:layout_marginHorizontal="24dp"
  android:layout_marginVertical="24dp"
  android:background="@drawable/shape_pri500_btn_stroke_r50_rect"
  android:stateListAnimator="@null"

app/src/main/res/layout/activity_question_answer.xml

@@ -145,7 +145,7 @@
  android:background="@drawable/sel_btn_answer"
  android:stateListAnimator="@null"
  android:text="@string/btn_question_answer"
- android:textColor="@color/sel_btn_pri500_text"
+ android:textColor="@color/sel_btn_white_text"
  app:layout_constraintBottom_toBottomOf="parent" />
  </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>