1.添加消息推送页面UI

.idea/misc.xml

@@ -24,8 +24,13 @@
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/layout/activity_login.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_equipment_services.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_personal_center.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_item_push.xml" value="0.219" />
+        <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_push.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_train.xml" value="0.2165" />
+        <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/selector_train_radio_unchecked.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/layout/activity_messge_list.xml" value="0.17527173913043478" />
+        <entry key="..\:/workspace/hcp-pad/push/src/main/res/layout/item_push_list.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/push/src/main/res/layout/item_push_type.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/tuibeauty/src/main/res/layout/tuibeauty_view_panel.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/tuigift/src/main/res/drawable/tuigift_bg_bottom_dialog.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_bridge_web.xml" value="0.22826086956521738" />

push/src/main/java/com/yingyang/push/activity/MessgeListActivity.kt

@@ -1,9 +1,14 @@
 package com.yingyang.push.activity
 
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.push.adapter.PushListAdapter
+import com.yingyang.push.adapter.PushTypeAdapter
 import com.yingyang.push.databinding.ActivityMessgeListBinding
-import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyang.push.entity.PushMessageBean
+import com.yingyang.push.entity.PushMessageTypeBean
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
 
@@ -11,10 +16,34 @@ import com.yingyangfly.baselib.utils.JumpUtil
  * 消息列表
  */
 @Route(path = RouterUrlCommon.messageList)
-class MessgeListActivity : BaseActivity<ActivityMessgeListBinding>() {
+class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewModel>() {
+
+    /**
+     * 消息类型adapter
+     */
+    private var type = ""
+    private var pushTypeList = mutableListOf<PushMessageTypeBean>()
+    private val pushTypeAdapter by lazy { PushTypeAdapter() }
+
+    /**
+     * 消息列表
+     */
+    private var pushList = mutableListOf<PushMessageBean>()
+    private val pushListAdapter by lazy { PushListAdapter() }
 
     override fun initViews() {
+        binding {
+            //消息类型
+            rvPushType.adapter = pushTypeAdapter
+            pushTypeAdapter.onPushClickListener = { bean ->
+                getMeaageList(bean.dictValue)
+            }
+            //消息列表
+            rvPush.adapter = pushListAdapter
+            pushListAdapter.onPushClickListener = { bean ->
 
+            }
+        }
     }
 
     override fun initListener() {
@@ -24,7 +53,45 @@ class MessgeListActivity : BaseActivity<ActivityMessgeListBinding>() {
     }
 
     override fun initData() {
+        getPushList()
+        getMeaageList("")
+    }
+
+    /**
+     * 获取推送消息类型
+     */
+    private fun getPushList() {
+        pushTypeList.clear()
+        pushTypeList.add(
+            PushMessageTypeBean(
+                dictLabel = "全部消息",
+                dictValue = "",
+                dictType = "game_type"
+            )
+        )
+        viewModel.getSelectByDictType(fail = {
+            it.toast()
+        }, success = {
+            if (it.isNullOrEmpty().not()) {
+                pushTypeList.addAll(it)
+            }
+            pushTypeAdapter.setData(pushTypeList)
+        })
+    }
 
+    /**
+     * 获取推送消息列表
+     */
+    private fun getMeaageList(msgType: String) {
+        pushList.clear()
+        viewModel.getPushList(msgType, fail = {
+            it.toast()
+        }, success = {
+            if (it.isNullOrEmpty().not()) {
+                pushList.addAll(it)
+            }
+            pushListAdapter.setData(pushList)
+        })
     }
 
 }

push/src/main/java/com/yingyang/push/activity/PushViewModel.kt

@@ -0,0 +1,40 @@
+package com.yingyang.push.activity
+
+import com.yingyang.push.entity.PushMessageBean
+import com.yingyang.push.entity.PushMessageTypeBean
+import com.yingyang.push.net.PUSH_API
+import com.yingyangfly.baselib.mvvm.BaseViewModel
+
+/**
+ * @author 王鹏鹏
+ * @description 工作台页面ViewModel
+ */
+class PushViewModel : BaseViewModel() {
+
+    /**
+     * 获取推送消息类型
+     */
+    fun getSelectByDictType(
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: List<PushMessageTypeBean>) -> Unit)? = null,
+    ) = launchFlow(true) {
+        PUSH_API.getSelectByDictType("warn_type")
+    }.runUI(
+        success,
+        fail
+    )
+
+    /**
+     * 获取消息列表
+     */
+    fun getPushList(
+        type: String,
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: List<PushMessageBean>) -> Unit)? = null,
+    ) = launchFlow(true) {
+        PUSH_API.getPushList(type)
+    }.runUI(
+        success,
+        fail
+    )
+}

