diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 26618df6e9..e8b50f2c1d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -19,6 +19,7 @@
+
diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
index a21558e292..372ad92698 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -118,7 +118,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
// 设置是否显示道路信息view
options.setLaneInfoShow( false );
// 设置是否自动改变缩放等级
- options.setAutoChangeZoom( false );
+ options.setAutoChangeZoom( true );
// 设置是否自动全览模式,即在算路成功后自动进入全览模式
options.setAutoDisplayOverview( false );
// 设置路线转向箭头隐藏和显示
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java
index 4fb5fb5a95..ccf54baede 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java
@@ -39,6 +39,8 @@ public class JSurfaceView extends SurfaceView implements Runnable, SurfaceHolder
*/
private int[] mFrames;
+ private Thread mThread;
+
// 使用 BitmapFactory.Option.inBitmap 属性复用 bitmap 对象
private Bitmap mContainerBitmap = null;
@@ -78,12 +80,19 @@ public class JSurfaceView extends SurfaceView implements Runnable, SurfaceHolder
if ( bRunning ) {
return;
}
- ThreadPoolService.execute( this );
bRunning = true;
+ mThread = new Thread( this );
+ mThread.start();
}
public void stop() {
bRunning = false;
+ try {
+ mThread.interrupt();
+ mThread = null;
+ } catch ( Exception e ) {
+ e.printStackTrace();
+ }
}
@Override
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_000.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00000.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_000.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00000.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_001.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00001.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_001.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00001.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_002.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00002.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_002.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00002.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_003.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00003.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_003.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00003.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_004.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00004.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_004.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00004.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_005.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00005.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_005.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00005.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_006.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00006.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_006.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00006.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_007.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00007.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_007.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00007.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_008.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00008.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_008.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00008.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_009.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00009.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_009.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00009.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_010.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00010.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_010.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00010.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_011.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00011.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_011.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00011.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_012.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00012.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_012.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00012.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_013.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00013.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_013.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00013.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_014.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00014.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_014.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00014.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_015.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00015.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_015.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00015.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_016.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00016.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_016.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00016.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_017.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00017.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_017.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00017.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_018.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00018.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_018.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00018.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_019.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00019.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_019.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00019.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_020.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00020.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_020.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00020.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_021.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00021.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_021.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00021.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_022.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00022.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_022.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00022.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_023.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00023.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_023.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00023.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_024.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00024.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_024.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00024.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_025.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00025.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_025.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00025.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_026.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00026.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_026.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00026.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_027.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00027.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_027.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00027.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_028.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00028.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_028.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00028.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_029.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00029.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_029.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00029.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_030.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00030.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_030.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00030.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_031.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00031.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_031.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00031.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_032.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00032.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_032.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00032.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_033.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00033.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_033.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00033.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_034.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00034.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_034.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00034.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_035.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00035.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_035.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00035.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_036.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00036.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_036.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00036.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_037.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00037.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_037.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00037.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_038.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00038.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_038.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00038.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_039.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00039.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_039.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00039.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_040.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00040.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_040.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00040.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_041.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00041.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_041.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00041.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_042.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00042.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_042.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00042.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_043.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00043.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_043.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00043.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_044.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00044.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_044.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00044.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_045.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00045.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_045.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00045.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_046.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00046.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_046.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00046.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_047.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00047.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_047.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00047.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_048.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00048.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_048.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00048.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_049.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00049.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_049.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00049.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_050.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00050.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_050.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00050.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_051.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00051.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_051.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00051.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_052.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00052.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_052.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00052.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_053.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00053.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_053.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00053.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_054.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00054.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_054.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00054.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_055.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00055.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_055.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00055.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_056.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00056.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_056.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00056.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_057.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00057.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_057.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00057.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_058.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00058.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_058.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00058.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_059.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00059.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_059.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00059.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_060.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00060.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_060.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00060.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_061.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00061.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_061.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00061.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_062.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00062.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_062.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00062.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_063.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00063.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_063.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00063.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_064.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00064.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_064.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00064.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_065.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00065.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_065.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00065.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_066.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00066.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_066.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00066.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_067.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00067.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_067.png
rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00067.png
diff --git a/upload.sh b/upload.sh
index 16a2bafedb..b6c85e5845 100755
--- a/upload.sh
+++ b/upload.sh
@@ -17,3 +17,4 @@
./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-extensions:uploadArchives
./gradlew :modules:mogo-module-search:clean :modules:mogo-module-search:uploadArchives
./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives
+./gradlew :modules:mogo-module-back:clean :modules:mogo-module-back:uploadArchives