From 1b1bd97f0bd9b126c12551f949832b8c250428f3 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Mon, 16 Mar 2020 11:44:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?UI=E6=BB=91=E5=8A=A8=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/apps/AppNavigatorFragment.java | 6 +++++- .../apps/adapter/AppIndicatorAdapter.java | 20 +++++++++++++++++++ .../apps/utils/CardScaleTransformer.java | 3 ++- .../module_apps_fragment_apps_navigator.xml | 2 +- .../DiscreteScrollLayoutManager.java | 4 +++- .../DiscreteScrollItemTransformer.java | 3 ++- .../transform/ScaleTransformer.java | 3 ++- 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java index 8bb87b70bc..498f17ca2f 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -59,6 +59,7 @@ public class AppNavigatorFragment extends MvpFragment { @@ -184,6 +185,9 @@ public class AppNavigatorFragment extends MvpFragment { + + + private int currentPos; /** * */ @@ -30,5 +35,20 @@ public class AppIndicatorAdapter extends RecycleBaseAdapter { ImageView ivIndicator = holder.getView(R.id.module_apps_id_app_icon); ivIndicator.setImageResource(integer.getmIconId()); holder.setText(R.id.module_apps_id_app_name,integer.getmName() ); + + TextView tvTitle = holder.getView(R.id.module_apps_id_app_name); + if (currentPos==holder.getLayoutPosition()) { + ivIndicator.setImageResource(integer.getmIconId()); + tvTitle.setTextColor(ContextCompat.getColor(context,R.color.white)); + }else { + tvTitle.setTextColor(ContextCompat.getColor(context,R.color.white_80)); + ivIndicator.setImageResource(integer.getmUncheckedIconId()); + } + + } + + public void setCurrentPos(int currentPos){ + this.currentPos=currentPos; + notifyDataSetChanged(); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/utils/CardScaleTransformer.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/utils/CardScaleTransformer.java index 1bc8021d5d..fac935ef82 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/utils/CardScaleTransformer.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/utils/CardScaleTransformer.java @@ -2,6 +2,7 @@ package com.mogo.module.apps.utils; import android.view.View; import androidx.annotation.FloatRange; +import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.apps.R; import com.yarolegovich.discretescrollview.transform.DiscreteScrollItemTransformer; import com.yarolegovich.discretescrollview.transform.Pivot; @@ -26,7 +27,7 @@ public class CardScaleTransformer implements DiscreteScrollItemTransformer { } @Override - public void transformItem(View item, float position) { + public void transformItem(View item, RecyclerView.ViewHolder childViewHolder, float position) { item= item.findViewById(R.id.module_apps_id_app_icon); pivotX.setOn(item); diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml index 690abd63a9..514e28f04f 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml @@ -38,7 +38,7 @@ android:text="全部应用" android:maxLines="1" android:layout_marginTop="@dimen/dp_24" - android:textColor="#FFFFFFFF" + android:textColor="@color/white_80" android:textSize="@dimen/dp_26" /> diff --git a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java index 2e0064216b..a8578f5df8 100644 --- a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java +++ b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/DiscreteScrollLayoutManager.java @@ -352,8 +352,10 @@ public class DiscreteScrollLayoutManager extends LinearLayoutManager { int clampAfterDistance = scrollToChangeCurrent * transformClampItemCount; for (int i = 0; i < recyclerViewProxy.getChildCount(); i++) { View child = recyclerViewProxy.getChildAt(i); + + //RecyclerView.ViewHolder childViewHolder = recyclerView.getChildViewHolder(child); float position = getCenterRelativePositionOf(child, clampAfterDistance); - itemTransformer.transformItem(child, position); + itemTransformer.transformItem(child,null, position); } } } diff --git a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/DiscreteScrollItemTransformer.java b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/DiscreteScrollItemTransformer.java index 957ae51f41..5be48cd737 100644 --- a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/DiscreteScrollItemTransformer.java +++ b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/DiscreteScrollItemTransformer.java @@ -1,11 +1,12 @@ package com.yarolegovich.discretescrollview.transform; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; /** * Created by yarolegovich on 02.03.2017. */ public interface DiscreteScrollItemTransformer { - void transformItem(View item, float position); + void transformItem(View item, RecyclerView.ViewHolder childViewHolder,float position); } diff --git a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/ScaleTransformer.java b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/ScaleTransformer.java index 74a0d26087..89ec6c9b34 100644 --- a/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/ScaleTransformer.java +++ b/modules/mogo-module-common/src/main/java/com/yarolegovich/discretescrollview/transform/ScaleTransformer.java @@ -2,6 +2,7 @@ package com.yarolegovich.discretescrollview.transform; import android.view.View; import androidx.annotation.FloatRange; +import androidx.recyclerview.widget.RecyclerView; /** * Created by yarolegovich on 03.03.2017. @@ -21,7 +22,7 @@ public class ScaleTransformer implements DiscreteScrollItemTransformer { } @Override - public void transformItem(View item, float position) { + public void transformItem(View item, RecyclerView.ViewHolder childViewHolder, float position) { pivotX.setOn(item); pivotY.setOn(item); float closenessToCenter = 1f - Math.abs(position); From f762af837cbdc501d588a15655bd459fc8800722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 16 Mar 2020 11:46:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86./gradlew=20:mod?= =?UTF-8?q?ules:mogo-module-apps:clean=20=20:modules:mogo-module-apps:uplo?= =?UTF-8?q?adArchives?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/upload.sh b/upload.sh index 6a23057616..950f4d5bb7 100755 --- a/upload.sh +++ b/upload.sh @@ -7,6 +7,7 @@ ./gradlew :foudations:mogo-connection:clean :foudations:mogo-connection:uploadArchives ./gradlew :libraries:map-amap:clean :libraries:map-amap:uploadArchives ./gradlew :libraries:mogo-map:clean :libraries:mogo-map:uploadArchives +./gradlew :modules:mogo-module-apps:clean :modules:mogo-module-apps:uploadArchives ./gradlew :services:mogo-service:clean :services:mogo-service:uploadArchives ./gradlew :modules:mogo-module-common:clean :modules:mogo-module-common:uploadArchives ./gradlew :modules:mogo-module-map:clean :modules:mogo-module-map:uploadArchives