push/src/main/java/com/yingyang/push/adapter/PushListAdapter.kt

@@ -0,0 +1,41 @@
+package com.yingyang.push.adapter
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface
+import com.yingyang.push.R
+import com.yingyang.push.databinding.ItemPushListBinding
+import com.yingyang.push.databinding.ItemPushTypeBinding
+import com.yingyang.push.entity.PushMessageBean
+import com.yingyang.push.entity.PushMessageTypeBean
+import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+
+/**
+ * 推送类型adapter
+ */
+class PushListAdapter(override val layoutId: Int = R.layout.item_push_list) :
+    BaseDataBindingAdapter<PushMessageBean, ItemPushListBinding>() {
+
+    var onPushClickListener: ((bean: PushMessageBean) -> Unit)? = null
+
+    private var currentPosition = 0
+
+    @SuppressLint("NotifyDataSetChanged")
+    override fun onBindViewHolder(
+        binding: ItemPushListBinding,
+        item: PushMessageBean,
+        position: Int
+    ) {
+        binding.data = item
+        if (currentPosition == position) {
+            binding.imageTips.setBackgroundResource(R.drawable.selector_push_radio_checked)
+        } else {
+            binding.imageTips.setBackgroundResource(R.drawable.selector_push_radio_unchecked)
+
+        }
+        binding.messageLayout.setOnSingleClickListener {
+            notifyDataSetChanged()
+            onPushClickListener?.invoke(item)
+        }
+    }
+}

push/src/main/java/com/yingyang/push/adapter/PushTypeAdapter.kt

@@ -0,0 +1,42 @@
+package com.yingyang.push.adapter
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface
+import com.yingyang.push.R
+import com.yingyang.push.databinding.ItemPushTypeBinding
+import com.yingyang.push.entity.PushMessageTypeBean
+import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+
+/**
+ * 推送类型adapter
+ */
+class PushTypeAdapter(override val layoutId: Int = R.layout.item_push_type) :
+    BaseDataBindingAdapter<PushMessageTypeBean, ItemPushTypeBinding>() {
+
+    var onPushClickListener: ((bean: PushMessageTypeBean) -> Unit)? = null
+
+    private var currentPosition = 0
+
+    @SuppressLint("NotifyDataSetChanged")
+    override fun onBindViewHolder(
+        binding: ItemPushTypeBinding,
+        item: PushMessageTypeBean,
+        position: Int
+    ) {
+        binding.data = item
+        if (currentPosition == position) {
+            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+            binding.tvType.setBackgroundResource(R.drawable.selector_push_radio_checked)
+        } else {
+            binding.tvType.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+            binding.tvType.setBackgroundResource(R.drawable.selector_push_radio_unchecked)
+
+        }
+        binding.tvType.setOnSingleClickListener {
+            currentPosition = position
+            notifyDataSetChanged()
+            onPushClickListener?.invoke(item)
+        }
+    }
+}

push/src/main/java/com/yingyang/push/entity/PushMessageBean.kt

@@ -0,0 +1,10 @@
+package com.yingyang.push.entity
+
+/**
+ * 消息通知列表bean
+ */
+data class PushMessageBean(
+    val dictLabel: String,
+    val dictType: String,
+    val dictValue: String
+)

push/src/main/java/com/yingyang/push/entity/PushMessageTypeBean.kt

@@ -0,0 +1,10 @@
+package com.yingyang.push.entity
+
+/**
+ * 消息通知类型bean
+ */
+data class PushMessageTypeBean(
+    val dictLabel: String,
+    val dictType: String,
+    val dictValue: String
+)

push/src/main/java/com/yingyang/push/net/PushApiService.kt

@@ -1,5 +1,7 @@
 package com.yingyang.push.net
 
+import com.yingyang.push.entity.PushMessageBean
+import com.yingyang.push.entity.PushMessageTypeBean
 import com.yingyangfly.baselib.net.BaseResp
 import retrofit2.http.POST
 import retrofit2.http.Query
