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 1711edad2e..b8a025e465 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 @@ -1,5 +1,6 @@ package com.mogo.module.v2x.view; +import android.app.Application; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -7,9 +8,14 @@ import android.graphics.Path; import android.graphics.RectF; import android.util.AttributeSet; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatCallback; +import androidx.appcompat.app.AppCompatDelegate; import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.module.v2x.R; +import com.mogo.skin.support.IMogoSkinSupportInstaller; +import com.mogo.skin.support.SkinMode; /** * author : donghongyu @@ -18,7 +24,7 @@ import com.mogo.module.v2x.R; * desc : * version: 1.0 */ -public class RoundConstraintLayout extends ConstraintLayout{ +public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkinSupportInstaller { private float roundLayoutRadius = 14f; private Path roundPath; @@ -74,4 +80,24 @@ public class RoundConstraintLayout extends ConstraintLayout{ } super.draw(canvas); } + + @Override + public void install(Application application) { + + } + + @Override + public void loadSkin(SkinMode skinMode) { + + } + + @Override + public AppCompatDelegate getSkinAppCompatDelegate(AppCompatActivity activity, AppCompatCallback callback) { + return null; + } + + @Override + public void init(Context context) { + + } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_blank_history_event.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_blank_history_event.png deleted file mode 100644 index c77748e661..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_blank_history_event.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png index e7c778c377..ab63bcf60e 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/panel_shadow_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/panel_shadow_bg.png new file mode 100644 index 0000000000..a3d240de1e Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/panel_shadow_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png new file mode 100644 index 0000000000..2cf79cfff6 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_share_empty.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_share_empty.png new file mode 100644 index 0000000000..893d02518c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_share_empty.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml index 05b8d4a553..1dad69a517 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml @@ -1,7 +1,7 @@ - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml index 3358bb6463..4fb03d7f47 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/llEventMore" - android:layout_width="@dimen/dp_132" - android:layout_height="@dimen/dp_132" + android:layout_width="@dimen/module_v2x_panel_width" + android:layout_height="@dimen/module_v2x_panel_width" android:background="@drawable/v2x_drawable_event_more_bkg" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml index 7bb1bf469b..9bc37b13c1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml @@ -9,7 +9,7 @@ android:layout_width="@dimen/dp_355" android:layout_height="@dimen/dp_355" android:layout_marginTop="@dimen/dp_120" - android:src="@drawable/icon_blank_history_event" + android:src="@drawable/icon_share_empty" app:layout_constraintBottom_toTopOf="@+id/tvTrip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index fdc2d42c78..735550dda3 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -55,5 +55,6 @@ 16px 16px 20px + 66px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_window_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_window_close_light.png new file mode 100644 index 0000000000..d3eb35c6ae Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_window_close_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_event_panel_more_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_event_panel_more_light.png new file mode 100644 index 0000000000..62e3039df2 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_event_panel_more_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_share_empty_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_share_empty_light.png new file mode 100644 index 0000000000..6d45024974 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_share_empty_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_window_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_window_close_light.png new file mode 100644 index 0000000000..d3eb35c6ae Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_window_close_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/panel_shadow_bg_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/panel_shadow_bg_light.png new file mode 100644 index 0000000000..58b9db6f42 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/panel_shadow_bg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_share_empty_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_share_empty_light.png new file mode 100644 index 0000000000..03da771490 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_share_empty_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml new file mode 100644 index 0000000000..bbd1124438 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml new file mode 100644 index 0000000000..1c9c0b5e05 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + \ No newline at end of file