From c204c6089449b7a19fa35eaad9b39aef0088cd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 22 Sep 2021 20:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=8C=89=E9=92=AE=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?HMI=E4=B8=AD=EF=BC=8C=E8=BF=98=E9=9C=80=E8=A6=81=E5=88=B6?= =?UTF-8?q?=E5=AE=9A=E7=8A=B6=E6=80=81=E7=9B=91=E5=90=AC=E7=AD=89=E5=9B=9E?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .idea/misc.xml | 4 +- .../core/function/hmi/ui/MoGoHmiFragment.kt | 4 +- .../hmi/ui/widget/AutoPilotStatusView.kt | 70 ++++++++++++++++++ .../src/main/res/layout/fragment_hmi.xml | 16 +++- .../main/res/layout/view_autopilot_status.xml | 32 ++++++++ core/mogo-core-res/build.gradle | 2 +- .../drawable-xxhdpi/icon_autopilot_status.png | Bin 0 -> 2342 bytes .../module_hmi_autopilot_status_bg.xml | 7 ++ ...module_hmi_autopilot_status_checked_bg.xml | 14 ++++ ...odule_hmi_autopilot_status_disabled_bg.xml | 14 ++++ .../module_hmi_autopilot_status_enable_bg.xml | 14 ++++ .../drawable/yi_biao_pan_bg_nor.xml | 8 +- .../values-xhdpi-2560x1440/dimens.xml | 11 --- .../function-hmi-res/values-xhdpi/dimens.xml | 11 --- .../drawable-mdpi/placeholder.png | Bin .../drawable-xhdpi/placeholder.png | Bin .../drawable/placeholder.png | Bin .../res/values-xhdpi-2560x1440/dimens.xml | 31 ++++++++ .../src/main/res/values/color.xml | 5 ++ .../src/main/res/values/dimens.xml | 29 ++++++++ .../values/string.xml | 0 .../values/styles.xml | 8 ++ .../extensions/entrance/EntranceFragment.java | 46 ++++++------ .../module_ext_ic_autopilot.png | Bin 1781 -> 0 bytes .../module_mogo_autopilot_status_bg.xml | 16 ---- .../res/layout/module_ext_layout_entrance.xml | 21 ------ .../res/values-xhdpi-2560x1440/dimens.xml | 7 +- .../src/main/res/values/dimens.xml | 6 -- 28 files changed, 273 insertions(+), 103 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml create mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_autopilot_status.png create mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_bg.xml create mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_checked_bg.xml create mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_disabled_bg.xml create mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_enable_bg.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/values-xhdpi-2560x1440/dimens.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/values-xhdpi/dimens.xml rename core/mogo-core-res/src/main/{function-common-res => res}/drawable-mdpi/placeholder.png (100%) rename core/mogo-core-res/src/main/{function-common-res => res}/drawable-xhdpi/placeholder.png (100%) rename core/mogo-core-res/src/main/{function-common-res => res}/drawable/placeholder.png (100%) create mode 100644 core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml create mode 100644 core/mogo-core-res/src/main/res/values/color.xml create mode 100644 core/mogo-core-res/src/main/res/values/dimens.xml rename core/mogo-core-res/src/main/{function-common-res => res}/values/string.xml (100%) rename core/mogo-core-res/src/main/{function-common-res => res}/values/styles.xml (65%) delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_autopilot.png delete mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_mogo_autopilot_status_bg.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index e3494654c7..b26ddeecc3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,8 +13,10 @@ - + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 2628ebafed..098ff1099c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -29,7 +29,9 @@ class MoGoHmiFragment : MvpFragment var mWarningFloat: WarningFloat.Builder? = null - override fun initViews() {} + override fun initViews() { + autopilotStatus.visibility = View.VISIBLE + } override fun getLayoutId(): Int { return R.layout.fragment_hmi diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt new file mode 100644 index 0000000000..9e53b57b1b --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -0,0 +1,70 @@ +package com.mogo.eagle.core.function.hmi.ui.widget + +import android.content.Context +import android.content.res.TypedArray +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.LogUtils +import kotlinx.android.synthetic.main.view_autopilot_status.view.* + +/** + * @author xiaoyuzhou + * @date 2021/9/22 3:59 下午 + * 自动驾驶状态按钮 + */ +class AutoPilotStatusView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet +) : ConstraintLayout(context, attrs) { + + private val TAG = "AutopilotStatusView" + + private var mAutopilotStatus: Int = 0 + + init { + val typedArray: TypedArray = + context.obtainStyledAttributes(attrs, R.styleable.AutopilotStatusView) + mAutopilotStatus = typedArray.getInt(R.styleable.AutopilotStatusView_autopilotStatus, 0) + typedArray.recycle() + + LogUtils.dTag(TAG, "autopilotStatus: $mAutopilotStatus") + + initView(context) + } + + private fun initView(context: Context) { + LayoutInflater.from(context).inflate(R.layout.view_autopilot_status, this, true) + + val lp = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT) + layoutParams = lp + + setAutoPilotStatus(mAutopilotStatus) + } + + /** + * 设置自动驾驶状态 + * 0-// 不可自动驾驶，adas与工控机没有链接，或工控机异常 + * 1-// 可自动驾驶，目前处于人工干预状态 + * 2-// 自动驾驶中 + */ + fun setAutoPilotStatus(autopilotStatus: Int) { + mAutopilotStatus = autopilotStatus + when (autopilotStatus) { + 0 -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常 + clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_disabled_bg) + tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_disable)) + } + 1 -> {// 可自动驾驶，目前处于人工干预状态 + clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_enable_bg) + tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable)) + } + 2 -> {// 自动驾驶中 + clAutopilotStatus.setBackgroundResource(R.drawable.module_hmi_autopilot_status_checked_bg) + tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable)) + } + } + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index fe8d7fea80..d36076ac81 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -18,12 +18,24 @@ android:id="@+id/flSpeedChartView" android:layout_width="@dimen/module_ext_speed_width" android:layout_height="@dimen/module_ext_speed_height" - android:layout_marginLeft="@dimen/dp_40" - android:layout_marginTop="@dimen/dp_40" + android:layout_marginLeft="@dimen/module_mogo_autopilot_status_margin_left" + android:layout_marginTop="@dimen/module_ext_arcView_top" android:elevation="@dimen/dp_10" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-res/build.gradle b/core/mogo-core-res/build.gradle index 876949686b..058751820b 100644 --- a/core/mogo-core-res/build.gradle +++ b/core/mogo-core-res/build.gradle @@ -41,7 +41,7 @@ android { sourceSets { main { res.srcDirs = [ - 'src/main/function-common-res', + 'src/main/res', 'src/main/function-adas-res', 'src/main/function-chat-res', 'src/main/function-check-res', diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_autopilot_status.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_autopilot_status.png new file mode 100644 index 0000000000000000000000000000000000000000..927296d6900963a898b84f78d1f7699c9d5cec12 GIT binary patch literal 2342 zcmV+>3EB3EP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NuUD&1ONa40RR91NdN!<04n#S8~^|akV!;ARCodHn`?*_Wf;djrj}Zf znYvqnXrg&1mC6uNQ%fNc@@qlg3=Uq_s!5^Jktj+JVmt-rfazcq$SNmruovtGUr@B0 zSsiwYJ;j*>HiL_xk|O_#GqF<=O%oKdGr`xOGemJ`rr})`8^}EY4tGXnVq%Jio_n<+ zkQo5Bfm@)KM0~_cFNMw%2+Rk~pqAxN$j#4ErBrV>g5FNh4dA5=!S$Ly0)7VIQ#ia03BU*K2%eMJ0+I)w07!SPsd-h<6)be8~)q$?)!AH-2S zSNQ|QvAL4M;Sg}vk%4Z5wZQ9k%1T)Ag1D}?q4F7$HEz)!M-AX4aFG)zJ(f%0lui^M zh=+?PuZEPN+RSj!6C84hhR!?Sj!Xe_G8T`34+pC#zn-Z>W4y^4qHPelBz2Gq8p2)A zM3+JCrc^X=zQCbCy8mBD6`)E+;s;!wQ_p%)!fAhCo4x;wj-O*M7WpZQClFtgDBu3h zQBmG%@)qt{=Qa6 zHK-uo;J78f{YL5-&#*XXp?`$YNsV{H|6!m!Ofn-e4XnN~S<<&Q(YOnBC=W}X`(o3< zXq?4R>qc6_=<=dGfNdRYT$pJ0@Pwmnyt9V27_Iemc?t4ZV@afaJ*cXtAEt59Z}iv1 zl*5vkbGPyV$}34O&{3SOXirR{9ftdgXYv1Rqx%2EcloyxT&s@vf;)khQgjT@OE)L~ zru_=gQD}yTRxvY+@`1;89IZ@nro}ncWp`Ml*$Ika^GD%{>k$G;*XV`AFdHQ__IsF&hMY=`$#X)7=mcg8Ot8TX&W}Uk4y`dtt)O{Ju1!z%`n$0?O z-`lJa_c<^$p%nV`cLg{Av}B=4?ENLs80%?J%fpCE@cSH`1ZPX2$*-1av^(-9P%Yx* zoaSyjK$0Advnp-Fum{ivg0{p>i&%75O~gZd#49QJC=GOuf+X3YA}vqqrTr@C6?wCq zpsN+m#Xzfiogs>=_|6|dpxX;5&m>u{B549^lBt&3bm+#JKCD^|Y+E;`xITSKQt`Y$ z7{g|&CD2?I$+n)fszVhV8}L0IoVJk2+AaU%9VvBC!*-R0Kx5GeCDTVwdT6H>d=CT% zEJV_F%dghUQ;UV$iO4aE`o9@TqR&7vygG#Run(bqRJNO^(}-FjJ{QL@i; zi;2GS0m>^$PSH`E(`v-sja>yza^KT=f@pjD`Gh{_X5whiY##94`Uzub3Nol^u9qE)m2&}8fbVaKU4YBU&_ym|_ zW2~WPBLOsy@*QwW-+LSsM-4w4fk{4&vn#e?HOpj4pWXx$5*>JS;7224A6e|-K2eo` z6M*TBCQjNJN){CMNXsDFzp~DUk|VVB;6qaw&9PiWdd^dgq}cfA0c`t)dy?#DON<^{t2PYnB*URv~nY*{&dk zf6Ko*fd$5zu6!yl4x)#m_icgALW}Q(z6pp2usx*1u*$DE{qT(w>EoaeFfDI}!F1H? z)oUDuzU{X5x(yUR;K9Kv$}69ZSsXQjGuDu83L2=r4Vx+QIt>Hf?Aoc)IV`J8n_lpEHpQI5g3a_{}^Brcnv0eDS01BN7sF(T zV_i|YM14fd5$i$h!X53CEzTy#agskEzoz95x;u#Y=X(W}6C{A1QLYd3Qii$>v{<$Z zOa;Y7GmcAvNtTKO3R<+2o$Teu^|nGa67kOG8B|`F^4|pN4qS!@5xbZZ?QrO?YFeI= znfj$?+V+v2O~g0bTdcegF24z?H(^b M07*qoM6N<$f)F%O!~g&Q literal 0 HcmV?d00001 diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_bg.xml new file mode 100644 index 0000000000..96123080b7 --- /dev/null +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_bg.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_checked_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_checked_bg.xml new file mode 100644 index 0000000000..d18c145877 --- /dev/null +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_checked_bg.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_disabled_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_disabled_bg.xml new file mode 100644 index 0000000000..21ff274a65 --- /dev/null +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_disabled_bg.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_enable_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_enable_bg.xml new file mode 100644 index 0000000000..fac249b7fa --- /dev/null +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_autopilot_status_enable_bg.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_nor.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_nor.xml index 06579a8582..f62c0fb5d2 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_nor.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_nor.xml @@ -5,8 +5,8 @@ android:endColor="#3B4577" android:startColor="#3B4577" /> + android:bottomLeftRadius="@dimen/module_ext_speed_width_big_radius" + android:bottomRightRadius="@dimen/module_ext_speed_width_sm_radius" + android:topLeftRadius="@dimen/module_ext_speed_width_sm_radius" + android:topRightRadius="@dimen/module_ext_speed_width_big_radius" /> \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi-2560x1440/dimens.xml deleted file mode 100644 index 6b2cd8c0f7..0000000000 --- a/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - 460px - 460px - - 320px - 320px - 20px - 110px - 40px - \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi/dimens.xml b/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi/dimens.xml deleted file mode 100644 index c7c9f95016..0000000000 --- a/core/mogo-core-res/src/main/function-hmi-res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - 300px - 300px - - 200px - 200px - 10px - 80px - 28px - \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png b/core/mogo-core-res/src/main/res/drawable-mdpi/placeholder.png similarity index 100% rename from core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png rename to core/mogo-core-res/src/main/res/drawable-mdpi/placeholder.png diff --git a/core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/placeholder.png similarity index 100% rename from core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/placeholder.png diff --git a/core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png b/core/mogo-core-res/src/main/res/drawable/placeholder.png similarity index 100% rename from core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png rename to core/mogo-core-res/src/main/res/drawable/placeholder.png diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml new file mode 100644 index 0000000000..4fd980836a --- /dev/null +++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -0,0 +1,31 @@ + + + 460px + 460px + + 30px + 130px + + 40px + 320px + 320px + 20px + 110px + 40px + + 74px + 92px + + 460px + 140px + 40px + 30px + 92px + 44px + 28px + + 30px + 70px + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/color.xml b/core/mogo-core-res/src/main/res/values/color.xml new file mode 100644 index 0000000000..5c0e10bf2e --- /dev/null +++ b/core/mogo-core-res/src/main/res/values/color.xml @@ -0,0 +1,5 @@ + + + #FFFFFF + #4DFFFFFF + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..3d1a96d9ed --- /dev/null +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -0,0 +1,29 @@ + + + 300px + 300px + + 20px + 110px + + 40px + 200px + 200px + 10px + 80px + 28px + + 46px + 60px + + 300px + 100px + 40px + 30px + 20px + 30px + 18px + + 20px + 50px + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-common-res/values/string.xml b/core/mogo-core-res/src/main/res/values/string.xml similarity index 100% rename from core/mogo-core-res/src/main/function-common-res/values/string.xml rename to core/mogo-core-res/src/main/res/values/string.xml diff --git a/core/mogo-core-res/src/main/function-common-res/values/styles.xml b/core/mogo-core-res/src/main/res/values/styles.xml similarity index 65% rename from core/mogo-core-res/src/main/function-common-res/values/styles.xml rename to core/mogo-core-res/src/main/res/values/styles.xml index af232939d1..4ee346db1c 100644 --- a/core/mogo-core-res/src/main/function-common-res/values/styles.xml +++ b/core/mogo-core-res/src/main/res/values/styles.xml @@ -11,4 +11,12 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 64190b4bf3..bddd39a1c2 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -215,7 +215,7 @@ public class EntranceFragment extends MvpFragment { - ctvAutopilotStatus.setChecked(isInAutopilot); - }); - } +// /** +// * 自动驾驶状态改变 +// * +// * @param isInAutopilot true - 在自动驾驶中 false - 不在自动驾驶中 +// */ +// public void onAutopilotStatusChanged(boolean isInAutopilot) { +// getActivity().runOnUiThread(() -> { +// ctvAutopilotStatus.setChecked(isInAutopilot); +// }); +// } private void autopilotStatusClick() { EntranceViewHolder.getInstance().entranceAutopilotStatusClick(); @@ -443,7 +443,7 @@ public class EntranceFragment extends MvpFragmentPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91H=qLm1ONa40RR91Hvj+t07-?+R{#J8Ur9tkRA>d=n%}EcMHI)qshQCa zHTz*+qtFx+HAp4GsFx7ICrf;&KoF$pRg}aa!%F=F(iau_@!~b#^T`OLGA$o^uqY)$ zC4WR(iTUI9`5gB?oU@(Td-l2K{@^b7-r0N2THm$i&g|JUvro^ME=zxZ{{v9I02YBc z;7KqQ+zTdxE8sFX4}JzGz<1zKPfyQ9%8?~BXgb&cj)I$@6VXq9d8QA03rS)&*avQa zZi;;J+Ur9r1f2$Uf@@$fMSkN<8}t?uWIT8e`~!wkjAz{ObsE`|Y7Fs%*!BS@i&Xg? z!;|2T41ZEi1`lO;g0dH+%9j|fV&XZM>QHG%!xn;5ph~V_uphhulAagsGJE~>uM+cE zSebN+0Ys}n)i6Adjl;$s=~(p7c;qV+^LeG?KsrLO0+h{!SE+vo`2Omez;}1XD}PMP zYeh#vahwk>$C%L{0}DDLPjr$$i$f6<^P8VYcgqY1hez2n_7U~tYLRwmY#d;`n3!kU z=f zla;N<41c5ZxZx5w1%495yFi&F#B--|8Wa~4N8nk~gTWLk-9qHO$YnzgVz4Z~DVF#- zT%QLog6DweC2|c^Y@7`}3=V;>$Rj#>$m1Y3FM(FM$<0(3$16cd*0x%EjnQJT0~`UN zXB2hU#W=>>4vM48oYsPnth76yE;b^&KW2%S!|PS>8nAbUT6~5)NfR5$$J4S;!DsZS z8{tNtlto$Su-uRK$qw?llvvIBvMx$KvJ$DvNEws*Qb_4hkIBZ>r zJ_;TKu38=kLoL43T#ft&TymWOcFsJo0~8;vv%aJ~3@u9Oi7v*TN^Jobi;i8sm)|(0 zuPW-#1>*MExb=YwRkQeSlnOSJfXkwklVZ%0MLu~al_o$XHnSqE>#bZGsa#h@oY&(& z2b_rT)K$xqyv)OPT_nI#8#fVzK1KEA$)}WX*o$9)fr$Q1Lj$juO)G|Q9iy^wEex4yEof36*sKXZ(y<-xF4${ z+ON+1>-d?Uc^2i9rh;aB9ufMIa~AzwO~b?se0&B|CmHRMpRqgz^8)5q6x-2$?t@}? z(JH&&niJM3@pZOKk?nPOb6beFM#y*PHq8>lB@yHQ&_C5QOuWFy38v~jXnm~-#PImc z1LhTy@ct7^e?bruKQz?(9-SrO3%E?SB>u0OW{~+^KK7wzU(>L7fm1JteUsZ;w6D5{ zYXK;e(v?SuAF{m>Lh~;F{R#%L6^opkLjlWl_?*-+AitLRh3eqg9N@`S>q9 z?{kkpS*wBg?+S3J+SL}g;s*P&h8?5cO+d9^I0KvpG1*H+(ldx%?0eta)tNLV5C7T5 zi-~#8Na1SQ;IIgU-hFuxAL`0k6q_}LYNAH*gP>CDd~zxsls2exHDRC7A^ zeG`4rQ@0F+#C>5-hTNOfbS@Gj+TYf*H|H3-P^Vh-52 zR+J~S@@S1gxM|aUtN|%{ zg7kveQjMyvig9{V^6IJ$L0xR`0aX(YCbdL9dBcm~uC}6rj3nF-z6IRThmI^zSBif6 z%hSFetB4<~E}r$p?2`2)HWA}zz_S_Lh&}@D1FmX3;r1Zd^HRUHc_bi?vJ<~T*){ne X{%-a4Ah5#400000NkvXXu0mjf^w>N> diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_mogo_autopilot_status_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_mogo_autopilot_status_bg.xml deleted file mode 100644 index b5596fad13..0000000000 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_mogo_autopilot_status_bg.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 2ac66fe2ce..be6938df0c 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -6,27 +6,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - 50px 60px - 460px - 140px - 20px - 530px - 92px - 44px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 55739ccfca..064dab01f5 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -251,11 +251,5 @@ 35px 38px - 300px - 100px - 20px - 345px - 20px - 30px \ No newline at end of file