diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt index f9dd1d1..89e6871 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt @@ -4,8 +4,12 @@ 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 androidx.core.view.updatePadding import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.util.setOnClickBatch +import com.gamedog.vididin.R import com.gamedog.vididin.main.interfaces.OnTabStyleListener import com.gamedog.vididin.router.Router import dagger.hilt.android.AndroidEntryPoint @@ -35,10 +39,26 @@ class ZeroBuyActivity : AppViewsActivity(), OnT } - + titlebar.setTitleText(R.string.zero_buy) + titlebar.addRightIcon(R.mipmap.icon_question_mark, { + showHintInfo() + }) } } + override fun ViewBinding.initWindowInsets() { + ViewCompat.setOnApplyWindowInsetsListener(contentRoot) { v, insets -> + val systemBars = + insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()) + v.updatePadding(top = systemBars.top) + insets + } + } + + private fun showHintInfo() { + //TODO("Not yet implemented") + } + override fun ViewBinding.initListeners() { //TODO("Not yet implemented") } diff --git a/app/src/main/res/layout/activity_zerobuy.xml b/app/src/main/res/layout/activity_zerobuy.xml index 86b32f7..4575959 100644 --- a/app/src/main/res/layout/activity_zerobuy.xml +++ b/app/src/main/res/layout/activity_zerobuy.xml @@ -16,123 +16,133 @@ /> - - + - - - - - - + /> + android:layout_marginHorizontal="22dp"> + + + + + + + + - + android:orientation="vertical" + android:padding="15dp" + android:background="@drawable/zero_bg_4_items"> + + android:orientation="horizontal"> + + + + + + + + + + android:orientation="horizontal" + android:layout_marginTop="15dp"> + + + + + + + + + + - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/icon_question_mark.webp b/app/src/main/res/mipmap-xxhdpi/icon_question_mark.webp new file mode 100644 index 0000000..d6ce346 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_question_mark.webp differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4163aad..05a4e7c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,6 +39,9 @@ Sorteio 333 - Grupo de 100 Meus Prêmios Histórico de Prêmios + Festa Grátis + + \ No newline at end of file diff --git a/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt b/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt index 7351a67..83503e7 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt @@ -91,7 +91,7 @@ class CustomTitleBar @JvmOverloads constructor( newImageView.setImageResource(iconRes) var layoutParam = LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT) - layoutParam.marginStart = 15.dp + layoutParam.marginEnd = 15.dp layoutParam.gravity = Gravity.CENTER_VERTICAL mBinding.llRightRoot.addView(newImageView, layoutParam) @@ -102,7 +102,7 @@ class CustomTitleBar @JvmOverloads constructor( newImageView.text = ResUtil.getString(textRes) var layoutParam = LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT) - layoutParam.marginStart = 15.dp + layoutParam.marginEnd = 15.dp layoutParam.gravity = Gravity.CENTER_VERTICAL mBinding.llRightRoot.addView(newImageView, layoutParam)