diff --git a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt index ba2e397..621617a 100644 --- a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt @@ -3,16 +3,20 @@ package com.gamedog.vididin.features.benefit import android.app.Activity import android.content.Intent import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.LinearLayout import androidx.activity.viewModels +import androidx.appcompat.app.ActionBar import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.util.ResUtil import com.gamedog.vididin.R +import com.gamedog.vididin.features.benefit.widget.BenefitTaskItemView import com.gamedog.vididin.main.interfaces.OnTabStyleListener import com.gamedog.vididin.manager.TaskManager import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue import com.gamedog.vididin.manager.taskbeans.BaseTaskState.Companion.STATE_FINISH -import com.gamedog.vididin.manager.taskbeans.BaseTaskState.Companion.STATE_ONGOING import com.gamedog.vididin.manager.taskbeans.BaseTaskState.Companion.STATE_CLAIMED import com.gamedog.vididin.manager.taskbeans.BaseTaskState.Companion.STATE_EXPIRED import com.gamedog.vididin.databinding.ActivityBenefitBinding as ViewBinding @@ -59,15 +63,29 @@ class BenefitActivity : AppViewsActivity(), OnT } private fun initViewsByTaskState() { - val taskStateHelper = TaskManager.instance().boxTaskStatus() - val boxStateList = taskStateHelper.getStatusBean().tasks - val currentBoxIndex = taskStateHelper.getCurrentBoxIndex() - + initAddSubTaskViews() updateTopBoxesUI() - //initAddSubTaskViews() - } + private fun initAddSubTaskViews() { + val taskStateHelper = TaskManager.instance().boxTaskStatus() + val currentBoxState = taskStateHelper.getStatusBean().tasks[taskStateHelper.getCurrentBoxIndex()] + + currentBoxState.tasks.forEachIndexed { index, subTask -> + val separateLine = View(this@BenefitActivity) + separateLine.setBackgroundResource(R.color.gray_f2) + binding.llSubTaskContainer.addView(separateLine, ViewGroup.LayoutParams.MATCH_PARENT, ResUtil.getPixelSize(R.dimen.dp1)) + + val subTaskView = BenefitTaskItemView(this@BenefitActivity) + val subViewParam = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + subViewParam.topMargin = ResUtil.getPixelSize(R.dimen.dp10) + subViewParam.bottomMargin = ResUtil.getPixelSize(R.dimen.dp10) + binding.llSubTaskContainer.addView(subTaskView, subViewParam) + } + } + + + private fun updateTopBoxesUI() { val taskStateHelper = TaskManager.instance().boxTaskStatus() val boxStateList = taskStateHelper.getStatusBean().tasks diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f4e412b..7896ff9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -8,4 +8,6 @@ 16sp 1dp 3dp + 20dp + 10dp \ No newline at end of file