liuzhenxing1118 5 月之前
父節點
當前提交
46cddfe22d
共有 29 個文件被更改,包括 25 次插入73 次删除
  1. 0 17
      .idea/deploymentTargetDropDown.xml
  2. 18 48
      app/src/main/assets/emoji.json
  3. 二進制
      app/src/main/res/drawable-xhdpi/emo_1001.png
  4. 二進制
      app/src/main/res/drawable-xhdpi/emo_1002.png
  5. 二進制
      app/src/main/res/drawable-xhdpi/emo_1003.png
  6. 二進制
      app/src/main/res/drawable-xhdpi/emo_1004.png
  7. 二進制
      app/src/main/res/drawable-xhdpi/emo_1005.png
  8. 二進制
      app/src/main/res/drawable-xhdpi/emo_1006.png
  9. 二進制
      app/src/main/res/drawable-xhdpi/emo_1007.png
  10. 二進制
      app/src/main/res/drawable-xhdpi/emo_1008.png
  11. 二進制
      app/src/main/res/drawable-xhdpi/emo_1009.png
  12. 二進制
      app/src/main/res/drawable-xhdpi/emo_1010.png
  13. 二進制
      app/src/main/res/drawable-xhdpi/emo_1011.png
  14. 二進制
      app/src/main/res/drawable-xhdpi/emo_1012.png
  15. 二進制
      app/src/main/res/drawable-xhdpi/emo_1013.png
  16. 二進制
      app/src/main/res/drawable-xhdpi/emo_1014.png
  17. 二進制
      app/src/main/res/drawable-xhdpi/emo_1015.png
  18. 二進制
      app/src/main/res/drawable-xhdpi/emo_1016.png
  19. 二進制
      app/src/main/res/drawable-xhdpi/emo_1017.png
  20. 二進制
      app/src/main/res/drawable-xhdpi/emo_1018.png
  21. 二進制
      app/src/main/res/drawable-xhdpi/emo_1019.png
  22. 二進制
      app/src/main/res/drawable-xhdpi/emo_1020.png
  23. 二進制
      app/src/main/res/drawable-xhdpi/emo_1021.png
  24. 二進制
      app/src/main/res/drawable-xhdpi/emo_1022.png
  25. 二進制
      app/src/main/res/drawable-xhdpi/emo_1023.png
  26. 二進制
      app/src/main/res/drawable-xhdpi/emo_1024.png
  27. 0 1
      app/src/main/res/layout/activity_itemlist.xml
  28. 3 3
      app/src/main/res/layout/item_contacts.xml
  29. 4 4
      app/src/main/res/layout/item_emoji_list.xml

+ 0 - 17
.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/xp_watch_API_27.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-08-08T06:03:02.216340Z" />
-  </component>
-</project>

+ 18 - 48
app/src/main/assets/emoji.json

@@ -2,121 +2,91 @@
 	{
 		"id": "a59aff5622b05438b8397a037a7e6492",
 		"keyword": "emo_1001",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/70ef2a270a6b5490ba48d88b9ce9ec45"
+		"url": ""
 	},
 	{
 		"id": "49f121083cf456b6a31966c52e46608f",
 		"keyword": "emo_1002",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/0378ba99371f52aa8ddfa2e0f5fea462"
+		"url": ""
 	},
 	{
 		"id": "761c0252e1e55eca9d4b7d186c985688",
 		"keyword": "emo_1003",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/189298e303ce53cdbf7334e0f8c8db99"
+		"url": ""
 	},
 	{
 		"id": "3e8c1fb27cb459d2a55466072c6c01d5",
 		"keyword": "emo_1004",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/21cd2753b61a5e81b5316a0d1ef03315"
+		"url": ""
 	},
 	{
 		"id": "250f31fe2ce15d98b5f26f25000ab029",
 		"keyword": "emo_1005",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/9572248d5527596e94f1f71dea21900a"
+		"url": ""
 	},
 	{
 		"id": "e11b78885a265a4aac9c7e54538533a5",
 		"keyword": "emo_1006",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/7bc383342e8756e0bedc5da36521129d"
+		"url": ""
 	},
 	{
 		"id": "cea9559f54aa5c7c9c07c7ed4c28ff88",
 		"keyword": "emo_1007",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/9cb5018728bb5227b8e73a4a41afb889"
+		"url": ""
 	},
 	{
 		"id": "9e0c6b34420a5d52a8b38bc1c4ea36b7",
 		"keyword": "emo_1008",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/883ea8eab7a452d9a095860e632ce286"
+		"url": ""
 	},
 	{
 		"id": "ffb3f31b98ad5bf08409922688b47e50",
 		"keyword": "emo_1009",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/d06912c7084f5cf1a4ffda6697c10e75"
+		"url": ""
 	},
 	{
 		"id": "3f82871f04865324973644fe8391b3b7",
 		"keyword": "emo_1010",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/c1b9ddd88ff75c83a965ae8fc0c41dbe"
+		"url": ""
 	},
 	{
 		"id": "7911848f9f1550fba02f1a8c703ce70d",
 		"keyword": "emo_1011",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/ad78605f2fe75501a7a7e51f0325748a"
+		"url": ""
 	},
 	{
 		"id": "0146a0ee3a695908813b3b49d182b06d",
 		"keyword": "emo_1012",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/3ed9399601055dfabac82d1cf773ecd8"
+		"url": ""
 	},
 	{
 		"id": "6df2d920f9645d07928b339e997aa4ab",
 		"keyword": "emo_1013",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/859e570ff8da5d4899ae7f661ee31bb2"
+		"url": ""
 	},
 	{
 		"id": "1a4bead97fbe5b5ab9669f1d010f22b7",
 		"keyword": "emo_1014",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/dbc038fb86f75f02aa9980805413e8a4"
+		"url": ""
 	},
 	{
 		"id": "11bffe1d7b8058de85aea6afa80e990f",
 		"keyword": "emo_1015",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/924706a6ce8d5e6d9071a72557a31d0c"
+		"url": ""
 	},
 	{
 		"id": "81361b7976a95c929f40eaea24f13d96",
 		"keyword": "emo_1016",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/ea951ed720de526798d26aec8d2ff7af"
+		"url": ""
 	},
 	{
 		"id": "1059c99d4694568a815217b593435e03",
 		"keyword": "emo_1017",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/209ec794583d5b3db4e50201b317788c"
+		"url": ""
 	},
 	{
 		"id": "4f1d6afdf7235cb2bc84ca916d360ea0",
 		"keyword": "emo_1018",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/d5dcb08cccc9555493221563c3526372"
-	},
-	{
-		"id": "f0b4177613a15a59acb3a8b0361e86ff",
-		"keyword": "emo_1019",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/140213726ea0598aab47e7edde8c8ecf"
-	},
-	{
-		"id": "94278627f13c5f19a29d748619996318",
-		"keyword": "emo_1020",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/8b12ba48098f50c58c134de4c62d498e"
-	},
-	{
-		"id": "e6d1ad1c64345e40b2504eb55a412b07",
-		"keyword": "emo_1021",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/19d6db03ff575a369e0397b22a89c2af"
-	},
-	{
-		"id": "a7231e4467c356aeb271b42a2cd42ab7",
-		"keyword": "emo_1022",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/6b729e1c6a9d5f27ad6d2ec860b209b3"
-	},
-	{
-		"id": "be87dbf8b2e85f31bab3276c24597a93",
-		"keyword": "emo_1023",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/fd40c813814258c089e1cb6775340a8f"
-	},
-	{
-		"id": "553b568a3c365f5daa7c17eb812be572",
-		"keyword": "emo_1024",
-		"url": "https://xplora-images.s3.eu-central-1.amazonaws.com/83768113c303504f90dad876e1a601fe"
+		"url": ""
 	}
 ]

