Przeglądaj źródła

1.添加获取mmse试题库UI跳转

王鹏鹏 2 lat temu
rodzic
commit
cacdc0a4f5

+ 6 - 0
.idea/misc.xml

@@ -82,10 +82,14 @@
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login_btn.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/drawable/bg_login_edit.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/login/src/main/res/layout/activity_login.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_choice_item.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_next_question.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_previous_question.xml" value="0.1615" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_selected_choice_item.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_selected_item.xml" value="0.1615" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_unselected_choice_item.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/bg_unselected_item.xml" value="0.1615" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/selector_questions_choice.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/selector_train_radio.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/drawable/selector_train_radio_unchecked.xml" value="0.1615" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
@@ -94,11 +98,13 @@
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_signature.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_input.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_judgment.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_multiple_choice.xml" value="0.2845528455284553" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_selected_item.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_single_judgment.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_sound_record.xml" value="0.4421768707482993" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_year.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/item_choice.xml" value="0.8" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/item_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/item_selected_item.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/item_year.xml" value="1.0" />

+ 26 - 0
baselib/src/main/java/com/yingyangfly/baselib/voice/PlayVoice.kt

@@ -6,6 +6,7 @@ import android.os.Handler
 import android.os.Message
 import android.util.Log
 import com.baidu.tts.chainofresponsibility.logger.LoggerProxy
+import com.baidu.tts.client.SpeechSynthesizeBag
 import com.baidu.tts.client.SpeechSynthesizer
 import com.baidu.tts.client.SpeechSynthesizerListener
 import com.baidu.tts.client.TtsMode
@@ -15,6 +16,7 @@ import com.yingyangfly.baselib.voice.listener.UiMessageListener
 import com.yingyangfly.baselib.voice.util.AutoCheck
 import com.yingyangfly.baselib.voice.util.IOfflineResourceConst
 
+
 /**
  * @author 王鹏鹏
  */
@@ -143,6 +145,30 @@ class PlayVoice {
         }
     }
 
