diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aaafd46..14496f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,8 @@ android:exported="true" android:screenOrientation="portrait" android:label="@string/app_name" - android:theme="@style/Theme.Owori"> + android:theme="@style/Theme.Owori" + android:windowSoftInputMode="adjustResize"> diff --git a/app/src/main/java/com/owori/android/presenter/login/LoginFragment.kt b/app/src/main/java/com/owori/android/presenter/login/LoginFragment.kt index a8568a0..90981b6 100644 --- a/app/src/main/java/com/owori/android/presenter/login/LoginFragment.kt +++ b/app/src/main/java/com/owori/android/presenter/login/LoginFragment.kt @@ -26,11 +26,11 @@ class LoginFragment : BaseFragment(R.layou with(viewModel) { // TODO : PolicyFragment를 위해 작성한 부분이라 수정 필요. callKakaoLogin.observe(viewLifecycleOwner) { - navigateTo(R.id.action_loginFragment_to_PolicyFragment) + navigateTo(R.id.action_LoginFragment_to_nickNameFragment) } callGoogleLogin.observe(viewLifecycleOwner) { - navigateTo(R.id.action_loginFragment_to_PolicyFragment) + navigateTo(R.id.action_LoginFragment_to_nickNameFragment) } } } diff --git a/app/src/main/java/com/owori/android/presenter/onboarding/AgreeAutoLoginFragment.kt b/app/src/main/java/com/owori/android/presenter/onboarding/AgreeAutoLoginFragment.kt new file mode 100644 index 0000000..30e6781 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/onboarding/AgreeAutoLoginFragment.kt @@ -0,0 +1,26 @@ +package com.owori.android.auth.ui.view + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import com.owori.android.R +import com.owori.android.databinding.FragmentAgreeAutoLoginBinding + + +class AgreeAutoLoginFragment: BottomSheetDialogFragment() { + + private lateinit var binding: FragmentAgreeAutoLoginBinding + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + binding = FragmentAgreeAutoLoginBinding.inflate(inflater, container, false) + return binding.root + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionFragment.kt b/app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionFragment.kt new file mode 100644 index 0000000..90190c0 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionFragment.kt @@ -0,0 +1,23 @@ +package com.owori.android.presenter.policy + +import androidx.fragment.app.viewModels +import com.owori.android.R +import com.owori.android.core.BaseFragment +import com.owori.android.databinding.FragmentAgreeServiceConditionBinding + +class AgreeServiceConditionFragment : BaseFragment(R.layout.fragment_agree_service_condition) { + override val viewModel: AgreeServiceConditionViewModel by viewModels() + override fun setBindingVariables() { + with(binding) { + vm = viewModel + } + } + + override fun initView() { + + } + + override fun initObserver() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionViewModel.kt b/app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionViewModel.kt new file mode 100644 index 0000000..904d7d0 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/AgreeServiceConditionViewModel.kt @@ -0,0 +1,17 @@ +package com.owori.android.presenter.policy + +import androidx.lifecycle.LiveData +import com.owori.android.core.BaseViewModel +import com.owori.android.presenter.util.SingleLiveEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class AgreeServiceConditionViewModel @Inject constructor(): BaseViewModel() { + private val _btnNext: SingleLiveEvent = SingleLiveEvent() + val btnNext: LiveData = _btnNext + + fun onClickCheckButton() { + _btnNext.call() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/BirthDateFragment.kt b/app/src/main/java/com/owori/android/presenter/policy/BirthDateFragment.kt new file mode 100644 index 0000000..978e6ec --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/BirthDateFragment.kt @@ -0,0 +1,110 @@ +package com.owori.android.presenter.policy + + +import android.text.Editable +import android.text.TextWatcher +import androidx.core.content.ContextCompat +import androidx.fragment.app.viewModels +import com.owori.android.R +import com.owori.android.core.BaseFragment +import com.owori.android.core.navigateTo +import com.owori.android.databinding.FragmentBirthDateBinding + + +class BirthDateFragment : BaseFragment(R.layout.fragment_birth_date) { + override val viewModel: BirthDateViewModel by viewModels() + override fun setBindingVariables() { + with(binding) { + vm = viewModel + } + } + + override fun initView() { + initTextWatcher() + } + + override fun initObserver() { + with(viewModel) { + btnNext.observe(viewLifecycleOwner) { + navigateTo(R.id.action_birthDateFragment_to_familyConnectFragment) + } + + birthDate.observe(viewLifecycleOwner) { + val verify = it.split("-") + if(verify.size == 3) { + if(verify[0].length == 4 && verify[1].length == 2 && verify[2].length == 2) { + setButtonEnableTrue() + } else { + setButtonEnableFalse() + } + } else { + setButtonEnableFalse() + } + } + + btnBack.observe(viewLifecycleOwner) { + requireActivity().onBackPressedDispatcher.onBackPressed() + } + } + } + + private fun initTextWatcher() { + binding.birthdateEt.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + var textlength = 0 + if(binding.birthdateEt.isFocusable && s.toString() != "") { + try{ + textlength = binding.birthdateEt.text.toString().length + }catch (e: NumberFormatException){ + e.printStackTrace() + return + } + if (textlength == 4 && before != 1) { + val date = binding.birthdateEt.text.toString()+"-" + binding.birthdateEt.setText(date) + binding.birthdateEt.setSelection(binding.birthdateEt.text.length) + + }else if (textlength == 7&& before != 1){ + val date = binding.birthdateEt.text.toString()+"-" + binding.birthdateEt.setText(date) + binding.birthdateEt.setSelection(binding.birthdateEt.text.length) + + }else if(textlength == 5 && !binding.birthdateEt.text.toString().contains("-") && + !binding.birthdateEt.text.toString().substring(0,4).contains('-')){ + val date = binding.birthdateEt.text.toString().substring(0,4)+"-"+binding.birthdateEt.text.toString().substring(4) + binding.birthdateEt.setText(date) + binding.birthdateEt.setSelection(binding.birthdateEt.text.length) + + }else if(textlength == 8 && binding.birthdateEt.text.toString().substring(7,8) != "-" && + !binding.birthdateEt.text.toString().substring(0,4).contains('-') && + !binding.birthdateEt.text.toString().substring(5,8).contains('-') && + !binding.birthdateEt.text.toString().substring(5).contains('-')){ + val date = binding.birthdateEt.text.toString().substring(0,7)+"-"+binding.birthdateEt.text.toString().substring(7) + binding.birthdateEt.setText(date) + binding.birthdateEt.setSelection(binding.birthdateEt.text.length) + } + } + } + + override fun afterTextChanged(s: Editable?) { + } + + }) + } + + private fun setButtonEnableTrue() { + with(binding.viewpagerButton) { + isEnabled = true + setTextColor(ContextCompat.getColor(requireContext(), R.color.white)) + } + } + + private fun setButtonEnableFalse() { + with(binding.viewpagerButton) { + isEnabled = false + setTextColor(ContextCompat.getColor(requireContext(), R.color.grey_909090)) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/BirthDateViewModel.kt b/app/src/main/java/com/owori/android/presenter/policy/BirthDateViewModel.kt new file mode 100644 index 0000000..9cad638 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/BirthDateViewModel.kt @@ -0,0 +1,27 @@ +package com.owori.android.presenter.policy + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import com.owori.android.core.BaseViewModel +import com.owori.android.presenter.util.SingleLiveEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class BirthDateViewModel @Inject constructor(): BaseViewModel() { + private val _btnNext: SingleLiveEvent = SingleLiveEvent() + val btnNext: LiveData = _btnNext + private val _btnBack: SingleLiveEvent = SingleLiveEvent() + val btnBack: LiveData = _btnBack + + val _birthDate: MutableLiveData = MutableLiveData("") + val birthDate: LiveData = _birthDate + + fun onClickCheckButton() { + _btnNext.call() + } + + fun onClickBackButton() { + _btnBack.call() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/FamilyConnectFragment.kt b/app/src/main/java/com/owori/android/presenter/policy/FamilyConnectFragment.kt new file mode 100644 index 0000000..ee5dc4c --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/FamilyConnectFragment.kt @@ -0,0 +1,33 @@ +package com.owori.android.presenter.policy + + +import androidx.fragment.app.viewModels +import com.owori.android.R +import com.owori.android.core.BaseFragment +import com.owori.android.core.navigateTo +import com.owori.android.databinding.FragmentFamilyConnectBinding + + +class FamilyConnectFragment : BaseFragment(R.layout.fragment_family_connect) { + override val viewModel: FamilyConnectViewModel by viewModels() + override fun setBindingVariables() { + with(binding) { + vm = viewModel + } + } + + override fun initView() { + + } + + override fun initObserver() { + with(viewModel) { + returnLogin.observe(viewLifecycleOwner) { + navigateTo(R.id.action_familyConnectFragment_to_inputFamilyCodeFragment) + } + btnNext.observe(viewLifecycleOwner) { + navigateTo(R.id.action_familyConnectFragment_to_groupFragment) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/FamilyConnectViewModel.kt b/app/src/main/java/com/owori/android/presenter/policy/FamilyConnectViewModel.kt new file mode 100644 index 0000000..88f2df4 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/FamilyConnectViewModel.kt @@ -0,0 +1,24 @@ +package com.owori.android.presenter.policy + +import androidx.lifecycle.LiveData +import com.owori.android.core.BaseViewModel +import com.owori.android.presenter.util.SingleLiveEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class FamilyConnectViewModel @Inject constructor(): BaseViewModel() { + + private val _btnNext: SingleLiveEvent = SingleLiveEvent() + val btnNext: LiveData = _btnNext + private val _returnLogin: SingleLiveEvent = SingleLiveEvent() + val returnLogin: LiveData = _returnLogin + + fun onClickCheckButton() { + _btnNext.call() + } + + fun onClickBackButton() { + _returnLogin.call() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/GroupFragment.kt b/app/src/main/java/com/owori/android/presenter/policy/GroupFragment.kt new file mode 100644 index 0000000..794d3f7 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/GroupFragment.kt @@ -0,0 +1,49 @@ +package com.owori.android.presenter.policy + + +import androidx.core.content.ContextCompat +import androidx.fragment.app.viewModels +import com.owori.android.R +import com.owori.android.core.BaseFragment +import com.owori.android.core.navigateTo +import com.owori.android.databinding.FragmentGroupBinding + + +class GroupFragment : BaseFragment(R.layout.fragment_group) { + override val viewModel: GroupViewModel by viewModels() + override fun setBindingVariables() { + with(binding) { + vm = viewModel + } + } + + override fun initView() { + + } + + override fun initObserver() { + with(viewModel) { + groupname.observe(viewLifecycleOwner) { + setViewPagerButton(it) + } + btnNext.observe(viewLifecycleOwner) { + navigateTo(R.id.action_groupFragment_to_shareCodeFragment) + } + btnBack.observe(viewLifecycleOwner) { + requireActivity().onBackPressedDispatcher.onBackPressed() + } + } + } + + private fun setViewPagerButton(groupname: String) { + val isInputted = groupname.isNotEmpty() + with(binding.viewpagerButton) { + isEnabled = isInputted + if(isInputted) { + setTextColor(ContextCompat.getColor(requireContext(), R.color.white)) + } else { + setTextColor(ContextCompat.getColor(requireContext(), R.color.grey_909090)) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/GroupViewModel.kt b/app/src/main/java/com/owori/android/presenter/policy/GroupViewModel.kt new file mode 100644 index 0000000..d4f1fe9 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/GroupViewModel.kt @@ -0,0 +1,27 @@ +package com.owori.android.presenter.policy + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import com.owori.android.core.BaseViewModel +import com.owori.android.presenter.util.SingleLiveEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class GroupViewModel @Inject constructor(): BaseViewModel() { + val _groupname: MutableLiveData = MutableLiveData("") + val groupname: LiveData = _groupname + + private val _btnNext: SingleLiveEvent = SingleLiveEvent() + val btnNext: LiveData = _btnNext + private val _btnBack: SingleLiveEvent = SingleLiveEvent() + val btnBack: LiveData = _btnBack + + fun onClickCheckButton() { + _btnNext.call() + } + + fun onClickBackButton() { + _btnBack.call() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/InputFamilyCodeFragment.kt b/app/src/main/java/com/owori/android/presenter/policy/InputFamilyCodeFragment.kt new file mode 100644 index 0000000..9921dfa --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/InputFamilyCodeFragment.kt @@ -0,0 +1,30 @@ +package com.owori.android.presenter.policy + + +import androidx.fragment.app.viewModels +import com.owori.android.R +import com.owori.android.core.BaseFragment +import com.owori.android.core.navigateTo +import com.owori.android.databinding.FragmentInputFamilyCodeBinding + + +class InputFamilyCodeFragment : BaseFragment(R.layout.fragment_input_family_code) { + override val viewModel: InputFamilyCodeViewModel by viewModels() + override fun setBindingVariables() { + with(binding) { + vm = viewModel + } + } + + override fun initView() { + + } + + override fun initObserver() { + with(viewModel) { + btnNext.observe(viewLifecycleOwner) { + navigateTo(R.id.action_inputFamilyCodeFragment_to_agreeServiceConditionFragment) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/InputFamilyCodeViewModel.kt b/app/src/main/java/com/owori/android/presenter/policy/InputFamilyCodeViewModel.kt new file mode 100644 index 0000000..dc3472d --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/InputFamilyCodeViewModel.kt @@ -0,0 +1,17 @@ +package com.owori.android.presenter.policy + +import androidx.lifecycle.LiveData +import com.owori.android.core.BaseViewModel +import com.owori.android.presenter.util.SingleLiveEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class InputFamilyCodeViewModel @Inject constructor(): BaseViewModel() { + private val _btnNext: SingleLiveEvent = SingleLiveEvent() + val btnNext: LiveData = _btnNext + + fun onClickCheckButton() { + _btnNext.call() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/NickNameFragment.kt b/app/src/main/java/com/owori/android/presenter/policy/NickNameFragment.kt new file mode 100644 index 0000000..dfb6d16 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/NickNameFragment.kt @@ -0,0 +1,51 @@ +package com.owori.android.presenter.policy + + +import androidx.core.content.ContextCompat +import androidx.fragment.app.viewModels +import com.owori.android.R +import com.owori.android.core.BaseFragment +import com.owori.android.core.navigateTo +import com.owori.android.databinding.FragmentNickNameBinding +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class NickNameFragment: BaseFragment(R.layout.fragment_nick_name) { + override val viewModel: NickNameViewModel by viewModels() + override fun setBindingVariables() { + with(binding) { + vm = viewModel + } + } + + override fun initView() { + + } + + override fun initObserver() { + with(viewModel) { + nickname.observe(viewLifecycleOwner) { + setViewPagerButton(it) + } + + returnLogin.observe(viewLifecycleOwner) { + requireActivity().onBackPressedDispatcher.onBackPressed() + } + btnNext.observe(viewLifecycleOwner) { + navigateTo(R.id.action_nickNameFragment_to_birthDateFragment) + } + } + } + + fun setViewPagerButton(nickname: String) { + val isInputted = nickname.isNotEmpty() + with(binding.viewpagerButton) { + isEnabled = isInputted + if(isInputted) { + setTextColor(ContextCompat.getColor(requireContext(), R.color.white)) + } else { + setTextColor(ContextCompat.getColor(requireContext(), R.color.grey_909090)) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/NickNameViewModel.kt b/app/src/main/java/com/owori/android/presenter/policy/NickNameViewModel.kt new file mode 100644 index 0000000..cbda814 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/NickNameViewModel.kt @@ -0,0 +1,27 @@ +package com.owori.android.presenter.policy + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import com.owori.android.core.BaseViewModel +import com.owori.android.presenter.util.SingleLiveEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class NickNameViewModel @Inject constructor(): BaseViewModel(){ + val _nickname: MutableLiveData = MutableLiveData("") + val nickname: LiveData = _nickname + + private val _returnLogin: SingleLiveEvent = SingleLiveEvent() + val returnLogin: LiveData = _returnLogin + private val _btnNext: SingleLiveEvent = SingleLiveEvent() + val btnNext: LiveData = _btnNext + + fun onClickCheckButton() { + _btnNext.call() + } + + fun onClickBackButton() { + _returnLogin.call() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/ShareCodeFragment.kt b/app/src/main/java/com/owori/android/presenter/policy/ShareCodeFragment.kt new file mode 100644 index 0000000..4ed6f59 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/ShareCodeFragment.kt @@ -0,0 +1,63 @@ +package com.owori.android.presenter.policy + + +import android.content.Intent +import android.text.SpannableStringBuilder +import android.text.Spanned +import android.text.style.ForegroundColorSpan +import androidx.core.content.ContextCompat +import androidx.fragment.app.viewModels +import com.owori.android.R +import com.owori.android.core.BaseFragment +import com.owori.android.core.navigateTo +import com.owori.android.databinding.FragmentShareCodeBinding + + +class ShareCodeFragment : BaseFragment(R.layout.fragment_share_code) { + override val viewModel: ShareCodeViewModel by viewModels() + override fun setBindingVariables() { + with(binding) { + vm = viewModel + } + } + + override fun initView() { + initTextEmphasis() + initClickListener() + } + + private fun initClickListener() { + binding.viewpagerButton.setOnClickListener { + navigateTo(R.id.action_shareCodeFragment_to_agreeServiceConditionFragment) + } + binding.shareCodeButton.setOnClickListener { + val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply { + type = SHARE_CODE_TYPE + putExtra(Intent.EXTRA_TEXT, binding.shareCodeText.text.toString()) + } + startActivity(Intent.createChooser(intent, "아무 제목")) + } + binding.imgCancel.setOnClickListener { + requireActivity().onBackPressedDispatcher.onBackPressed() + } + } + + private fun initTextEmphasis() { + val builder = SpannableStringBuilder(binding.shareCodeExplain.text.toString()) + val color9090Span1 = ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.grey_909090)) + val color9090Span2 = ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.grey_909090)) + builder.setSpan(color9090Span1, FIST_EMPHASIS_PART_START, FIST_EMPHASIS_PART_END, Spanned.SPAN_INCLUSIVE_INCLUSIVE) + builder.setSpan(color9090Span2, LAST_EMPHASIS_PART_START, LAST_EMPHASIS_PART_END, Spanned.SPAN_INCLUSIVE_INCLUSIVE) + binding.shareCodeExplain.text = builder + } + + override fun initObserver() = Unit + + companion object { + private const val FIST_EMPHASIS_PART_START = 12 + private const val FIST_EMPHASIS_PART_END = 19 + private const val LAST_EMPHASIS_PART_START = 48 + private const val LAST_EMPHASIS_PART_END =70 + private const val SHARE_CODE_TYPE = "text/plain" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/policy/ShareCodeViewModel.kt b/app/src/main/java/com/owori/android/presenter/policy/ShareCodeViewModel.kt new file mode 100644 index 0000000..b01c7a6 --- /dev/null +++ b/app/src/main/java/com/owori/android/presenter/policy/ShareCodeViewModel.kt @@ -0,0 +1,57 @@ +package com.owori.android.presenter.policy + +import android.os.CountDownTimer +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.viewModelScope +import com.owori.android.core.BaseViewModel +import com.owori.android.presenter.util.SingleLiveEvent +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.CoroutineStart +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import javax.inject.Inject + +@HiltViewModel +class ShareCodeViewModel @Inject constructor() : BaseViewModel() { + init { + val timer: CountDownTimer = object : CountDownTimer(MIllIS_IN_FUTURE, TICK_INTERVAL) { + override fun onTick(millisUntilFinished: Long) { + val minute = millisUntilFinished / MINUTE_UNIT + val second = millisUntilFinished % MINUTE_UNIT / SECOND_UNIT + _time.value = "${minute}:${second}" + timerJob.start() + } + + override fun onFinish() = Unit + }.start() + } + + private val _customTimerDuration: MutableLiveData = MutableLiveData(MIllIS_IN_FUTURE) + private var oldTimeMills: Long = 0 + private val _time = MutableLiveData("") + val timerJob: Job = viewModelScope.launch(start = CoroutineStart.LAZY) { + withContext(Dispatchers.IO) { + oldTimeMills = System.currentTimeMillis() + while (_customTimerDuration.value!! > ZERO_INTERVAL) { + val delayMills = System.currentTimeMillis() - oldTimeMills + if (delayMills == TICK_INTERVAL) { + _customTimerDuration.postValue(_customTimerDuration.value!! - delayMills) + oldTimeMills = System.currentTimeMillis() + } + } + } + } + val time: LiveData = _time + + + companion object { + private const val MIllIS_IN_FUTURE = 1800000L + private const val TICK_INTERVAL = 1000L + private const val MINUTE_UNIT = 60000L + private const val SECOND_UNIT = 1000L + private const val ZERO_INTERVAL = 0L + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owori/android/presenter/util/TextViewExtension.kt b/app/src/main/java/com/owori/android/presenter/util/TextViewExtension.kt index d1a0a67..395aeb0 100644 --- a/app/src/main/java/com/owori/android/presenter/util/TextViewExtension.kt +++ b/app/src/main/java/com/owori/android/presenter/util/TextViewExtension.kt @@ -26,3 +26,10 @@ fun TextView.setSubTitleText(currentItemIndex: Int) { ) } +@BindingAdapter("setTextLength") +fun TextView.setTextLength(text: String) { + setText( + text.length.toString() + ) +} + diff --git a/app/src/main/res/drawable/arrow_back.xml b/app/src/main/res/drawable/arrow_back.xml new file mode 100644 index 0000000..87a773f --- /dev/null +++ b/app/src/main/res/drawable/arrow_back.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/arrow_next.xml b/app/src/main/res/drawable/arrow_next.xml new file mode 100644 index 0000000..7709483 --- /dev/null +++ b/app/src/main/res/drawable/arrow_next.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/cancel_img.xml b/app/src/main/res/drawable/cancel_img.xml new file mode 100644 index 0000000..787ba07 --- /dev/null +++ b/app/src/main/res/drawable/cancel_img.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/check_btn_ripple.xml b/app/src/main/res/drawable/check_btn_ripple.xml new file mode 100644 index 0000000..ba659b0 --- /dev/null +++ b/app/src/main/res/drawable/check_btn_ripple.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/check_btn_selector.xml b/app/src/main/res/drawable/check_btn_selector.xml new file mode 100644 index 0000000..846f880 --- /dev/null +++ b/app/src/main/res/drawable/check_btn_selector.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/check_text_selector.xml b/app/src/main/res/drawable/check_text_selector.xml new file mode 100644 index 0000000..de50880 --- /dev/null +++ b/app/src/main/res/drawable/check_text_selector.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/close.png b/app/src/main/res/drawable/close.png new file mode 100644 index 0000000..a4dfab9 Binary files /dev/null and b/app/src/main/res/drawable/close.png differ diff --git a/app/src/main/res/drawable/color_check_button.xml b/app/src/main/res/drawable/color_check_button.xml new file mode 100644 index 0000000..846f880 --- /dev/null +++ b/app/src/main/res/drawable/color_check_button.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dot.png b/app/src/main/res/drawable/dot.png new file mode 100644 index 0000000..73aa0d5 Binary files /dev/null and b/app/src/main/res/drawable/dot.png differ diff --git a/app/src/main/res/drawable/family_code.png b/app/src/main/res/drawable/family_code.png new file mode 100644 index 0000000..baa3529 Binary files /dev/null and b/app/src/main/res/drawable/family_code.png differ diff --git a/app/src/main/res/drawable/family_connect_img.xml b/app/src/main/res/drawable/family_connect_img.xml new file mode 100644 index 0000000..6937443 --- /dev/null +++ b/app/src/main/res/drawable/family_connect_img.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/focused_agree.xml b/app/src/main/res/drawable/focused_agree.xml new file mode 100644 index 0000000..3ed01c7 --- /dev/null +++ b/app/src/main/res/drawable/focused_agree.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/focused_birthdate.xml b/app/src/main/res/drawable/focused_birthdate.xml new file mode 100644 index 0000000..5eb23c5 --- /dev/null +++ b/app/src/main/res/drawable/focused_birthdate.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/focused_connect.xml b/app/src/main/res/drawable/focused_connect.xml new file mode 100644 index 0000000..f6b94e6 --- /dev/null +++ b/app/src/main/res/drawable/focused_connect.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/focused_group.xml b/app/src/main/res/drawable/focused_group.xml new file mode 100644 index 0000000..03aecc6 --- /dev/null +++ b/app/src/main/res/drawable/focused_group.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/focused_nickname.xml b/app/src/main/res/drawable/focused_nickname.xml new file mode 100644 index 0000000..fc7ea31 --- /dev/null +++ b/app/src/main/res/drawable/focused_nickname.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/input_code_explain_background.xml b/app/src/main/res/drawable/input_code_explain_background.xml new file mode 100644 index 0000000..f7d3acc --- /dev/null +++ b/app/src/main/res/drawable/input_code_explain_background.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/make_code_background.xml b/app/src/main/res/drawable/make_code_background.xml new file mode 100644 index 0000000..8a8f9fd --- /dev/null +++ b/app/src/main/res/drawable/make_code_background.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/navigation_line.xml b/app/src/main/res/drawable/navigation_line.xml new file mode 100644 index 0000000..317fe1e --- /dev/null +++ b/app/src/main/res/drawable/navigation_line.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/no_background.xml b/app/src/main/res/drawable/no_background.xml new file mode 100644 index 0000000..71bc3f6 --- /dev/null +++ b/app/src/main/res/drawable/no_background.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/received_code_background.xml b/app/src/main/res/drawable/received_code_background.xml new file mode 100644 index 0000000..ed52708 --- /dev/null +++ b/app/src/main/res/drawable/received_code_background.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ripple_check_button.xml b/app/src/main/res/drawable/ripple_check_button.xml new file mode 100644 index 0000000..d638a07 --- /dev/null +++ b/app/src/main/res/drawable/ripple_check_button.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/round_bottomsheet.xml b/app/src/main/res/drawable/round_bottomsheet.xml new file mode 100644 index 0000000..fb23872 --- /dev/null +++ b/app/src/main/res/drawable/round_bottomsheet.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/share_code_background.xml b/app/src/main/res/drawable/share_code_background.xml new file mode 100644 index 0000000..34ff801 --- /dev/null +++ b/app/src/main/res/drawable/share_code_background.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/share_pricture.png b/app/src/main/res/drawable/share_pricture.png new file mode 100644 index 0000000..e07baab Binary files /dev/null and b/app/src/main/res/drawable/share_pricture.png differ diff --git a/app/src/main/res/drawable/ticket.xml b/app/src/main/res/drawable/ticket.xml new file mode 100644 index 0000000..a7f887d --- /dev/null +++ b/app/src/main/res/drawable/ticket.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/unfocused_agree.xml b/app/src/main/res/drawable/unfocused_agree.xml new file mode 100644 index 0000000..caaa112 --- /dev/null +++ b/app/src/main/res/drawable/unfocused_agree.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/unfocused_birthdate.xml b/app/src/main/res/drawable/unfocused_birthdate.xml new file mode 100644 index 0000000..eb48e1e --- /dev/null +++ b/app/src/main/res/drawable/unfocused_birthdate.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/unfocused_connect.xml b/app/src/main/res/drawable/unfocused_connect.xml new file mode 100644 index 0000000..a0816c4 --- /dev/null +++ b/app/src/main/res/drawable/unfocused_connect.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/unfocused_group.xml b/app/src/main/res/drawable/unfocused_group.xml new file mode 100644 index 0000000..cb69f24 --- /dev/null +++ b/app/src/main/res/drawable/unfocused_group.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/unfocused_nickname.xml b/app/src/main/res/drawable/unfocused_nickname.xml new file mode 100644 index 0000000..cf450fd --- /dev/null +++ b/app/src/main/res/drawable/unfocused_nickname.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/layout/fragment_agree_auto_login.xml b/app/src/main/res/layout/fragment_agree_auto_login.xml new file mode 100644 index 0000000..da82706 --- /dev/null +++ b/app/src/main/res/layout/fragment_agree_auto_login.xml @@ -0,0 +1,71 @@ + + + + + + + +