From 8b8b6a6cf753f51c42d8c42c6a5b461ecb230e91 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 3 Sep 2020 21:22:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E9=98=B4=E5=BD=B1?= =?UTF-8?q?=E5=9B=BE=E7=89=87-=E7=BC=BA=E5=B0=91=E7=99=BD=E5=A4=A9?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/V2XScenarioHistoryFragment.java | 3 +- .../v2x/view/RoundConstraintLayout.java | 25 ++- .../v2x_panel_list_background.9.png | Bin 0 -> 2779 bytes .../v2x_panel_list_background.9.png | Bin 0 -> 4657 bytes .../res/layout/item_v2x_illegal_parking.xml | 4 +- ...e_v2x_event_panel_fragment_event_panel.xml | 162 ++++++++---------- ..._event_panel_fragment_scenario_history.xml | 31 ++-- .../layout/module_v2x_event_share_empty.xml | 2 +- .../src/main/res/values/colors.xml | 1 + .../v2x_panel_list_background_light.9.png | Bin 0 -> 2779 bytes .../v2x_panel_list_background_light.9.png | Bin 0 -> 4657 bytes .../src/main/module-v2x-res/values/colors.xml | 2 +- 12 files changed, 111 insertions(+), 119 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 9211a4f569..a6153eb25d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -3,6 +3,7 @@ package com.mogo.module.v2x.fragment; import android.content.Context; import android.util.Log; import android.view.View; +import android.widget.LinearLayout; import androidx.annotation.NonNull; import androidx.coordinatorlayout.widget.CoordinatorLayout; @@ -37,7 +38,7 @@ public class V2XScenarioHistoryFragment private String TAG = "ScenarioHistoryFragment"; private V2XListEmptyView mEmptyView; - private CoordinatorLayout mClHistoryList; + private LinearLayout mClHistoryList; private RecyclerView mRecyclerView; private V2XScenarioHistoryAdapter mV2XScenarioHistoryAdapter; private ArrayList mV2XHistoryScenarioData = new ArrayList<>(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java index 40e05358a0..607d8a3a04 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java @@ -18,6 +18,9 @@ import com.mogo.skin.support.IMogoSkinCompatSupportable; import com.mogo.skin.support.IMogoSkinSupportInstaller; import com.mogo.skin.support.MogoSkinManager; import com.mogo.skin.support.SkinMode; +import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; +import com.mogo.skin.support.helper.MogoSkinCompatHelperDelegate; +import com.mogo.skin.support.helper.MogoSkinCompatTextHelperDelegate; /** * author : donghongyu @@ -31,19 +34,14 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin private float roundLayoutRadius = 14f; private Path roundPath; private RectF rectF; - + private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper; public RoundConstraintLayout(Context context) { this(context, null); } - public RoundConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs); - } - public RoundConstraintLayout(Context context, AttributeSet attrs) { - super(context, attrs); - + this(context, attrs, 0); TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundLayout); roundLayoutRadius = typedArray.getDimensionPixelSize(R.styleable.RoundLayout_roundLayoutRadius, (int) roundLayoutRadius); typedArray.recycle(); @@ -51,6 +49,13 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin init(); } + public RoundConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this); + mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr); + } + + private void init() { setWillNotDraw(false);//如果你继承的是ViewGroup,注意此行,否则draw方法是不会回调的; roundPath = new Path(); @@ -84,9 +89,11 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin super.draw(canvas); } - @Override public void applySkin() { - + if (mBackgroundTintHelper != null) { + mBackgroundTintHelper.applySkin(); + } } + } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png new file mode 100644 index 0000000000000000000000000000000000000000..245c2e855c00fc86809e0b4d0d5ff617f34d3db1 GIT binary patch literal 2779 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 - - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 8823070525..3270297d56 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -5,105 +5,95 @@ android:id="@+id/clPanelContainer" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@drawable/v2x_panel_list_background" android:clickable="true" android:visibility="gone" tools:visibility="visible"> - + android:layout_height="@dimen/dp_154" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + - + - + - + + - + - - + - + - - - - - diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml index 4f91e0dbcb..ade8f9ebe6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml @@ -12,30 +12,23 @@ android:visibility="gone" tools:visibility="visible" /> - - - - - - + android:paddingStart="@dimen/dp_60" + android:paddingBottom="@dimen/dp_27" + android:text="今日出行遇到的交通事件" + android:textColor="@color/v2x_FFF_333" + android:textSize="@dimen/dp_36" + android:textStyle="bold" + app:layout_scrollFlags="scroll|enterAlways" /> - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index 79771659da..2ab0139341 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -36,7 +36,7 @@ android:layout_height="48px" android:layout_centerHorizontal="true" android:layout_toLeftOf="@id/center" - android:background="@drawable/v2xt_dw_common_corner_bkg_dark" + android:background="#3F4057" android:clickable="true" android:onClick="shareEventAction" android:text="去分享" diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 1285a749e4..2c5b584b68 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -18,5 +18,6 @@ #ff616381 #FFFFFF #555A75 + #000000 \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..245c2e855c00fc86809e0b4d0d5ff617f34d3db1 GIT binary patch literal 2779 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 #666666 #F5F5F5 - + #FFFFFF From 7065bfd5fa7d17b2e38d06a7b035b699efc66a06 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Sep 2020 21:34:29 +0800 Subject: [PATCH 2/3] authorize module add img of black and white --- .../authorize/layout/AuthorizeDialog.kt | 11 +- .../module_authorize_selector_blue_corner.xml | 4 +- ...le_authorize_selector_blue_left_corner.xml | 4 +- .../module_authorize_selector_dark_corner.xml | 3 +- ...module_authorize_shape_drak_top_corner.xml | 7 - .../module_authorize_selector_blue_corner.xml | 15 ++ ...le_authorize_selector_blue_left_corner.xml | 15 ++ .../module_authorize_selector_dark_corner.xml | 8 + ...e_authorize_selector_dark_right_corner.xml | 15 ++ .../module_authorize_shape_top_corner.xml | 10 + .../module_authorize_selector_blue_corner.xml | 8 +- ...le_authorize_selector_blue_left_corner.xml | 4 +- .../module_authorize_selector_dark_corner.xml | 3 +- ...module_authorize_shape_drak_top_corner.xml | 7 - .../module_authorize_shape_top_corner.xml | 10 + .../module_authorize_fragment.xml | 2 +- .../module_authorize_fragment.xml | 236 ++++++++++++++++++ .../res/layout/module_authorize_fragment.xml | 116 +++++---- .../module_authorize_title_left_symbol.png | Bin 0 -> 1245 bytes .../module_authorize_title_right_symbol.png | Bin 0 -> 1246 bytes .../module_authorize_loading_error.png | Bin 0 -> 10090 bytes .../module_authorize_title_left_symbol.png | Bin 0 -> 1245 bytes .../module_authorize_title_right_symbol.png | Bin 0 -> 1246 bytes .../mipmap/module_authorize_loading_error.png | Bin 4769 -> 3922 bytes .../module_authorize_title_left_symbol.png | Bin 0 -> 623 bytes .../module_authorize_title_right_symbol.png | Bin 0 -> 627 bytes .../src/main/res/values/colors.xml | 7 + .../src/main/res/values/styles.xml | 2 +- skin/mogo-skin-light/build.gradle | 1 + ...horize_selector_blue_left_corner_light.xml | 15 ++ ...e_authorize_selector_dark_corner_light.xml | 8 + ...orize_selector_dark_right_corner_light.xml | 15 ++ ...odule_authorize_shape_top_corner_light.xml | 10 + ...horize_selector_blue_left_corner_light.xml | 15 ++ ...e_authorize_selector_dark_corner_light.xml | 8 + ...orize_selector_dark_right_corner_light.xml | 15 ++ ...odule_authorize_shape_top_corner_light.xml | 10 + ...dule_authorize_title_left_symbol_light.png | Bin 0 -> 1404 bytes ...ule_authorize_title_right_symbol_light.png | Bin 0 -> 1396 bytes ...dule_authorize_title_left_symbol_light.png | Bin 0 -> 796 bytes ...ule_authorize_title_right_symbol_light.png | Bin 0 -> 779 bytes .../module-authorize-res/values/colors.xml | 7 + ...ule_carchatting_default_head_img_light.png | Bin 0 -> 886 bytes ...ule_carchatting_default_head_img_light.png | Bin 0 -> 1742 bytes 44 files changed, 516 insertions(+), 75 deletions(-) delete mode 100644 modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_shape_drak_top_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_left_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_right_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_shape_top_corner.xml delete mode 100644 modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_drak_top_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_top_corner.xml create mode 100644 modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1080/module_authorize_fragment.xml create mode 100644 modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_left_symbol.png create mode 100644 modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_right_symbol.png create mode 100644 modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_loading_error.png create mode 100644 modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_left_symbol.png create mode 100644 modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_right_symbol.png create mode 100644 modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_left_symbol.png create mode 100644 modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_right_symbol.png create mode 100644 modules/mogo-module-authorize/src/main/res/values/colors.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_blue_left_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_right_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_shape_top_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_blue_left_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_right_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_shape_top_corner_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_left_symbol_light.png create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_right_symbol_light.png create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_left_symbol_light.png create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_right_symbol_light.png create mode 100644 skin/mogo-skin-light/src/main/module-authorize-res/values/colors.xml create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_default_head_img_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_default_head_img_light.png diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt index 5d74894005..abe1cd043a 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt @@ -1,6 +1,7 @@ package com.mogo.module.authorize.layout import android.content.Context +import android.graphics.drawable.ColorDrawable import android.text.Html import android.view.View import android.widget.Button @@ -14,6 +15,7 @@ import com.mogo.module.authorize.voice.IVoiceAuthorizeIntentListener import com.mogo.module.authorize.voice.IVoiceCommandListener import com.mogo.module.authorize.voice.VoiceUtil import com.mogo.module.common.dialog.BaseFloatDialog +import com.mogo.module.common.utils.CarSeries import com.mogo.utils.TipToast import com.mogo.utils.logger.Logger import kotlinx.coroutines.Dispatchers @@ -62,7 +64,12 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList private fun setWrapContent() { val mWindow = window if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){ - if (mWindow != null) { + if (mWindow != null && CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { + val lp = mWindow.attributes + lp.width = 1920 + lp.height = 1080 + mWindow.attributes = lp + }else{ val lp = mWindow.attributes lp.width = 1024 lp.height = 600 @@ -78,7 +85,7 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList } } - fun initViews() { + private fun initViews() { Logger.d(TAG, "initView ") AnalyticsUtil.track(AnalyticsUtil.INVOKE_TRACK_AUTHORIZE_SHOW) init() diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml index c2d1fec152..93b269154a 100644 --- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml @@ -3,13 +3,13 @@ - + - + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml index 8c950afee3..9d0ac5061d 100644 --- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml @@ -3,13 +3,13 @@ - + - + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml index 86e673bca6..e9cb674da9 100644 --- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml @@ -2,6 +2,7 @@ + android:startColor="#2A2B38 " /> \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_shape_drak_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_shape_drak_top_corner.xml deleted file mode 100644 index 38ff34eb71..0000000000 --- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_shape_drak_top_corner.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_corner.xml new file mode 100644 index 0000000000..63144dcf3c --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_corner.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_left_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_left_corner.xml new file mode 100644 index 0000000000..9d0ac5061d --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_left_corner.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_corner.xml new file mode 100644 index 0000000000..e9cb674da9 --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_corner.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_right_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_right_corner.xml new file mode 100644 index 0000000000..086f0e93fa --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_right_corner.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_shape_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_shape_top_corner.xml new file mode 100644 index 0000000000..47a3428433 --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_shape_top_corner.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml index c2d1fec152..63144dcf3c 100644 --- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml +++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml @@ -2,14 +2,14 @@ - - + + - - + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml index 6399ca294a..536fc2c742 100644 --- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml +++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml @@ -3,13 +3,13 @@ - + - + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml index 1b8bbd3159..c366e79eea 100644 --- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml +++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml @@ -2,6 +2,7 @@ + android:startColor="#2A2B38" /> \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_drak_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_drak_top_corner.xml deleted file mode 100644 index 0f2dab89cb..0000000000 --- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_drak_top_corner.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_top_corner.xml new file mode 100644 index 0000000000..47e186f1e7 --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_top_corner.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml index f3d940ee26..e3a16367f6 100644 --- a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml +++ b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml @@ -207,4 +207,4 @@ app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + diff --git a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1080/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1080/module_authorize_fragment.xml new file mode 100644 index 0000000000..1642421fb0 --- /dev/null +++ b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1080/module_authorize_fragment.xml @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + +