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);