@@ -7,9 +9,15 @@ import retrofit2.http.Query
 interface PushApiService {
 
     /**
-     * 获取训练内容详情
+     * 获取推送消息类型
      */
-    @POST("app/task/selectTaskDetailById")
-    suspend fun getSelectTaskDetailById(@Query("taskId") taskId: String): BaseResp<Unit>
+    @POST("system/dict/data/selectByDictType")
+    suspend fun getSelectByDictType(@Query("dictType") dictType: String): BaseResp<List<PushMessageTypeBean>>
+
+    /**
+     * 获取推送消息列表
+     */
+    @POST("app/warn/list")
+    suspend fun getPushList(@Query("msgType") msgType: String): BaseResp<List<PushMessageBean>>
 
 }

push/src/main/res/drawable/bg_item_push.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_12px" />
+    <solid android:color="@color/color_4794BCFF" />
+</shape>

push/src/main/res/drawable/bg_push.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="90"
+                android:endColor="@color/color_ff4571ff"
+                android:startColor="@color/color_ff8fafff"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

push/src/main/res/drawable/selector_push_radio_checked.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_69B8CFFF" />
+    <corners android:radius="@dimen/divider_12px" />
+    <solid android:color="@color/color_69B8CFFF" />
+</shape>
+
+

push/src/main/res/drawable/selector_push_radio_unchecked.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@android:color/transparent" />
+    <corners android:radius="@dimen/divider_12px" />
+    <solid android:color="@android:color/transparent" />
+</shape>
+
+

push/src/main/res/layout/activity_messge_list.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/bg_message_list">
+        android:background="@drawable/bg_push">
 
         <LinearLayout
             android:id="@+id/layoutHead"
@@ -15,14 +17,14 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="@dimen/divider_48px"
                 android:layout_height="@dimen/divider_43px"
                 android:layout_marginStart="@dimen/divider_65px"
                 android:layout_marginTop="@dimen/divider_35px"
                 android:background="@mipmap/bg_home" />
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/divider_14px"
@@ -33,7 +35,73 @@
                 android:textStyle="bold" />
         </LinearLayout>
 
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvPushType"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/divider_37px"
+            android:layout_marginTop="@dimen/divider_110px"
+            android:layout_marginEnd="@dimen/divider_36px"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/layoutHead" />
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/divider_38px"
+            android:layout_marginTop="@dimen/divider_18px"
+            android:layout_marginEnd="@dimen/divider_18px"
+            android:layout_marginBottom="@dimen/divider_18px"
+            android:background="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_38px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toRightOf="@id/rvPushType"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_31px"
+                    android:text="@string/notify"
+                    android:textColor="@color/color_FF4A76FF"
+                    android:textSize="@dimen/divider_42px"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <com.scwang.smart.refresh.layout.SmartRefreshLayout
+                    android:id="@+id/layoutPush"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="@dimen/divider_36px"
+                    android:layout_marginTop="@dimen/divider_12px"
+                    android:layout_marginEnd="@dimen/divider_36px"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+
+                    <com.scwang.smart.refresh.header.ClassicsHeader
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvPush"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

push/src/main/res/layout/item_push_list.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <data>
+
+        <variable
+            name="data"
+            type="com.yingyang.push.entity.PushMessageBean" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/messageLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/divider_12px"
+        android:background="@drawable/bg_item_push"
+        android:minHeight="@dimen/divider_105px">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imageTips"
+            android:layout_width="@dimen/dimen_27dp"
+            android:layout_height="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_24px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/color_FF4A76FF"
+            android:textSize="@dimen/divider_24px"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_23px"
+            android:layout_marginEnd="@dimen/divider_35px"
+            android:textColor="@color/color_FF2B70FF"
+            android:textSize="@dimen/divider_20px"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_4px"
+            android:layout_marginEnd="@dimen/divider_35px"
+            android:textColor="@color/color_FFFF2B2B"
+            android:textSize="@dimen/divider_20px"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvDate" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

push/src/main/res/layout/item_push_type.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <data>
+
+        <variable
+            name="data"
+            type="com.yingyang.push.entity.PushMessageTypeBean" />
+    </data>
+
+    <TextView
+        android:id="@+id/tvType"
+        android:layout_width="@dimen/divider_133px"
+        android:layout_height="@dimen/divider_55px"
+        android:layout_marginTop="@dimen/divider_40px"
+        android:gravity="center_vertical"
+        android:paddingStart="@dimen/divider_62px"
+        android:text="@{data.dictLabel}"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/divider_24px" />
+
+</layout>

push/src/main/res/values/colors.xml

@@ -22,4 +22,5 @@
     <color name="color_FF2B70FF" tools:ignore="ResourceName">#FF2B70FF</color>
     <color name="color_FF821EFF" tools:ignore="ResourceName">#FF821EFF</color>
     <color name="color_69B8CFFF" tools:ignore="ResourceName">#69B8CFFF</color>
