yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.3.0]

Browse Source 
[music]
[主页功能摆放]
This commit is contained in:
yangyakun
2024-03-07 17:23:20 +08:00
parent 83108c3a77
commit cb76524bcd
23 changed files with 210 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -74,9 +74,17 @@ class TaxiPassengerBaseFragment() :
private fun initListener() {
ck_setting.isChecked = false
ck_setting_only.isChecked = false
ck_setting.setOnCheckedChangeListener { _, isChecked ->
clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE
}
ck_setting_only.setOnCheckedChangeListener { _, isChecked ->
clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE
}
ck_music.isChecked = false
ck_music.setOnCheckedChangeListener { _, isChecked ->
mv_music_info.visibility = if(isChecked) View.VISIBLE else View.GONE
}
bottom.setOverMapApplyClick(object : BottomBar.ApplyClickLintener{
override fun onApplyClick(selectItem: BottomBar.SelectView) {
when (selectItem) {
@@ -85,7 +93,6 @@ class TaxiPassengerBaseFragment() :
mapBizView.visibility = View.VISIBLE
presenter?.setItineraryVisibility()
speedView.visibility = View.VISIBLE
ck_setting.visibility = View.VISIBLE
if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
romaPView.updateVisible(true)
romaDistanceView.visibility = View.VISIBLE
@@ -93,7 +100,8 @@ class TaxiPassengerBaseFragment() :
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
}
rv_location_center.visibility = View.VISIBLE
con_third_group.visibility = View.VISIBLE
con_only_one_group.visibility = View.GONE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -104,10 +112,10 @@ class TaxiPassengerBaseFragment() :
mapBizView.visibility = View.GONE
presenter?.setItineraryVisibility()
speedView.visibility = View.VISIBLE
ck_setting.visibility = View.VISIBLE
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.VISIBLE
con_third_group.visibility = View.VISIBLE
con_only_one_group.visibility = View.GONE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
infoVideoView.visibility = View.GONE
@@ -118,11 +126,13 @@ class TaxiPassengerBaseFragment() :
mapBizView.visibility = View.GONE
presenter?.setItineraryVisibility()
speedView.visibility = View.GONE
ck_setting.visibility = View.GONE
ck_setting.isChecked = false
ck_music.isChecked = false
ck_setting_only.isChecked = false
romaPView.updateVisible(false)
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.GONE
con_third_group.visibility = View.GONE
con_only_one_group.visibility = View.VISIBLE
pcnActionView.visibility = View.GONE
CallerHmiManager.hideTrafficLightView()
infoVideoView.visibility = View.VISIBLE
@@ -135,7 +145,7 @@ class TaxiPassengerBaseFragment() :
}
})
rv_location_center.onClick {
iv_center_location_bg.onClick {
when (bottom.getCurrentPage()) {
BottomBar.SelectView.PRECISIONMAP -> {
//切换到地图中间
@@ -321,7 +331,6 @@ class TaxiPassengerBaseFragment() :
allAnimator.addAll(aniSpeedSettingRow(isShow,speedView))
allAnimator.addAll(aniSpeedSettingRow(isShow,romaPView))
allAnimator.addAll(aniSpeedSettingRow(isShow,romaDistanceView))
allAnimator.addAll(aniSpeedSettingRow(isShow,ck_setting))
allAnimator.addAll(aniOrderInfo(isShow))
animatorSet.playTogether(allAnimator)

24
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListItemAdapter.kt
View File

@@ -1,15 +1,19 @@
package com.mogo.och.taxi.passenger.ui.music.list
import android.content.Context
import android.graphics.drawable.GradientDrawable
import android.os.Build
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.mogo.och.common.module.manager.auditionmanager.MusicData
import com.mogo.och.common.module.manager.auditionmanager.PlayState
import com.mogo.och.taxi.passenger.R
import me.jessyan.autosize.utils.AutoSizeUtils
/**
* Created by adityagohad on 06/06/17.
@@ -20,6 +24,24 @@ class MusicListItemAdapter(
private val clickListener: ClickListener
) : RecyclerView.Adapter<MusicListItemAdapter.TextVH>() {
val gradientDrawable = GradientDrawable().also {
it.shape = GradientDrawable.RECTANGLE
val firstColor = ContextCompat.getColor(context, android.R.color.transparent)
val setondColor = ContextCompat.getColor(context, R.color.taxi_p_4DFFFFFF)
val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_4DFFFFFF)
val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_4DFFFFFF)
val fifthColor = ContextCompat.getColor(context, android.R.color.transparent)
it.orientation = GradientDrawable.Orientation.LEFT_RIGHT
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
it.setColors(intArrayOf(firstColor, setondColor, thirdColor, fourceColor,fifthColor),
floatArrayOf(0.0f,0.3f,0.6f,0.9f,1f)
)
}else{
it.colors = intArrayOf(firstColor, setondColor, thirdColor, fourceColor)
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH {
val view: View
val inflater = LayoutInflater.from(context)
@@ -37,7 +59,9 @@ class MusicListItemAdapter(
if (musicData.state==PlayState.Playing||musicData.state==PlayState.Pause) {
holder.musicPlayState.visibility = View.VISIBLE
holder.itemView.background = gradientDrawable
}else{
holder.itemView.background = null
holder.musicPlayState.visibility = View.GONE
}
}

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_location_cecnter_click.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_checked.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_music_normal.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_reset_location_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_checked.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_setting_music_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_location_center_normal.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_middle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 53 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_music_bg_relax_head.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 140 KiB

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_setting_normal.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

10
OCH/taxi/passenger/src/main/res/drawable/taxi_p_center_location_selector.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
<item android:drawable="@drawable/taxt_p_location_center_checked" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/taxt_p_location_center_checked" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/taxt_p_location_center_checked" android:state_checked="true" />
<item android:drawable="@drawable/taxt_p_location_center_normal" android:state_checked="false" />
<item android:drawable="@drawable/taxt_p_location_center_checked" android:state_selected="true" />
<item android:drawable="@drawable/taxt_p_location_center_checked" android:state_focused="true" />
<item android:drawable="@drawable/taxt_p_location_center_normal" />
</selector>

5
OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_list_item_bg.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:startColor="@color/transparent" android:centerColor="@color/white" android:endColor="@color/transparent"/>
</shape>

6
OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_list_tag_bg.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_16_5"/>
<stroke android:width="@dimen/dp_1" android:color="@color/taxi_p_425877"/>
</shape>

10
OCH/taxi/passenger/src/main/res/drawable/taxi_p_music_selector.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
<item android:drawable="@drawable/taxi_p_music_checked" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/taxi_p_music_checked" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/taxi_p_music_checked" android:state_checked="true" />
<item android:drawable="@drawable/taxi_p_music_normal" android:state_checked="false" />
<item android:drawable="@drawable/taxi_p_music_checked" android:state_selected="true" />
<item android:drawable="@drawable/taxi_p_music_checked" android:state_focused="true" />
<item android:drawable="@drawable/taxi_p_music_normal" />
</selector>

10
OCH/taxi/passenger/src/main/res/drawable/taxi_p_setting_selector.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
<item android:drawable="@drawable/taxt_p_setting_checked" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/taxt_p_setting_checked" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/taxt_p_setting_checked" android:state_checked="true" />
<item android:drawable="@drawable/taxi_p_setting_checked" android:state_focused="true" android:state_pressed="true" />
<item android:drawable="@drawable/taxi_p_setting_checked" android:state_focused="false" android:state_pressed="true" />
<item android:drawable="@drawable/taxi_p_setting_checked" android:state_checked="true" />
<item android:drawable="@drawable/taxt_p_setting_normal" android:state_checked="false" />
<item android:drawable="@drawable/taxt_p_setting_checked" android:state_selected="true" />
<item android:drawable="@drawable/taxt_p_setting_checked" android:state_focused="true" />
<item android:drawable="@drawable/taxi_p_setting_checked" android:state_selected="true" />
<item android:drawable="@drawable/taxi_p_setting_checked" android:state_focused="true" />
<item android:drawable="@drawable/taxt_p_setting_normal" />
</selector>

142
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -60,26 +60,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/ck_setting"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_100"
android:background="@drawable/taxi_p_setting_selector"
android:button="@null"
app:layout_constraintStart_toEndOf="@+id/speedView"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.och.taxi.passenger.ui.systemsetting.TaxiPSettingView
android:id="@+id/clSettingView"
android:layout_width="@dimen/dp_858"
android:layout_height="@dimen/dp_537"
android:layout_marginTop="@dimen/dp_205"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- 漫游按钮 -->
<com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
android:id="@+id/romaPView"
@@ -88,7 +68,7 @@
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="100dp"
android:background="@drawable/taxi_p_bg_roma_selector"
app:layout_constraintStart_toEndOf="@+id/ck_setting"
app:layout_constraintStart_toEndOf="@+id/speedView"
app:layout_constraintTop_toTopOf="parent"
app:roma_close="@drawable/taxi_p_bg_roma_selector"
app:roma_open="@drawable/taxi_p_roma_checked" />
@@ -105,17 +85,116 @@
app:roma_change_dis_color="true" />
<TextView
android:id="@+id/rv_location_center"
android:layout_width="@dimen/dp_96"
android:layout_height="@dimen/dp_96"
<ImageView
android:id="@+id/iv_setting_music_bg"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_300"
android:layout_marginEnd="@dimen/dp_40"
android:background="@drawable/taxi_p_location_center"
android:src="@drawable/taxi_p_setting_music_bg"
app:barrierAllowsGoneWidgets="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/ck_setting"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"
android:background="@drawable/taxi_p_setting_selector"
android:button="@null"
app:layout_constraintBottom_toTopOf="@+id/ck_music"
app:layout_constraintStart_toStartOf="@+id/iv_setting_music_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_setting_music_bg"
app:layout_constraintTop_toTopOf="@+id/iv_setting_music_bg" />
<CheckBox
android:id="@+id/ck_music"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"
android:background="@drawable/taxi_p_music_selector"
android:button="@null"
app:layout_constraintTop_toBottomOf="@+id/ck_setting"
app:layout_constraintStart_toStartOf="@+id/iv_setting_music_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_setting_music_bg"
app:layout_constraintBottom_toBottomOf="@+id/iv_setting_music_bg" />
<ImageView
android:id="@+id/iv_center_location_bg"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginTop="@dimen/dp_64"
android:layout_marginEnd="@dimen/dp_40"
android:src="@drawable/taxi_p_reset_location_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_setting_music_bg" />
<ImageView
android:id="@+id/iv_center_location"
app:layout_constraintTop_toTopOf="@+id/iv_center_location_bg"
app:layout_constraintBottom_toBottomOf="@+id/iv_center_location_bg"
app:layout_constraintStart_toStartOf="@+id/iv_center_location_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_center_location_bg"
android:src="@drawable/taxi_p_center_location_selector"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"/>
<androidx.constraintlayout.widget.Group
android:id="@+id/con_third_group"
android:visibility="visible"
app:constraint_referenced_ids="iv_setting_music_bg,ck_setting,ck_music,iv_center_location_bg,iv_center_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.constraintlayout.widget.Group
android:id="@+id/con_only_one_group"
android:visibility="gone"
app:constraint_referenced_ids="iv_setting_only_bg,ck_setting_only"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/iv_setting_only_bg"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginEnd="@dimen/dp_40"
android:src="@drawable/taxi_p_reset_location_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<CheckBox
android:id="@+id/ck_setting_only"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"
android:background="@drawable/taxi_p_setting_selector"
android:button="@null"
app:layout_constraintBottom_toBottomOf="@+id/iv_setting_only_bg"
app:layout_constraintStart_toStartOf="@+id/iv_setting_only_bg"
app:layout_constraintEnd_toEndOf="@+id/iv_setting_only_bg"
app:layout_constraintTop_toTopOf="@+id/iv_setting_only_bg" />
<com.mogo.och.taxi.passenger.ui.music.MusicView
android:id="@+id/mv_music_info"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_130"
android:visibility="gone"
android:clickable="true"
android:layout_width="@dimen/dp_746"
android:layout_height="@dimen/dp_916"/>
<com.mogo.och.taxi.passenger.ui.systemsetting.TaxiPSettingView
android:id="@+id/clSettingView"
android:layout_width="@dimen/dp_858"
android:layout_height="@dimen/dp_537"
android:layout_marginEnd="@dimen/dp_130"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/traffic_light_view"
@@ -167,15 +246,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<com.mogo.och.taxi.passenger.ui.music.MusicView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:clickable="true"
android:layout_width="@dimen/dp_746"
android:layout_height="@dimen/dp_916"/>
<com.mogo.och.common.module.wigets.ZhiView
android:id="@+id/aciv_xiaozhi_normal"
android:layout_width="@dimen/dp_360"

15
OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml
View File

@@ -7,15 +7,24 @@
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<TextView
android:id="@+id/tv_music_title"
tools:text="音乐列表"
android:textColor="@android:color/background_dark"
android:textColor="@color/taxi_p_253A5A"
android:textSize="@dimen/dp_32"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/dp_55"
android:layout_marginTop="@dimen/dp_62"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_music_list"
android:layout_marginTop="@dimen/dp_80"
app:layout_constraintTop_toBottomOf="@+id/tv_music_title"
android:layout_marginTop="@dimen/dp_52"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_20"
android:layout_height="0dp"/>
</merge>

13
OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list_item.xml
View File

@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/acc_default_txt_color"
android:layout_height="@dimen/dp_91"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<TextView
@@ -12,7 +11,10 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/taxi_p_303C52"
android:layout_marginStart="@dimen/dp_55"
android:text="音乐名称"
android:textSize="@dimen/dp_32"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@@ -21,6 +23,7 @@
app:layout_constraintTop_toTopOf="@+id/tv_song_name"
app:layout_constraintBottom_toBottomOf="@+id/tv_song_name"
app:layout_constraintStart_toEndOf="@+id/tv_song_name"
android:layout_marginStart="@dimen/dp_28"
android:src="@drawable/taxi_p_music_list_playing"
android:visibility="gone"
android:layout_width="wrap_content"
@@ -30,6 +33,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/taxi_p_425877"
android:textSize="@dimen/dp_24"
android:background="@drawable/taxi_p_music_list_tag_bg"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_45"
android:text="轻柔"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

3
OCH/taxi/passenger/src/main/res/values/colors.xml
View File

@@ -32,6 +32,7 @@
<color name="taxi_p_303C52">#303C52</color>
<color name="taxi_p_2CBFFC">#2CBFFC</color>
<color name="taxi_p_1060ff">#1060ff</color>
<color name="taxi_p_425877">#425877</color>
<color name="taxi_p_96a5c2">#96a5c2</color>
<color name="taxi_p_76D7FF">#76D7FF</color>
<color name="taxi_p_255BAA">#255BAA</color>
@@ -44,6 +45,8 @@
<color name="taxi_p_B37E90BF">#B37E90BF</color>
<color name="taxi_p_488ED0">#44488ED0</color>
<color name="taxi_p_598CFF">#598CFF</color>
<color name="taxi_p_253A5A">#253A5A</color>
<color name="taxi_p_4DFFFFFF">#4DFFFFFF</color>
<color name="taxi_p_464646">#464646</color>

1
core/mogo-core-res/src/main/res/values/dimens.xml
View File

@@ -40,6 +40,7 @@
<dimen name="dp_14">14dp</dimen>
<dimen name="dp_15">15dp</dimen>
<dimen name="dp_16">16dp</dimen>
<dimen name="dp_16_5">16.5dp</dimen>
<dimen name="dp_17">17dp</dimen>
<dimen name="dp_18">18dp</dimen>
<dimen name="dp_19">19dp</dimen>