+    /**
+     * 播放语音
+     */
+    fun speakWithParagraph(firstWord: String, secondWord: String, thirdWord: String) {
+        if (mSpeechSynthesizer == null) {
+            print("[ERROR], 初始化失败")
+            return
+        }
+        val bags: MutableList<SpeechSynthesizeBag> = ArrayList()
+        bags.add(getSpeechSynthesizeBag(firstWord, "1"))
+        bags.add(getSpeechSynthesizeBag(secondWord, "2"))
+        bags.add(getSpeechSynthesizeBag(thirdWord, "3"))
+        val result: Int = mSpeechSynthesizer!!.batchSpeak(bags)
+        checkResult(result, "speak")
+    }
+
+    private fun getSpeechSynthesizeBag(text: String, utteranceId: String): SpeechSynthesizeBag {
+        val speechSynthesizeBag = SpeechSynthesizeBag()
+        //需要合成的文本text的长度不能超过120个GBK字节。
+        speechSynthesizeBag.text = text
+        speechSynthesizeBag.utteranceId = utteranceId
+        return speechSynthesizeBag
+    }
+
     fun stop() {
         if (mSpeechSynthesizer != null) {
             mSpeechSynthesizer!!.stop()

+ 15 - 0
mmse/src/main/java/com/yingyangfly/mmse/adapter/ChoiceAdapter.kt

@@ -0,0 +1,15 @@
+package com.yingyangfly.mmse.adapter
+
+import com.yingyang.mmse.R
+import com.yingyang.mmse.databinding.ItemChoiceBinding
+import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+
+/**
+ * 多选adapter
+ */
+class ChoiceAdapter(override val layoutId: Int = R.layout.item_choice) :
+    BaseDataBindingAdapter<String, ItemChoiceBinding>() {
+    override fun onBindViewHolder(binding: ItemChoiceBinding, item: String, position: Int) {
+        binding.data = item
+    }
+}

+ 77 - 0
mmse/src/main/java/com/yingyangfly/mmse/fragment/MultipleChoiceFragment.kt

@@ -0,0 +1,77 @@
+package com.yingyangfly.mmse.fragment
+
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.navigation.Navigation
+import com.yingyang.mmse.R
+import com.yingyang.mmse.databinding.FragmentMultipleChoiceBinding
+import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.mmse.adapter.ChoiceAdapter
+
+/**
+ * 多选
+ */
+class MultipleChoiceFragment : BaseFragment<FragmentMultipleChoiceBinding>() {
+
+    /**
+     * 问题id
+     */
+    var questionId = 0
+
+    var choiceItems = ""
+
+    private val choiceItemList = mutableListOf<String>()
+    private val adapter by lazy { ChoiceAdapter() }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getInt("questionId") ?: 11
+        choiceItems = arguments?.getString("choiceItems") ?: ""
+        super.onCreate(savedInstanceState)
+    }
+
+
+    override fun initViews() {
+        binding {
+            rvChoice.adapter = adapter
+        }
+    }
+
+    override fun initListener() {
+        binding {
+            btnPrevious.setOnSingleClickListener {
+                val bundle = bundleOf("questionId" to questionId)
+                val controller = Navigation.findNavController(it)
+                controller.navigate(
+                    R.id.action_multipleChoiceFragment_to_soundRecordFragment,
+                    bundle
+                )
+            }
+        }
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+        loadData()
+    }
+
+    /**
+     * 加载数据
+     */
+    private fun loadData() {
+        choiceItemList.clear()
+        if (choiceItems.isNullOrEmpty().not()) {
+            val choiceList = choiceItems.split(",")
+            if (choiceList.isNullOrEmpty().not()) {
+                choiceList.forEach {
+                    choiceItemList.add(it)
+                }
+            }
+            adapter.setData(choiceItemList)
+        }
+    }
+}

+ 88 - 1
mmse/src/main/java/com/yingyangfly/mmse/fragment/SoundRecordFragment.kt

@@ -1,22 +1,109 @@
 package com.yingyangfly.mmse.fragment
 
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.navigation.Navigation
+import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentSoundRecordBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.voice.PlayVoice
 
 /**
  * 听录音判断
  */
 class SoundRecordFragment : BaseFragment<FragmentSoundRecordBinding>() {
 
-    override fun initViews() {
+    /**
+     * 原始问题id
+     */
+    var questionId = 0
+
+    var firstWord = ""
+    var secondWord = ""
+    var thirdWord = ""
 
+    private var playVoice: PlayVoice? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getInt("questionId") ?: 4
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun initViews() {
+        playVoice = PlayVoice()
+        playVoice?.setContext(mContext)
     }
 
     override fun initListener() {
+        binding {
+            btnPrevious.setOnSingleClickListener {
+                questionId--
+                val bundle = bundleOf("questionId" to questionId)
+                val controller = Navigation.findNavController(it)
+                controller.navigate(
+                    R.id.action_soundRecordFragment_to_judgmentFragment,
+                    bundle
+                )
+
+            }
+            btnNext.setOnSingleClickListener {
+                val stringBuffer = StringBuffer()
+                stringBuffer.append(firstWord).append(",")
+                    .append(secondWord).append(",")
+                    .append(thirdWord)
+                val bundle = Bundle()
+                bundle.putInt("questionId", questionId)
+                bundle.putString("choiceItems", stringBuffer.toString())
+                val controller = Navigation.findNavController(it)
+                controller.navigate(
+                    R.id.action_soundRecordFragment_to_multipleChoiceFragment,
+                    bundle
+                )
+            }
 
+            soundImage.setOnSingleClickListener {
+                playVoice?.speakWithParagraph(firstWord, secondWord, thirdWord)
+            }
+        }
     }
 
     override fun initData() {
 
     }
+
+    override fun onResume() {
+        super.onResume()
+        loadData()
+    }
+
+    /**
+     * 加载数据
+     */
+    private fun loadData() {
+        if (dao != null) {
+            if (questionId == 11) {
+                val firstquestion = dao?.getQuestion(questionId)
+                if (firstquestion != null) {
+                    firstWord = firstquestion.reviewItem
+                }
+                val secondQuestion = dao?.getQuestion(12)
+                if (secondQuestion != null) {
+                    secondWord = secondQuestion.reviewItem
+                }
+                val thirdQuestion = dao?.getQuestion(13)
+                if (thirdQuestion != null) {
+                    thirdWord = thirdQuestion.reviewItem
+                }
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        if (playVoice != null) {
+            playVoice?.stop()
+        }
+        super.onDestroy()
+    }
 }

+ 13 - 0
mmse/src/main/res/drawable/bg_choice_item.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"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FFF6F4F4" />
+    <padding
+        android:left="@dimen/divider_17px"
+        android:right="@dimen/divider_125px" />
+</shape>

+ 13 - 0
mmse/src/main/res/drawable/bg_selected_choice_item.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"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF4A76FF" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FF4A76FF" />
+    <padding
+        android:left="@dimen/divider_31px"
+        android:right="@dimen/divider_31px" />
+</shape>

+ 13 - 0
mmse/src/main/res/drawable/bg_unselected_choice_item.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"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FFF6F4F4" />
+    <padding
+        android:left="@dimen/divider_31px"
+        android:right="@dimen/divider_31px"/>
+</shape>

+ 8 - 0
mmse/src/main/res/drawable/selector_questions_choice.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item android:drawable="@drawable/bg_selected_choice_item" android:state_checked="true" />
+    <item android:drawable="@drawable/bg_selected_choice_item" android:state_selected="true" />
+    <item android:drawable="@drawable/bg_unselected_choice_item" />
+</selector>
+
+

+ 115 - 0
mmse/src/main/res/layout/fragment_multiple_choice.xml

@@ -0,0 +1,115 @@
+<?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">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_202px"
+            android:layout_marginTop="@dimen/divider_27px"
+            android:layout_marginEnd="@dimen/divider_200px"
+            android:gravity="center"
+            android:text="@string/Now_you_will_hear_three_words_After_listening_them_please_repeat_these_three_words"
+            android:textColor="@color/color_FF222222"
+            android:textSize="@dimen/divider_34px"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/contentLayout"
+            android:layout_width="@dimen/divider_620px"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:minHeight="@dimen/divider_264px"
+            android:theme="@style/Theme.MaterialComponents.NoActionBar"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_20px"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle"
+            app:strokeColor="@color/color_FF979797"
+            app:strokeWidth="@dimen/divider_1px">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="@dimen/divider_191px"
+                    android:layout_height="match_parent"
+                    android:background="@color/color_FF4A76FF"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="@dimen/divider_65px"
+                        android:layout_height="@dimen/divider_86px"
+                        android:layout_gravity="center"
+                        android:background="@mipmap/icon_doctor_head" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvYear"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/divider_31px"
+                        android:background="@color/color_FF4A76FF"
+                        android:gravity="center_horizontal"
+                        android:text="@string/staff_judgment"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px" />
+
+                </LinearLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvChoice"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/divider_23px"
+                    android:layout_marginBottom="@dimen/divider_23px"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnPrevious"
+            android:layout_width="@dimen/divider_240px"
+            android:layout_height="@dimen/divider_68px"
+            android:layout_marginStart="@dimen/divider_307px"
+            android:layout_marginBottom="@dimen/divider_60px"
+            android:background="@drawable/bg_previous_question"
+            android:gravity="center"
+            android:text="@string/previous_question"
+            android:textColor="@color/color_FF4A76FF"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnNext"
+            android:layout_width="@dimen/divider_240px"
+            android:layout_height="@dimen/divider_68px"
+            android:layout_marginEnd="@dimen/divider_305px"
+            android:layout_marginBottom="@dimen/divider_60px"
+            android:background="@drawable/bg_next_question"
+            android:gravity="center"
+            android:text="@string/continues"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_28px"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

+ 3 - 11
mmse/src/main/res/layout/fragment_sound_record.xml

@@ -4,13 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
 
-    <data>
-
-        <variable
-            name="data"
-            type="com.yingyangfly.baselib.db.QuestionsBean" />
-    </data>
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -31,13 +24,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <CheckBox
-            android:id="@+id/soundBox"
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/soundImage"
             android:layout_width="@dimen/divider_154px"
             android:layout_height="@dimen/divider_154px"
             android:layout_marginTop="@dimen/divider_56px"
             android:background="@mipmap/icon_play_sound"
-            android:button="@null"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
@@ -53,7 +45,7 @@
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/soundBox" />
+            app:layout_constraintTop_toBottomOf="@+id/soundImage" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btnPrevious"

+ 66 - 0
mmse/src/main/res/layout/item_choice.xml

@@ -0,0 +1,66 @@
+<?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="java.lang.String" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/divider_24px"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/divider_57px"
+            android:layout_marginStart="@dimen/divider_16px"
+            android:background="@drawable/bg_choice_item"
+            android:gravity="center_vertical"
+            android:text="@{data}"
+            android:textColor="@color/txt_radio_color"
+            android:textSize="@dimen/divider_24px"
+            android:textStyle="bold" />
+
+        <RadioGroup
+            android:id="@+id/radioChoice"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/divider_57px"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/radioCorrect"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_20px"
+                android:background="@drawable/selector_questions_choice"
+                android:button="@null"
+                android:text="@string/correct"
+                android:textColor="@color/txt_radio_color"
+                android:textSize="@dimen/divider_24px"
+                android:textStyle="bold" />
+
+            <RadioButton
+                android:id="@+id/radioDeny"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_12px"
+                android:layout_marginEnd="@dimen/divider_19px"
+                android:background="@drawable/selector_questions_choice"
+                android:button="@null"
+                android:text="@string/deny"
+                android:textColor="@color/txt_radio_color"
+                android:textSize="@dimen/divider_24px"
+                android:textStyle="bold" />
+
+        </RadioGroup>
+
+
+    </LinearLayout>
+
+</layout>

+ 14 - 0
mmse/src/main/res/navigation/nav_home.xml

@@ -68,6 +68,20 @@
         <action
             android:id="@+id/action_soundRecordFragment_to_judgmentFragment"
             app:destination="@id/judgmentFragment" />
+
+        <action
+            android:id="@+id/action_soundRecordFragment_to_multipleChoiceFragment"
+            app:destination="@id/multipleChoiceFragment" />
+
+    </fragment>
+
+    <fragment
+        android:id="@+id/multipleChoiceFragment"
+        android:name="com.yingyangfly.mmse.fragment.MultipleChoiceFragment"
+        android:label="multipleChoiceFragment">
+        <action
+            android:id="@+id/action_multipleChoiceFragment_to_soundRecordFragment"
+            app:destination="@id/soundRecordFragment" />
     </fragment>
 
 </navigation>

+ 2 - 1
mmse/src/main/res/values/dimens.xml

@@ -12,7 +12,7 @@
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
     <dimen name="divider_432px" tools:ignore="ResourceName">432px</dimen>
     <dimen name="divider_430px" tools:ignore="ResourceName">430px</dimen>
-    <dimen name="divider_427px" tools:ignore="ResourceName">427px</dimen>
+    <dimen name="divider_429px" tools:ignore="ResourceName">429px</dimen>
     <dimen name="divider_418px" tools:ignore="ResourceName">418px</dimen>
     <dimen name="divider_416px" tools:ignore="ResourceName">416px</dimen>
     <dimen name="divider_415px" tools:ignore="ResourceName">415px</dimen>
@@ -69,6 +69,7 @@
     <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>
     <dimen name="divider_130px" tools:ignore="ResourceName">130px</dimen>
     <dimen name="divider_128px" tools:ignore="ResourceName">128px</dimen>
+    <dimen name="divider_125px" tools:ignore="ResourceName">125px</dimen>
     <dimen name="divider_120px" tools:ignore="ResourceName">120px</dimen>
     <dimen name="divider_119px" tools:ignore="ResourceName">119px</dimen>
     <dimen name="divider_118px" tools:ignore="ResourceName">118px</dimen>