+    <color name="color_FFFF2B2B" tools:ignore="ResourceName">#FFFF2B2B</color>
 </resources>

push/src/main/res/values/dimens.xml

@@ -1,21 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <dimen name="divider_689px" tools:ignore="PxUsage">689px</dimen>
+    <dimen name="divider_533px" tools:ignore="PxUsage">533px</dimen>
     <dimen name="divider_440px" tools:ignore="PxUsage">440px</dimen>
     <dimen name="divider_430px" tools:ignore="PxUsage">430px</dimen>
+    <dimen name="divider_418px" tools:ignore="PxUsage">418px</dimen>
+    <dimen name="divider_416px" tools:ignore="PxUsage">416px</dimen>
     <dimen name="divider_415px" tools:ignore="PxUsage">415px</dimen>
     <dimen name="divider_413px" tools:ignore="PxUsage">413px</dimen>
     <dimen name="divider_409px" tools:ignore="PxUsage">409px</dimen>
+    <dimen name="divider_377px" tools:ignore="PxUsage">377px</dimen>
+    <dimen name="divider_354px" tools:ignore="PxUsage">354px</dimen>
+    <dimen name="divider_348px" tools:ignore="PxUsage">348px</dimen>
+    <dimen name="divider_345px" tools:ignore="PxUsage">345px</dimen>
     <dimen name="divider_340px" tools:ignore="PxUsage">340px</dimen>
+    <dimen name="divider_339px" tools:ignore="PxUsage">339px</dimen>
+    <dimen name="divider_335px" tools:ignore="PxUsage">335px</dimen>
+    <dimen name="divider_333px" tools:ignore="PxUsage">333px</dimen>
+    <dimen name="divider_331px" tools:ignore="PxUsage">331px</dimen>
+    <dimen name="divider_330px" tools:ignore="PxUsage">330px</dimen>
+    <dimen name="divider_329px" tools:ignore="PxUsage">329px</dimen>
+    <dimen name="divider_327px" tools:ignore="PxUsage">327px</dimen>
+    <dimen name="divider_320px" tools:ignore="PxUsage">320px</dimen>
+    <dimen name="divider_289px" tools:ignore="PxUsage">289px</dimen>
     <dimen name="divider_270px" tools:ignore="PxUsage">270px</dimen>
+    <dimen name="divider_264px" tools:ignore="PxUsage">264px</dimen>
     <dimen name="divider_260px" tools:ignore="PxUsage">260px</dimen>
     <dimen name="divider_250px" tools:ignore="PxUsage">250px</dimen>
+    <dimen name="divider_249px" tools:ignore="PxUsage">249px</dimen>
     <dimen name="divider_237px" tools:ignore="PxUsage">237px</dimen>
     <dimen name="divider_230px" tools:ignore="PxUsage">230px</dimen>
     <dimen name="divider_195px" tools:ignore="PxUsage">195px</dimen>
     <dimen name="divider_190px" tools:ignore="PxUsage">190px</dimen>
+    <dimen name="divider_184px" tools:ignore="PxUsage">184px</dimen>
     <dimen name="divider_180px" tools:ignore="PxUsage">180px</dimen>
+    <dimen name="divider_176px" tools:ignore="PxUsage">176px</dimen>
     <dimen name="divider_140px" tools:ignore="PxUsage">140px</dimen>
+    <dimen name="divider_133px" tools:ignore="PxUsage">133px</dimen>
+    <dimen name="divider_130px" tools:ignore="PxUsage">130px</dimen>
     <dimen name="divider_128px" tools:ignore="PxUsage">128px</dimen>
     <dimen name="divider_120px" tools:ignore="PxUsage">120px</dimen>
     <dimen name="divider_119px" tools:ignore="PxUsage">119px</dimen>
@@ -39,6 +62,7 @@
     <dimen name="divider_101px" tools:ignore="PxUsage">101px</dimen>
     <dimen name="divider_100px" tools:ignore="PxUsage">100px</dimen>
     <dimen name="divider_88px" tools:ignore="PxUsage">88px</dimen>
+    <dimen name="divider_82px" tools:ignore="PxUsage">82px</dimen>
     <dimen name="divider_80px" tools:ignore="PxUsage">80px</dimen>
     <dimen name="divider_79px" tools:ignore="PxUsage">79px</dimen>
     <dimen name="divider_78px" tools:ignore="PxUsage">78px</dimen>