diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
index 1770c16984..ca1346e002 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1053,5 +1053,6 @@
42px
48px
-10px
+ 10px
diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml
index 1e2c7b1cdc..170c5a430d 100644
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1044,4 +1044,5 @@
22.9688px
26.2500px
-8px
+ 8px
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 b84ccdcde8..e962718e6c 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
@@ -81,8 +81,10 @@
android:id="@+id/module_entrance_id_move2_current_location"
android:layout_width="@dimen/module_ext_operation_panel_width"
android:layout_height="@dimen/module_ext_operation_panel_move2_height"
- android:background="@drawable/module_ext_dw_common_corner_bkg"
+ android:background="@drawable/module_ext_shadow_bkg"
android:scaleType="centerInside"
+ android:translationY="@dimen/module_common_shadow_width_pos"
+ android:translationX="@dimen/module_common_shadow_width_pos"
android:src="@drawable/module_map_ic_move2_current_location"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
index d4118d06e7..703bb00968 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
@@ -73,8 +73,8 @@
26px
+ 66px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 0304873cfe..4d5d931a5b 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -30,17 +30,17 @@
32px
2px
- 120px
+ 140px
32px
60px
92px
24px
48px
2px
- 120px
- 120px
+ 140px
+ 140px
120px
- 30px
+ 20px
30px
32px
32px
@@ -146,4 +146,5 @@
40px
45px
+ 120px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index 6e8de9e26f..ce413ccb95 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -30,17 +30,17 @@
32px
2px
- 120px
+ 140px
32px
60px
92px
24px
48px
2px
- 120px
+ 140px
120px
120px
- 30px
+ 20px
30px
32px
32px
@@ -148,4 +148,5 @@
175px
30px
45px
+ 120px
\ 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 2f344bce6f..4c65427b84 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -30,17 +30,17 @@
20px
1px
- 66px
+ 82px
20px
34.5px
58px
17px
31.4px
1.2px
- 66px
+ 82px
66px
66px
- 16px
+ 8px
16px
34.5px
20px
@@ -153,5 +153,6 @@
19px
16px
26px
+ 66px
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index a9cf9fe2a5..592d7824ff 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -48,6 +48,12 @@
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
android:padding="@dimen/module_main_entrance_fragment_container_padding" />
+
+
+
-
-
-
{
- final AnimationDrawable drawable = new AnimationDrawable();
- for (int i = 0; i < resources.length; i++) {
- drawable.setOneShot(false);
- drawable.addFrame(targetImageView.getResources().getDrawable(resources[i]), duration);
- }
- UiThreadHandler.post(() -> {
- targetImageView.setBackground(drawable);
- delegate = new DelegateDrawable(drawable);
- start();
- });
- });
+ INTERVAL = duration;
+ start();
}
@Override
synchronized public void start() {
- if (delegate != null && !isStarted) {
- targetImageView.setVisibility(View.VISIBLE);
- isStarted = true;
- delegate.start();
- }
+ isStarted = true;
+ mHandler.sendEmptyMessage( MSG_LOOP );
+ targetImageView.setVisibility(View.VISIBLE);
}
@Override
synchronized public void stop() {
- if (delegate != null && isStarted) {
- isStarted = false;
- delegate.stop();
- targetImageView.setVisibility(View.INVISIBLE);
- }
+ isStarted = false;
+ mHandler.removeMessages( MSG_LOOP );
+ targetImageView.setVisibility(View.INVISIBLE);
}
public void soptWithError(){
- if (delegate != null && isStarted) {
- isStarted = false;
- delegate.stop();
- }
+ stop();
+ targetImageView.setVisibility(View.VISIBLE);
}
public void release() {
- delegate = null;
+ stop();
}
}