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 d7fb01a..72216a4 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 @@ -4,6 +4,8 @@ import android.app.Activity import android.content.Intent import android.view.LayoutInflater import androidx.activity.viewModels +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import com.ama.core.architecture.appBase.AppViewsActivity import com.gamedog.vididin.main.interfaces.OnTabStyleListener import dagger.hilt.android.AndroidEntryPoint @@ -20,6 +22,10 @@ class BenefitActivity : AppViewsActivity(), OnT override val mViewModel: ViewModel by viewModels() override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater) + override fun ViewBinding.initWindowInsets() { + setImmerseRootView(contentRoot) + } + override fun ViewBinding.initViews() { diff --git a/app/src/main/res/drawable/bg_benefit_tasks_top.xml b/app/src/main/res/drawable/bg_benefit_tasks_top.xml new file mode 100644 index 0000000..a8fb771 --- /dev/null +++ b/app/src/main/res/drawable/bg_benefit_tasks_top.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_benefit_top_items.xml b/app/src/main/res/drawable/bg_benefit_top_items.xml new file mode 100644 index 0000000..f845dd0 --- /dev/null +++ b/app/src/main/res/drawable/bg_benefit_top_items.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_benefit_top_white.xml b/app/src/main/res/drawable/bg_benefit_top_white.xml new file mode 100644 index 0000000..0907199 --- /dev/null +++ b/app/src/main/res/drawable/bg_benefit_top_white.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_benefit.xml b/app/src/main/res/layout/activity_benefit.xml index 2482338..7a6a30b 100644 --- a/app/src/main/res/layout/activity_benefit.xml +++ b/app/src/main/res/layout/activity_benefit.xml @@ -1,67 +1,293 @@ - - - - - - - + android:layout_height="match_parent" + android:background="#fff6efff"> - + - + + + + - + android:layout_marginTop="20dp"> + + - + + + + + + + + + + + android:layout_marginTop="20dp" + android:background="@drawable/bg_benefit_top_white" + android:padding="15dp" + android:orientation="vertical" + android:layout_marginHorizontal="15dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + diff --git a/app/src/main/res/mipmap-xxhdpi/benefit_bg_task_top.webp b/app/src/main/res/mipmap-xxhdpi/benefit_bg_task_top.webp new file mode 100644 index 0000000..b43e1c7 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/benefit_bg_task_top.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/benefit_bg_top.webp b/app/src/main/res/mipmap-xxhdpi/benefit_bg_top.webp new file mode 100644 index 0000000..b43e1c7 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/benefit_bg_top.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/benefit_item_expired.webp b/app/src/main/res/mipmap-xxhdpi/benefit_item_expired.webp new file mode 100644 index 0000000..63b1abe Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/benefit_item_expired.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/benefit_item_ongoing.webp b/app/src/main/res/mipmap-xxhdpi/benefit_item_ongoing.webp new file mode 100644 index 0000000..6978c50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/benefit_item_ongoing.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/benefit_item_waitting.webp b/app/src/main/res/mipmap-xxhdpi/benefit_item_waitting.webp new file mode 100644 index 0000000..826b187 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/benefit_item_waitting.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/benefit_top_left.webp b/app/src/main/res/mipmap-xxhdpi/benefit_top_left.webp new file mode 100644 index 0000000..54ebbf7 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/benefit_top_left.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/benefit_top_right.webp b/app/src/main/res/mipmap-xxhdpi/benefit_top_right.webp new file mode 100644 index 0000000..3ca4071 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/benefit_top_right.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/but_bg_grady.webp b/app/src/main/res/mipmap-xxhdpi/but_bg_grady.webp new file mode 100644 index 0000000..e345f66 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/but_bg_grady.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_check_mark.webp b/app/src/main/res/mipmap-xxhdpi/icon_check_mark.webp new file mode 100644 index 0000000..99969b6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_check_mark.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 463e3bd..fcdc839 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -82,6 +82,8 @@ #FF00FF54 #FF783100 #FF872D10 + #FF606060 + #333333 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05a4e7c..1cc6b8e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,8 +40,10 @@ Meus Prêmios Histórico de Prêmios Festa Grátis - - + Expirado + Concluído + Em andamento + Conclua todas as tarefas para retirar R$ 1.0 \ No newline at end of file diff --git a/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt b/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt index b1ae897..50feda6 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/base/BaseActivity.kt @@ -1,6 +1,21 @@ package com.ama.core.architecture.base +import android.view.View import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat -abstract class BaseActivity : AppCompatActivity() \ No newline at end of file +abstract class BaseActivity : AppCompatActivity() { + + protected fun setImmerseRootView(rootView: View) { + ViewCompat.setOnApplyWindowInsetsListener(rootView) { v, insets -> + val systemBars = insets.getInsets( + WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.ime() + ) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } + +} \ No newline at end of file diff --git a/core/architecture/src/main/java/com/ama/core/architecture/base/BaseFragment.kt b/core/architecture/src/main/java/com/ama/core/architecture/base/BaseFragment.kt index e0cadd0..70cc2bc 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/base/BaseFragment.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/base/BaseFragment.kt @@ -1,6 +1,19 @@ package com.ama.core.architecture.base +import android.view.View +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.Fragment -open class BaseFragment : Fragment() \ No newline at end of file +open class BaseFragment : Fragment() { + protected fun setImmerseRootView(rootView: View) { + ViewCompat.setOnApplyWindowInsetsListener(rootView) { v, insets -> + val systemBars = insets.getInsets( + WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.ime() + ) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file