詹子聪 5 年 前
コミット
57956f1a11

+ 8 - 13
app/src/main/res/layout/fragment_tool.xml

@@ -14,7 +14,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingTop="@dimen/activity_horizontal_margin_ss">
+    android:paddingTop="@dimen/margin_s">
 
     <include layout="@layout/view_divider_common" />
 
@@ -27,8 +27,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/height_tab_bar"
+            android:layout_height="@dimen/height_tool_item"
             android:orientation="vertical"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
@@ -64,8 +63,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/height_tab_bar"
+            android:layout_height="@dimen/height_tool_item"
             android:orientation="vertical"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
@@ -101,8 +99,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/height_tab_bar"
+            android:layout_height="@dimen/height_tool_item"
             android:orientation="vertical"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
@@ -138,8 +135,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/height_tab_bar"
+            android:layout_height="@dimen/height_tool_item"
             android:orientation="vertical"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
@@ -161,7 +157,7 @@
                 android:layout_marginTop="@dimen/margin_sss"
                 android:textColor="@color/gray_text_s"
                 android:textSize="@dimen/text_normal_s"
-                android:text="返回今日天气信息(限时免费)"/>
+                android:text="返回今日天气信息(免费开放中)"/>
         </LinearLayout>
     </FrameLayout>
     <include layout="@layout/view_divider_common" />
@@ -175,8 +171,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/height_tab_bar"
+            android:layout_height="@dimen/height_tool_item"
             android:orientation="vertical"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
@@ -198,7 +193,7 @@
                 android:layout_marginTop="@dimen/margin_sss"
                 android:textColor="@color/gray_text_s"
                 android:textSize="@dimen/text_normal_s"
-                android:text="返回当天宜忌信息(限时免费)"/>
+                android:text="返回当天宜忌信息(免费开放中)"/>
         </LinearLayout>
     </FrameLayout>
     <include layout="@layout/view_divider_common" />

+ 42 - 21
app/src/main/res/layout/item_template.xml

@@ -4,30 +4,51 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <include layout="@layout/view_divider_common"/>
-    <FrameLayout
-        android:id="@+id/rl_template"
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/width_stroke"
+        android:background="@color/green_divider"
+        android:layout_marginTop="@dimen/margin_s" />
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_s"
-        android:background="@color/white"
-        android:foreground="@drawable/selectable_item_background">
-        <ImageView
-            android:id="@+id/iv_template"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/height_cover"
-            android:src="@mipmap/logo_gray" />
-        <TextView
-            android:id="@+id/tv_template"
-            android:layout_width="match_parent"
+        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:layout_height="wrap_content"
-            android:padding="@dimen/margin_s"
-            android:layout_gravity="bottom"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_normal"
-            android:background="@color/black_light_transparent"/>
-    </FrameLayout>
+            android:background="@color/white"
+            android:foreground="@drawable/selectable_item_background">
+            <ImageView
+                android:id="@+id/iv_template"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/height_cover"
+                android:src="@mipmap/logo_gray" />
+            <TextView
+                android:id="@+id/tv_template"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                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>
+
+
 
-    <include layout="@layout/view_divider_common"/>
 </LinearLayout>
 

+ 1 - 1
app/src/main/res/layout/view_divider_common.xml

@@ -2,5 +2,5 @@
 <View
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="0.8dp"
+    android:layout_height="0.9dp"
     android:background="@color/gray_divider_1" />

BIN
app/src/main/res/mipmap-xxhdpi/meituan1.png


BIN
app/src/main/res/mipmap-xxhdpi/meituan2.png


BIN
app/src/main/res/mipmap-xxxhdpi/meituan1.png


BIN
app/src/main/res/mipmap-xxxhdpi/meituan2.png


+ 2 - 1
app/src/main/res/values/colors.xml

@@ -33,7 +33,7 @@
 
     <color name="black">#000000</color>
     <color name="black_light">#252525</color>
-    <color name="black_light_transparent">#8F1B1B1B</color>
+    <color name="black_light_transparent">#6B1B1B1B</color>
     <color name="black_dark">#1b1b1b</color>
     <color name="black_standard">#333333</color>
     <color name="black_title">#5F6267</color>
@@ -83,6 +83,7 @@
     <color name="green_pressed">#118d58</color>
     <color name="green_search_bg">#3fb179</color>
     <color name="green_light">#263fb179</color>
+    <color name="green_divider">#733FB179</color>
     <color name="green_droid">#42C662</color>
     <color name="black_droid_text">#6D6D6D</color>
     <color name="red_droid">#F47C88</color>

+ 2 - 1
app/src/main/res/values/dimens.xml

@@ -58,6 +58,7 @@
 
     <dimen name="width_min_code">64dp</dimen>
     <dimen name="height_tab_bar">48dp</dimen>
+    <dimen name="height_tool_item">60dp</dimen>
     <dimen name="height_template_item">56dp</dimen>
     <dimen name="height_indicator">3dp</dimen>
     <dimen name="width_stroke">0.9dp</dimen>
@@ -66,7 +67,7 @@
     <dimen name="height_sliding_tab">48dp</dimen>
     <dimen name="height_edit_text_s">32dp</dimen>
     <dimen name="height_edit_text_search">36dp</dimen>
-    <dimen name="height_cover">168dp</dimen>
+    <dimen name="height_cover">182.7dp</dimen>
     <dimen name="height_tool_bar">52dp</dimen>
 
     <dimen name="width_indicator">25dp</dimen>