Commit ab7bb5bf35a8681ca41a569bb46c5642441a193b
1 parent
1f0c22ac4b
Exists in
master
ui调整
Showing
3 changed files
with
16 additions
and
16 deletions
Show diff stats
app/src/main/res/drawable/svg_delete.xml
| 1 | <vector xmlns:android="http://schemas.android.com/apk/res/android" | 1 | <vector xmlns:android="http://schemas.android.com/apk/res/android" |
| 2 | android:width="15dp" | 2 | android:width="18dp" |
| 3 | android:height="15dp" | 3 | android:height="18dp" |
| 4 | android:viewportWidth="1024" | 4 | android:viewportWidth="1024" |
| 5 | android:viewportHeight="1024"> | 5 | android:viewportHeight="1024"> |
| 6 | <path | 6 | <path |
| 7 | android:pathData="M693.5,231.7c33.9,4.8 69.3,-1.4 97,3.3 44.9,7.6 67.6,45.8 62.7,102 -18.1,0 -36.2,0 -54.3,0 -1.5,99.7 -0.8,198.4 -0.8,298.4 0,50.5 4.2,103.5 -0.8,148.8 -4.8,42.8 -36.1,68.8 -74.4,75.2 -37.8,6.3 -87.9,1.7 -129.6,1.7 -87.4,0 -176,1.7 -261.6,0 -41.7,-0.8 -72.5,-14.1 -91.1,-39.3 -18.7,-25.2 -16.7,-63.4 -16.7,-108.7 0,-126.1 0,-251.2 0,-376.2 -17.3,0 -34.6,0 -51.8,0 -8.4,-51.7 14,-88.8 51.8,-101.1 27.8,-9 64.9,-1.7 104.5,-4.2 -3.2,-55.6 -0.2,-97.9 47.6,-103.7 21.4,-2.6 49.9,0 76.1,0 47.1,0 101.7,0 152.1,0 29,0 58.7,-2.8 73.6,10C698.2,155.9 692.8,196.8 693.5,231.7zM380.1,183.3c0,16.7 0,33.4 0,50.2 87.2,0 174.4,0 261.6,0 0,-17.6 0,-35.1 0,-52.7 -86.9,0 -173.9,0 -260.8,0C379.9,180.9 380,182.1 380.1,183.3zM329.1,342.9c0,105.8 0,211.1 0,318.5 0,27.2 -6.3,85.2 10,97 6.5,4.7 23.2,5.4 30.9,0 16.8,-11.7 10.9,-68 10.9,-96.1 0,-108.7 0,-218.9 0,-321.8 -17,0 -34,0 -51,0C328.9,340.6 329,341.7 329.1,342.9zM484.5,342.9c0,95.2 0,206.4 0,308.4 0,24.3 -5.7,81.9 4.2,98.6 6.5,11 28.4,16 39.3,7.5 14.8,-11.5 8.4,-72.5 8.4,-97.8 0,-109 0,-213.6 0,-319.3 -17,0 -34,0 -51,0C484.4,340.6 484.5,341.7 484.5,342.9zM641.7,342.9c0,102.5 0,216.6 0,322.7 0,33 -6.4,83.7 15,92.8 9.4,3.9 26,0.9 30.1,-2.5 14,-11.5 7.5,-73.5 7.5,-97.8 0,-108.4 0,-212.4 0,-317.6 -17.3,0 -34.6,0 -51.8,0C641.6,340.6 641.6,341.7 641.7,342.9z" | 7 | android:pathData="M693.5,231.7c33.9,4.8 69.3,-1.4 97,3.3 44.9,7.6 67.6,45.8 62.7,102 -18.1,0 -36.2,0 -54.3,0 -1.5,99.7 -0.8,198.4 -0.8,298.4 0,50.5 4.2,103.5 -0.8,148.8 -4.8,42.8 -36.1,68.8 -74.4,75.2 -37.8,6.3 -87.9,1.7 -129.6,1.7 -87.4,0 -176,1.7 -261.6,0 -41.7,-0.8 -72.5,-14.1 -91.1,-39.3 -18.7,-25.2 -16.7,-63.4 -16.7,-108.7 0,-126.1 0,-251.2 0,-376.2 -17.3,0 -34.6,0 -51.8,0 -8.4,-51.7 14,-88.8 51.8,-101.1 27.8,-9 64.9,-1.7 104.5,-4.2 -3.2,-55.6 -0.2,-97.9 47.6,-103.7 21.4,-2.6 49.9,0 76.1,0 47.1,0 101.7,0 152.1,0 29,0 58.7,-2.8 73.6,10C698.2,155.9 692.8,196.8 693.5,231.7zM380.1,183.3c0,16.7 0,33.4 0,50.2 87.2,0 174.4,0 261.6,0 0,-17.6 0,-35.1 0,-52.7 -86.9,0 -173.9,0 -260.8,0C379.9,180.9 380,182.1 380.1,183.3zM329.1,342.9c0,105.8 0,211.1 0,318.5 0,27.2 -6.3,85.2 10,97 6.5,4.7 23.2,5.4 30.9,0 16.8,-11.7 10.9,-68 10.9,-96.1 0,-108.7 0,-218.9 0,-321.8 -17,0 -34,0 -51,0C328.9,340.6 329,341.7 329.1,342.9zM484.5,342.9c0,95.2 0,206.4 0,308.4 0,24.3 -5.7,81.9 4.2,98.6 6.5,11 28.4,16 39.3,7.5 14.8,-11.5 8.4,-72.5 8.4,-97.8 0,-109 0,-213.6 0,-319.3 -17,0 -34,0 -51,0C484.4,340.6 484.5,341.7 484.5,342.9zM641.7,342.9c0,102.5 0,216.6 0,322.7 0,33 -6.4,83.7 15,92.8 9.4,3.9 26,0.9 30.1,-2.5 14,-11.5 7.5,-73.5 7.5,-97.8 0,-108.4 0,-212.4 0,-317.6 -17.3,0 -34.6,0 -51.8,0C641.6,340.6 641.6,341.7 641.7,342.9z" |
| 8 | android:fillColor="#272636"/> | 8 | android:fillColor="#272636"/> |
| 9 | </vector> | 9 | </vector> |
| 10 | 10 |
app/src/main/res/drawable/svg_go_detail.xml
| 1 | <vector xmlns:android="http://schemas.android.com/apk/res/android" | 1 | <vector xmlns:android="http://schemas.android.com/apk/res/android" |
| 2 | android:width="10dp" | 2 | android:width="12dp" |
| 3 | android:height="10dp" | 3 | android:height="12dp" |
| 4 | android:viewportWidth="20" | 4 | android:viewportWidth="20" |
| 5 | android:viewportHeight="20"> | 5 | android:viewportHeight="20"> |
| 6 | <path | 6 | <path |
| 7 | android:pathData="M10,0C15.523,0 20,4.477 20,10C20,15.523 15.523,20 10,20C4.477,20 0,15.523 0,10C0,4.477 4.477,0 10,0Z" | 7 | android:pathData="M10,0C15.523,0 20,4.477 20,10C20,15.523 15.523,20 10,20C4.477,20 0,15.523 0,10C0,4.477 4.477,0 10,0Z" |
| 8 | android:fillColor="#C5C5C5" | 8 | android:fillColor="#C5C5C5" |
| 9 | android:fillType="evenOdd"/> | 9 | android:fillType="evenOdd"/> |
| 10 | <path | 10 | <path |
| 11 | android:pathData="M7.156,3.832C7.625,3.363 8.387,3.363 8.856,3.832L13.572,8.607C13.596,8.627 13.627,8.635 13.649,8.658C13.888,8.896 14.003,9.21 13.999,9.522C14.003,9.834 13.888,10.148 13.649,10.386C13.627,10.409 13.596,10.417 13.572,10.437L8.896,15.172C8.426,15.641 7.665,15.641 7.195,15.172C6.726,14.702 6.726,13.941 7.195,13.471L11.095,9.522L7.156,5.533C6.686,5.064 6.686,4.302 7.156,3.832Z" | 11 | android:pathData="M7.156,3.832C7.625,3.363 8.387,3.363 8.856,3.832L13.572,8.607C13.596,8.627 13.627,8.635 13.649,8.658C13.888,8.896 14.003,9.21 13.999,9.522C14.003,9.834 13.888,10.148 13.649,10.386C13.627,10.409 13.596,10.417 13.572,10.437L8.896,15.172C8.426,15.641 7.665,15.641 7.195,15.172C6.726,14.702 6.726,13.941 7.195,13.471L11.095,9.522L7.156,5.533C6.686,5.064 6.686,4.302 7.156,3.832Z" |
| 12 | android:fillColor="#FFFFFF" | 12 | android:fillColor="#FFFFFF" |
| 13 | android:fillType="evenOdd"/> | 13 | android:fillType="evenOdd"/> |
| 14 | </vector> | 14 | </vector> |
| 15 | 15 |
app/src/main/res/layout/item_homework_list.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <LinearLayout | 2 | <LinearLayout |
| 3 | xmlns:android="http://schemas.android.com/apk/res/android" | 3 | xmlns:android="http://schemas.android.com/apk/res/android" |
| 4 | xmlns:app="http://schemas.android.com/apk/res-auto" | 4 | xmlns:app="http://schemas.android.com/apk/res-auto" |
| 5 | xmlns:tools="http://schemas.android.com/tools" | 5 | xmlns:tools="http://schemas.android.com/tools" |
| 6 | android:orientation="vertical" | 6 | android:orientation="vertical" |
| 7 | android:paddingHorizontal="10dp" | 7 | android:paddingHorizontal="10dp" |
| 8 | android:layout_marginVertical="8dp" | 8 | android:layout_marginVertical="8dp" |
| 9 | android:layout_width="match_parent" | 9 | android:layout_width="match_parent" |
| 10 | android:layout_height="wrap_content" | 10 | android:layout_height="wrap_content" |
| 11 | tools:ignore="SmallSp,HardcodedText"> | 11 | tools:ignore="SmallSp,HardcodedText"> |
| 12 | 12 | ||
| 13 | <TextView | 13 | <TextView |
| 14 | android:id="@+id/tvDate" | 14 | android:id="@+id/tvDate" |
| 15 | android:visibility="gone" | 15 | android:visibility="gone" |
| 16 | tools:visibility="visible" | 16 | tools:visibility="visible" |
| 17 | tools:text="2024-09-25" | 17 | tools:text="2024-09-25" |
| 18 | android:textSize="12sp" | 18 | android:textSize="14sp" |
| 19 | android:textColor="#999" | 19 | android:textColor="#999" |
| 20 | android:layout_marginBottom="15dp" | 20 | android:layout_marginBottom="12dp" |
| 21 | android:layout_width="wrap_content" | 21 | android:layout_width="wrap_content" |
| 22 | android:layout_height="wrap_content"/> | 22 | android:layout_height="wrap_content"/> |
| 23 | 23 | ||
| 24 | <FrameLayout | 24 | <FrameLayout |
| 25 | android:background="@drawable/shape_radius_10" | 25 | android:background="@drawable/shape_radius_10" |
| 26 | android:backgroundTint="@color/white" | 26 | android:backgroundTint="@color/white" |
| 27 | android:layout_width="match_parent" | 27 | android:layout_width="match_parent" |
| 28 | android:layout_height="75dp"> | 28 | android:layout_height="80dp"> |
| 29 | <LinearLayout | 29 | <LinearLayout |
| 30 | android:orientation="horizontal" | 30 | android:orientation="horizontal" |
| 31 | android:gravity="center_vertical" | 31 | android:gravity="center_vertical" |
| 32 | android:layout_width="match_parent" | 32 | android:layout_width="match_parent" |
| 33 | android:layout_height="match_parent"> | 33 | android:layout_height="match_parent"> |
| 34 | <ImageView | 34 | <ImageView |
| 35 | android:id="@+id/ivSubject" | 35 | android:id="@+id/ivSubject" |
| 36 | tools:src="@drawable/ic_math" | 36 | tools:src="@drawable/ic_math" |
| 37 | android:layout_marginStart="10dp" | 37 | android:layout_marginStart="10dp" |
| 38 | android:layout_width="44dp" | 38 | android:layout_width="50dp" |
| 39 | android:layout_height="56dp" | 39 | android:layout_height="64dp" |
| 40 | android:importantForAccessibility="no" /> | 40 | android:importantForAccessibility="no" /> |
| 41 | <LinearLayout | 41 | <LinearLayout |
| 42 | android:orientation="vertical" | 42 | android:orientation="vertical" |
| 43 | android:layout_marginStart="14dp" | 43 | android:layout_marginStart="14dp" |
| 44 | android:layout_marginEnd="10dp" | 44 | android:layout_marginEnd="10dp" |
| 45 | android:layout_marginVertical="16dp" | 45 | android:layout_marginVertical="12dp" |
| 46 | android:layout_width="match_parent" | 46 | android:layout_width="match_parent" |
| 47 | android:layout_height="match_parent"> | 47 | android:layout_height="match_parent"> |
| 48 | <TextView | 48 | <TextView |
| 49 | android:id="@+id/tvName" | 49 | android:id="@+id/tvName" |
| 50 | tools:text="作业名称作业名称作业名称作业名称作业名称作业名称作业名称" | 50 | tools:text="作业名称作业名称作业名称作业名称作业名称作业名称作业名称" |
| 51 | android:textSize="13sp" | 51 | android:textSize="14sp" |
| 52 | android:textColor="#333" | 52 | android:textColor="#333" |
| 53 | android:singleLine="true" | 53 | android:singleLine="true" |
| 54 | android:maxEms="16" | 54 | android:maxEms="12" |
| 55 | android:ellipsize="end" | 55 | android:ellipsize="end" |
| 56 | android:layout_width="wrap_content" | 56 | android:layout_width="wrap_content" |
| 57 | android:layout_height="wrap_content"/> | 57 | android:layout_height="wrap_content"/> |
| 58 | <Space style="@style/empty_space"/> | 58 | <Space style="@style/empty_space"/> |
| 59 | <LinearLayout | 59 | <LinearLayout |
| 60 | android:orientation="horizontal" | 60 | android:orientation="horizontal" |
| 61 | android:gravity="center_vertical" | 61 | android:gravity="center_vertical" |
| 62 | android:layout_width="match_parent" | 62 | android:layout_width="match_parent" |
| 63 | android:layout_height="wrap_content"> | 63 | android:layout_height="wrap_content"> |
| 64 | <TextView | 64 | <TextView |
| 65 | android:id="@+id/tvGrade" | 65 | android:id="@+id/tvGrade" |
| 66 | tools:text="七年级-上学期" | 66 | tools:text="七年级-上学期" |
| 67 | android:textSize="10sp" | 67 | android:textSize="12sp" |
| 68 | android:textColor="#666" | 68 | android:textColor="#666" |
| 69 | android:layout_width="wrap_content" | 69 | android:layout_width="wrap_content" |
| 70 | android:layout_height="wrap_content" /> | 70 | android:layout_height="wrap_content" /> |
| 71 | <Space style="@style/empty_space"/> | 71 | <Space style="@style/empty_space"/> |
| 72 | <androidx.appcompat.widget.AppCompatTextView | 72 | <androidx.appcompat.widget.AppCompatTextView |
| 73 | android:id="@+id/btnDelete" | 73 | android:id="@+id/btnDelete" |
| 74 | android:text="删除" | 74 | android:text="删除" |
| 75 | android:textSize="10sp" | 75 | android:textSize="12sp" |
| 76 | android:textColor="#666" | 76 | android:textColor="#666" |
| 77 | android:gravity="center_vertical" | 77 | android:gravity="center_vertical" |
| 78 | android:drawableStart="@drawable/svg_delete" | 78 | android:drawableStart="@drawable/svg_delete" |
| 79 | android:drawableTint="#C5C5C5" | 79 | android:drawableTint="#C5C5C5" |
| 80 | android:drawablePadding="2dp" | 80 | android:drawablePadding="2dp" |
| 81 | android:layout_width="wrap_content" | 81 | android:layout_width="wrap_content" |
| 82 | android:layout_height="wrap_content"/> | 82 | android:layout_height="wrap_content"/> |
| 83 | <View | 83 | <View |
| 84 | android:background="#F5F5F5" | 84 | android:background="#F5F5F5" |
| 85 | android:layout_marginHorizontal="15dp" | 85 | android:layout_marginHorizontal="15dp" |
| 86 | android:layout_width="1dp" | 86 | android:layout_width="1dp" |
| 87 | android:layout_height="10dp"/> | 87 | android:layout_height="10dp"/> |
| 88 | <androidx.appcompat.widget.AppCompatTextView | 88 | <androidx.appcompat.widget.AppCompatTextView |
| 89 | android:id="@+id/btnDetail" | 89 | android:id="@+id/btnDetail" |
| 90 | android:text="详情" | 90 | android:text="详情" |
| 91 | android:textSize="10sp" | 91 | android:textSize="12sp" |
| 92 | android:textColor="#666" | 92 | android:textColor="#666" |
| 93 | android:gravity="center_vertical" | 93 | android:gravity="center_vertical" |
| 94 | android:drawableStart="@drawable/svg_go_detail" | 94 | android:drawableStart="@drawable/svg_go_detail" |
| 95 | android:drawablePadding="5dp" | 95 | android:drawablePadding="5dp" |
| 96 | android:layout_width="wrap_content" | 96 | android:layout_width="wrap_content" |
| 97 | android:layout_height="wrap_content"/> | 97 | android:layout_height="wrap_content"/> |
| 98 | </LinearLayout> | 98 | </LinearLayout> |
| 99 | </LinearLayout> | 99 | </LinearLayout> |
| 100 | </LinearLayout> | 100 | </LinearLayout> |
| 101 | <TextView | 101 | <TextView |
| 102 | android:id="@+id/tvFlag" | 102 | android:id="@+id/tvFlag" |
| 103 | android:text="已反馈" | 103 | android:text="已反馈" |
| 104 | android:textSize="9sp" | 104 | android:textSize="11sp" |
| 105 | android:textColor="@color/white" | 105 | android:textColor="@color/white" |
| 106 | android:background="@drawable/bg_homework_feedback_flag" | 106 | android:background="@drawable/bg_homework_feedback_flag" |
| 107 | android:layout_gravity="end" | 107 | android:layout_gravity="end" |
| 108 | android:paddingHorizontal="7dp" | 108 | android:paddingHorizontal="7dp" |
| 109 | android:paddingVertical="2dp" | 109 | android:paddingVertical="2dp" |
| 110 | android:layout_width="wrap_content" | 110 | android:layout_width="wrap_content" |
| 111 | android:layout_height="wrap_content" /> | 111 | android:layout_height="wrap_content" /> |
| 112 | </FrameLayout> | 112 | </FrameLayout> |
| 113 | 113 | ||
| 114 | </LinearLayout> | 114 | </LinearLayout> |