diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java index dfd77cce0c..2c8633d0c9 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java @@ -24,8 +24,8 @@ public class AppIndicatorAdapter extends RecycleBaseAdapter< AppInfo > { @Override public void onBindViewHolder( RecycleViewHolder holder, AppInfo app, int position ) { ImageView ivIndicator = holder.getView( R.id.module_apps_id_app_icon ); - ivIndicator.setImageResource( app.getIconResId() ); - holder.itemView.setOnClickListener( view -> { + ivIndicator.setBackgroundResource( app.getIconResId() ); + ivIndicator.setOnClickListener( ( view ) -> { if ( getOnItemClickedListener() != null ) { getOnItemClickedListener().onItemClicked( app, position ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java index 12c4c92d54..64c1c5723a 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java @@ -13,12 +13,12 @@ import java.util.List; */ public class NavigatorApps { - private static AppInfo app = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi, 1 ); + private static AppInfo app = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi_selector, 1 ); private static AppInfo app_ = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi_disable, 1 ); // private static AppInfo app2 = new AppInfo( "音乐", "com.tencent.wecarflow", "", 0, null, R.drawable.module_apps_ic_navigator_media, 2 ); - private static AppInfo app2 = new AppInfo( "音乐", "com.zhidao.music", "", 0, null, R.drawable.module_apps_ic_navigator_media, 2 ); - private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im, 6 ); - private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist, 4 ); + private static AppInfo app2 = new AppInfo( "音乐", "com.zhidao.music", "", 0, null, R.drawable.module_apps_ic_navigator_media_selector, 2 ); + private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im_selector, 6 ); + private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist_selector, 4 ); public static List< AppInfo > getApps() { List< AppInfo > sApps = new ArrayList<>(); diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed.png new file mode 100644 index 0000000000..3297305281 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im_pressed.png new file mode 100644 index 0000000000..2cd1f32ee1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media_pressed.png new file mode 100644 index 0000000000..77372413ea Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed.png new file mode 100644 index 0000000000..33828da695 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_applist_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_applist_selector.xml new file mode 100644 index 0000000000..92e4a07727 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_applist_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_im_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_im_selector.xml new file mode 100644 index 0000000000..9d24c4abc0 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_im_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_media_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_media_selector.xml new file mode 100644 index 0000000000..ac283b1fec --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_media_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_navi_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_navi_selector.xml new file mode 100644 index 0000000000..536220ebf7 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_navi_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png index f12819ecfc..79d163824d 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png and b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png old mode 100755 new mode 100644 index 2dff68497d..79d163824d Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png and b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png index acdb4d7063..8679746dc7 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png differ diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml index 4103d9c547..67cbb204d3 100644 --- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml @@ -1,9 +1,9 @@ 16dp - 2dp - 56px - 65px + 2px + 70px + 76px 35px 35px 4px diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml index 6feb909906..4a29170957 100644 --- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml @@ -1,9 +1,9 @@ 16dp - 2dp - 56px - 65px + 2px + 70px + 76px 35px 35px 4px diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml index fb1ea406df..f210b727f5 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -1,9 +1,9 @@ 20dp - 4dp - 100px - 117px + 4px + 120px + 130px 60px 60px 8px diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml index 316b89ce91..2a196c5c6a 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml @@ -1,9 +1,9 @@ 20dp - 4dp - 100px - 117px + 4px + 120px + 130px 60px 60px 8px diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml index d5bbe4d08b..39993d0f54 100644 --- a/modules/mogo-module-service/src/main/res/values/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values/dimens.xml @@ -1,9 +1,9 @@ 20dp - 4dp - 100px - 117px + 4px + 120px + 130px 60px 60px 8px diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed_light.png new file mode 100644 index 0000000000..2e039e8ac6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_im_pressed_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_im_pressed_light.png new file mode 100644 index 0000000000..9fab3400fc Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_im_pressed_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_media_pressed_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_media_pressed_light.png new file mode 100644 index 0000000000..fe6e7f3a16 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_media_pressed_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed_light.png new file mode 100644 index 0000000000..6962e444b3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_applist_selector_light.xml b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_applist_selector_light.xml new file mode 100644 index 0000000000..1f19dc38e0 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_applist_selector_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_im_selector_light.xml b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_im_selector_light.xml new file mode 100644 index 0000000000..0a7bf4e528 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_im_selector_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_media_selector_light.xml b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_media_selector_light.xml new file mode 100644 index 0000000000..8d1173f143 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_media_selector_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_navi_selector_light.xml b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_navi_selector_light.xml new file mode 100644 index 0000000000..920ae5cbe8 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_ic_navigator_navi_selector_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_marker_bkg_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_marker_bkg_light.png old mode 100755 new mode 100644 index 8044b0458f..23e2e858d3 Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_marker_bkg_light.png and b/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_marker_bkg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png old mode 100755 new mode 100644 index 8044b0458f..23e2e858d3 Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png and b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_marker_bkg_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_marker_bkg_light.png old mode 100755 new mode 100644 index d43d74c08c..13dd664c1a Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_marker_bkg_light.png and b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_marker_bkg_light.png differ