-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/onboarding-#3
- Loading branch information
Showing
18 changed files
with
425 additions
and
273 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 0 additions & 21 deletions
21
app/src/main/java/com/dongyang/android/youdongknowme/function/SetSpanText.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
...c/main/java/com/dongyang/android/youdongknowme/ui/view/depart/OnboardingDepartActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| package com.dongyang.android.youdongknowme.ui.view.depart | ||
|
|
||
| import android.content.Intent | ||
| import androidx.recyclerview.widget.LinearLayoutManager | ||
| import com.dongyang.android.youdongknowme.R | ||
| import com.dongyang.android.youdongknowme.databinding.ActivityOnboardingDepartBinding | ||
| import com.dongyang.android.youdongknowme.standard.base.BaseActivity | ||
| import com.dongyang.android.youdongknowme.ui.adapter.DepartAdapter | ||
| import com.dongyang.android.youdongknowme.ui.view.keyword.OnboardingKeywordActivity | ||
| import com.dongyang.android.youdongknowme.ui.view.main.MainActivity | ||
| import org.koin.androidx.viewmodel.ext.android.viewModel | ||
|
|
||
| class OnboardingDepartActivity : BaseActivity<ActivityOnboardingDepartBinding, DepartViewModel>(), | ||
| DepartClickListener { | ||
|
|
||
| override val layoutResourceId: Int = R.layout.activity_onboarding_depart | ||
| override val viewModel: DepartViewModel by viewModel() | ||
| private lateinit var adapter: DepartAdapter | ||
| private lateinit var items: ArrayList<String> | ||
|
|
||
| override fun initStartView() { | ||
| viewModel.checkFirstLaunch() | ||
|
|
||
| items = | ||
| resources.getStringArray(R.array.dmu_department_list).toCollection(ArrayList<String>()) | ||
| items.sort() | ||
|
|
||
| // ํ๊ณผ ๋ฆฌ์คํธ | ||
| adapter = DepartAdapter().apply { | ||
| submitList(items) | ||
| setItemClickListener(this@OnboardingDepartActivity) | ||
| } | ||
|
|
||
| binding.rvOnboardingDepart.apply { | ||
| this.adapter = this@OnboardingDepartActivity.adapter | ||
| this.layoutManager = LinearLayoutManager(this@OnboardingDepartActivity) | ||
| this.setHasFixedSize(true) | ||
| } | ||
|
|
||
| // ๋ถ๋ถ ์์ ์ง์ | ||
| setSpanText(baseContext, binding.tvOnboardingDepartTitleMain, startIdx = 0, endIdx = 5) | ||
| } | ||
|
|
||
| override fun initDataBinding() = Unit | ||
|
|
||
| override fun initAfterBinding() { | ||
| viewModel.selectDepartPosition.observe(this) { | ||
| adapter.submitPosition(it) | ||
|
|
||
| // ํฌ์ง์ ์ ํ ์ ์ค๋ต๋ฐ๋ฅผ ํตํด ์๋ฆผ ํ์ | ||
| if (it != -1) getDepart(items) | ||
| } | ||
| } | ||
|
|
||
| // ์ปจํ ์ด๋ ํด๋ฆญ ์ ์ ํํ ํ๊ณผ์ ํฌ์ง์ ์ ์ฅ | ||
| override fun containerClick(position: Int) { | ||
| viewModel.setSelectPosition(position) | ||
| } | ||
|
|
||
| // ํ์ธ ๋ฒํผ์ ๋๋ฅด๋ฉด ๋ด๋ถ DB์ ํ๊ณผ๋ฅผ ๋ด๊ณ ๋ฉ์ธ ์กํฐ๋นํฐ๋ก ์ด๋ | ||
| private fun getDepart(items: ArrayList<String>) { | ||
| return binding.btnOnboardingDepartNext.setOnClickListener { | ||
| viewModel.setDepartment(items[viewModel.selectDepartPosition.value ?: 0]) | ||
| if (viewModel.isFirstLaunch.value == true) { | ||
| val intent = Intent(this, OnboardingKeywordActivity::class.java) | ||
| startActivity(intent) | ||
| finish() | ||
| } else { | ||
| val intent = Intent(this, MainActivity::class.java) | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) | ||
| startActivity(intent) | ||
| finish() | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.