二進制
app/src/main/res/drawable-xhdpi/emo_1001.png


二進制
app/src/main/res/drawable-xhdpi/emo_1002.png


二進制
app/src/main/res/drawable-xhdpi/emo_1003.png


二進制
app/src/main/res/drawable-xhdpi/emo_1004.png


二進制
app/src/main/res/drawable-xhdpi/emo_1005.png


二進制
app/src/main/res/drawable-xhdpi/emo_1006.png


二進制
app/src/main/res/drawable-xhdpi/emo_1007.png


二進制
app/src/main/res/drawable-xhdpi/emo_1008.png


二進制
app/src/main/res/drawable-xhdpi/emo_1009.png


二進制
app/src/main/res/drawable-xhdpi/emo_1010.png


二進制
app/src/main/res/drawable-xhdpi/emo_1011.png


二進制
app/src/main/res/drawable-xhdpi/emo_1012.png


二進制
app/src/main/res/drawable-xhdpi/emo_1013.png


二進制
app/src/main/res/drawable-xhdpi/emo_1014.png


二進制
app/src/main/res/drawable-xhdpi/emo_1015.png


二進制
app/src/main/res/drawable-xhdpi/emo_1016.png


二進制
app/src/main/res/drawable-xhdpi/emo_1017.png


二進制
app/src/main/res/drawable-xhdpi/emo_1018.png


二進制
app/src/main/res/drawable-xhdpi/emo_1019.png


二進制
app/src/main/res/drawable-xhdpi/emo_1020.png


二進制
app/src/main/res/drawable-xhdpi/emo_1021.png


二進制
app/src/main/res/drawable-xhdpi/emo_1022.png


二進制
app/src/main/res/drawable-xhdpi/emo_1023.png


二進制
app/src/main/res/drawable-xhdpi/emo_1024.png


+ 0 - 1
app/src/main/res/layout/activity_itemlist.xml

@@ -8,7 +8,6 @@
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
         android:layout_marginTop="30dp"
         android:layout_marginBottom="0dp"
         android:id="@+id/recyclerView"

+ 3 - 3
app/src/main/res/layout/item_contacts.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="70dp"
+    android:layout_width="match_parent"
     android:layout_height="75dp"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -46,8 +46,8 @@
         android:id="@+id/btn_count"
         android:layout_width="17dp"
         android:layout_height="17dp"
-        android:layout_marginTop="7dp"
-        android:layout_marginEnd="7dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="12dp"
         android:layout_alignParentEnd="true"
         android:background="@drawable/item_count"
         android:textColor="@color/xp_red"

+ 4 - 4
app/src/main/res/layout/item_emoji_list.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="70dp"
+    android:layout_width="match_parent"
     android:layout_height="55dp">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="55dp"
         android:orientation="vertical"
         android:gravity="center"
         >
 
         <ImageView
-            android:layout_width="55dp"
-            android:layout_height="55dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:scaleType="fitXY"
             android:id="@+id/icon"
             />