app/src/main/java/com/duqing/missions/ui/main/hall/SubHallFragment.java
@@ -3,6 +3,7 @@ import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.widget.PopupWindow; import com.duqing.missions.base.fragments.BaseLoadPageFragment; import com.duqing.missions.data.BasePageResult; @@ -16,13 +17,25 @@ */ public class SubHallFragment extends BaseLoadPageFragment<FragmentSubHallBinding,SubHallViewModel, MissionAdapter, BasePageResult<String>> { @Override public void initViews() { super.initViews(); final PopupClassify popupClassify = new PopupClassify(getContext(), HallPopuClassifyBinding.inflate((LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE))); popupClassify.setOnDismissListener(new PopupWindow.OnDismissListener() { @Override public void onDismiss() { smartRefresh.autoRefresh(); } }); binding.txtClassify.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { new PopupClassify(getContext(), HallPopuClassifyBinding.inflate((LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE))).showAsDropDown(v); if(popupClassify.isShowing()){ popupClassify.dismiss(); }else { popupClassify.showAsDropDown(v); } } }); } app/src/main/java/com/duqing/missions/ui/main/hall/popup/HallClassifyAdapter.java
@@ -17,11 +17,6 @@ holder.binding.check.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if(isChecked){ buttonView.setEnabled(false); }else{ buttonView.setEnabled(true); } } }); } app/src/main/java/com/duqing/missions/ui/main/hall/popup/PopupClassify.java
@@ -31,9 +31,9 @@ HallClassifyAdapter adapter = new HallClassifyAdapter(); adapter.setData(new ArrayList<>(Arrays.asList(classifies))); binding.recycler.setAdapter(adapter); setOutsideTouchable(true); binding.textConfirm.setOnClickListener(v -> dismiss()); binding.textCancel.setOnClickListener(v -> dismiss()); } } app/src/main/res/drawable-v21/btn_blue.xml
New file @@ -0,0 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/gray"> <item> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false"> <shape> <solid android:color="@color/enable_sky" /> </shape> </item> <item android:state_pressed="true"> <shape> <solid android:color="@color/sky" /> </shape> </item> <item> <shape> <solid android:color="@color/deep_sky" /> </shape> </item> </selector> </item> </ripple> app/src/main/res/drawable-v21/dra_border_gray.xml
@@ -5,7 +5,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true" android:drawable="@drawable/bg_sky_corner" /> <item android:state_pressed="true" android:drawable="@drawable/bg_gray_corner" /> <item android:drawable="@drawable/bg_border_gray_corner" /> <item android:drawable="@drawable/bg_fine_border_gray_corner" /> </selector> </item>
New file @@ -0,0 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item> <shape android:shape="rectangle"> <stroke android:width="1dp" android:color="@color/gray" /> <solid android:color="@color/white" /> <corners android:radius="@dimen/small_radios"/> </shape> </item> </selector> app/src/main/res/drawable/btn_blue.xml
New file @@ -0,0 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false"> <shape> <solid android:color="@color/enable_sky" /> </shape> </item> <item android:state_pressed="true"> <shape> <solid android:color="@color/sky" /> </shape> </item> <item> <shape> <solid android:color="@color/deep_sky" /> </shape> </item> </selector> app/src/main/res/drawable/btn_white.xml
New file @@ -0,0 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false"> <shape> <solid android:color="@color/light_gray" /> </shape> </item> <item android:state_pressed="true"> <shape> <solid android:color="@color/gray" /> </shape> </item> <item> <shape> <solid android:color="@color/white" /> </shape> </item> </selector> app/src/main/res/drawable/dra_border_gray.xml
@@ -2,5 +2,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true" android:drawable="@drawable/bg_sky_corner" /> <item android:state_pressed="true" android:drawable="@drawable/bg_gray_corner" /> <item android:drawable="@drawable/bg_border_gray_corner" /> <item android:drawable="@drawable/bg_fine_border_gray_corner" /> </selector> app/src/main/res/layout/fragment_refresh_recycler.xml
File was deleted app/src/main/res/layout/hall_popu_classify.xml
@@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_marginBottom="@dimen/small_radios" android:layout_marginBottom="@dimen/radios" android:background="@color/white" android:elevation="@dimen/small_radios" android:layout_width="match_parent" @@ -29,13 +29,14 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:background="@color/gray" app:layout_constraintTop_toBottomOf="@id/recycler" /> app:layout_constraintBottom_toBottomOf="@id/recycler" /> <TextView android:id="@+id/text_cancel" android:layout_width="0dp" android:layout_height="40dp" android:layout_height="50dp" android:text="取消" android:gravity="center" android:background="@drawable/btn_white" app:layout_constraintRight_toLeftOf="@id/text_confirm" app:layout_constraintTop_toBottomOf="@id/recycler" app:layout_constraintLeft_toLeftOf="parent" /> @@ -45,16 +46,11 @@ android:layout_height="50dp" android:text="确定" android:gravity="center" android:textColor="@color/white" android:background="@drawable/btn_blue" app:layout_constraintTop_toBottomOf="@id/recycler" app:layout_constraintLeft_toRightOf="@id/text_cancel" app:layout_constraintRight_toRightOf="parent"/> <View android:layout_width="0.5dp" android:layout_height="0dp" android:background="@color/gray" app:layout_constraintTop_toTopOf="@id/text_cancel" app:layout_constraintBottom_toBottomOf="@id/text_cancel" app:layout_constraintLeft_toRightOf="@id/text_cancel"/> </androidx.constraintlayout.widget.ConstraintLayout> </RelativeLayout> app/src/main/res/values/colors.xml
@@ -6,9 +6,11 @@ <color name="white">#FFFFFFFF</color> <color name="white_2">#F3F3F3</color> <color name="red">#FF1414</color> <color name="light_gray">#E3E3E3</color> <color name="gray">#CDCDCD</color> <color name="trans_gray">#4DFFFFFF</color> <color name="enable">#ECECEC</color> <color name="enable_sky">#889DB6</color> <color name="deep_sky">#4184D6</color> <color name="sky">#509CFA</color> <color name="gold">#FAD550</color>
