item样式

app/src/main/AndroidManifest.xml

@@ -14,7 +14,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:requestLegacyExternalStorage="true"
-        android:networkSecurityConfig="@xml/network">
+        android:networkSecurityConfig="@xml/network"
+        android:name=".YangApplication">
         <activity android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait"

app/src/main/java/com/miekir/ym/YangApplication.kt

@@ -0,0 +1,17 @@
+package com.miekir.ym
+
+import android.app.Application
+import com.miekir.ym.manager.PreferenceManager
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ * @author Miekir
+ * @date 2020/11/25 7:44
+ * Description:
+ */
+class YangApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        PreferenceManager.getInstance().initPreference(this)
+    }
+}

app/src/main/java/com/miekir/ym/ui/about/AboutFragment.kt

@@ -1,27 +0,0 @@
-package com.miekir.ym.ui.about
-
-import com.miekir.mvp.view.BaseMvpFragment
-import com.miekir.ym.R
-
-/**
- * Copyright (C), 2019-2020, Miekir
- * @author Miekir
- * @date 2020/11/24 20:27
- * Description:
- */
-class AboutFragment : BaseMvpFragment() {
-
-    override fun getLayoutId(): Int {
-        return R.layout.fragment_about
-    }
-
-    override fun onViewInit() {
-
-    }
-
-    override fun onLazyLoad() {
-    }
-
-
-
-}

app/src/main/java/com/miekir/ym/ui/coupon/CouponAdapter.java

@@ -73,19 +73,17 @@ public class CouponAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder>
             });
 
 
-        holder.setText(R.id.tv_template, couponBean.couponName);
-        holder.setOnClickListener(R.id.rl_template, new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!couponBean.actionEnable) {
-                    ToastTool.showShort("敬请期待");
-                    return;
-                }
-                ActivityTool.openUrl((Activity) mContext, couponBean.jumpUrl);
+        holder.setText(R.id.tv_coupon_title, couponBean.couponName);
+
+        View view = holder.getView(R.id.ll_coupon);
+        view.setOnClickListener(v -> {
+            if (!couponBean.actionEnable) {
+                ToastTool.showShort("敬请期待");
+                return;
             }
+            ActivityTool.openUrl((Activity) mContext, couponBean.jumpUrl);
         });
 
-        View view = holder.getView(R.id.rl_template);
         view.setOnLongClickListener(v -> {
             if (UserInfoManager.getInstance().isLogin() &&
                     TextUtils.equals("[email protected]", UserInfoManager.getInstance().getBeiUser().email)) {

app/src/main/java/com/miekir/ym/ui/coupon/CouponFragment.java

@@ -59,7 +59,7 @@ public class CouponFragment extends BaseMvpFragment implements ICouponView<Coupo
 
         int dividerWidth = (int) getResources().getDimension(R.dimen.margin_s);
         NormalDividerItemDecoration decoration = new NormalDividerItemDecoration(dividerWidth);
-        rv_template.addItemDecoration(decoration);
+        //rv_template.addItemDecoration(decoration);
         mAdapter = new CouponAdapter(getActivity(), mCouponBeanList);
         mAdapter.setCouponLongClickListener(this::showAdminDialog);
         rv_template.setAdapter(mAdapter);

app/src/main/res/layout/activity_main.xml

@@ -163,5 +163,6 @@
         android:id="@+id/vp_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:overScrollMode="never"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/item_coupon.xml

@@ -4,54 +4,58 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/width_stroke"
-        android:background="@color/green_divider" />
+    <include layout="@layout/view_divider" />
     <LinearLayout
+        android:id="@+id/ll_coupon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <View
-            android:layout_width="@dimen/width_stroke"
-            android:layout_height="match_parent"
-            android:background="@color/green_divider" />
-        <FrameLayout
-            android:id="@+id/rl_template"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+        android:background="@color/white"
+        android:foreground="?attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingTop="@dimen/activity_horizontal_margin_ss"
+        android:paddingBottom="@dimen/activity_horizontal_margin_ss"
+        android:paddingStart="@dimen/activity_horizontal_margin"
+        android:paddingEnd="@dimen/activity_horizontal_margin">
+
+        <ImageView
+            android:id="@+id/iv_coupon"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:src="@mipmap/logo_gray"
+            android:scaleType="centerCrop"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:foreground="@drawable/selectable_item_background">
-            <ImageView
-                android:id="@+id/iv_coupon"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/height_cover"
-                android:src="@mipmap/logo_gray" />
+            android:minHeight="@dimen/height_tool_item"
+            android:orientation="vertical"
+            android:layout_marginStart="@dimen/margin_s"
+            android:gravity="center_vertical">
+
             <TextView
-                android:id="@+id/tv_template"
+                android:id="@+id/tv_coupon_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="0.4dp"
-                android:paddingStart="@dimen/margin_s"
-                android:paddingEnd="@dimen/margin_s"
-                android:paddingTop="@dimen/margin_ss"
-                android:paddingBottom="@dimen/margin_ss"
-                android:layout_gravity="bottom"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_normal"
-                android:background="@color/black_light_transparent"/>
-        </FrameLayout>
-        <View
-            android:layout_width="@dimen/width_stroke"
-            android:layout_height="match_parent"
-            android:background="@color/green_divider" />
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/width_stroke"
-        android:background="@color/green_divider" />
+                android:text="搞笑表情包"
+                android:textSize="@dimen/text_normal_p"
+                android:textColor="@color/black_theme"
+                android:textStyle="bold"/>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/margin_s"/>
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_sss"
+                android:textColor="@color/gray_text_s"
+                android:textSize="@dimen/text_normal_s"
+                android:text="为表情包配字幕并下载制作的表情包"/>
+        </LinearLayout>
+    </LinearLayout>
 
 </LinearLayout>