refactor(更新)

- 图标更换和新增图标

app/src/main/assets/themes/Default/icons/arrow-down-strenght.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="M24,23c0,.553-.448,1-1,1H1c-.552,0-1-.447-1-1s.448-1,1-1H23c.552,0,1,.447,1,1ZM.623,17.959c3.51,1.429,7.323,2.153,11.333,2.154h.001s.003,0,.004,0h.001c4.074,0,7.916-.737,11.42-2.189,.51-.212,.752-.797,.541-1.307s-.796-.753-1.307-.541c-3.261,1.352-6.847,2.037-10.658,2.037-3.751,0-7.312-.675-10.582-2.006-.513-.211-1.095,.037-1.303,.549s.038,1.095,.549,1.303Zm10.061-7.005c.364,.364,.841,.545,1.319,.545s.955-.182,1.319-.545l2.888-2.888c.391-.391,.391-1.023,0-1.414s-1.023-.391-1.414,0l-1.794,1.794-.002-7.445c0-.552-.448-1-1-1s-1,.448-1,1l.002,7.443-1.792-1.792c-.391-.391-1.023-.391-1.414,0s-.391,1.023,0,1.414l2.888,2.888Zm1.31,5.046h.002s.002,0,.004,0h.002c6.014-.003,10.201-3.714,11.722-5.31,.381-.4,.366-1.033-.034-1.414-.398-.381-1.032-.366-1.414,.034-1.344,1.41-5.036,4.689-10.278,4.69-5.227,0-8.927-3.281-10.275-4.691-.382-.399-1.015-.414-1.414-.032-.399,.381-.414,1.015-.032,1.414,1.525,1.596,5.72,5.306,11.716,5.309Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/arrow-progress-alt.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m0,8c0-2.206,1.794-4,4-4h16.955l-1.34-1.272c-.402-.378-.421-1.011-.042-1.414.379-.403,1.011-.421,1.414-.042l2.404,2.263c.396.394.611.92.611,1.465s-.215,1.072-.591,1.446l-2.424,2.282c-.193.182-.439.272-.686.272-.266,0-.531-.105-.728-.314-.379-.402-.359-1.035.042-1.414l1.351-1.272H4c-1.103,0-2,.897-2,2s.897,2,2,2h14.171c1.692,0,3.208,1.072,3.772,2.667.184.521-.089,1.092-.61,1.276-.11.039-.223.058-.333.058-.412,0-.798-.257-.943-.667-.282-.797-1.04-1.333-1.886-1.333H4c-2.206,0-4-1.794-4-4Zm12.985,7.272c-.403-.379-1.034-.36-1.414.042-.379.402-.359,1.035.042,1.414l1.34,1.272h-3.955c-.552,0-1,.448-1,1s.448,1,1,1h3.966l-1.351,1.272c-.402.378-.421,1.011-.042,1.414.197.209.462.314.728.314.246,0,.492-.09.686-.272l2.424-2.282c.375-.374.591-.901.591-1.446s-.215-1.072-.611-1.465l-2.404-2.263Zm-8.985.728h-2c-1.103,0-2,.897-2,2v2c0,1.103.897,2,2,2h2c1.103,0,2-.897,2-2v-2c0-1.103-.897-2-2-2Zm18,0h-2c-1.103,0-2,.897-2,2v2c0,1.103.897,2,2,2h2c1.103,0,2-.897,2-2v-2c0-1.103-.897-2-2-2Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/ballot-check.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="m17,0H7C4.243,0,2,2.243,2,5v14c0,2.757,2.243,5,5,5h10c2.757,0,5-2.243,5-5V5c0-2.757-2.243-5-5-5ZM7.5,4.5c.828,0,1.5.672,1.5,1.5s-.672,1.5-1.5,1.5-1.5-.672-1.5-1.5.672-1.5,1.5-1.5Zm0,15c-.828,0-1.5-.672-1.5-1.5s.672-1.5,1.5-1.5,1.5.672,1.5,1.5-.672,1.5-1.5,1.5Zm1.365-5.979c-.319.319-.741.479-1.165.479-.427,0-.855-.162-1.182-.487l-.681-.655c-.398-.382-.411-1.016-.028-1.414.383-.399,1.017-.41,1.414-.028l.472.454,1.866-1.815c.396-.385,1.029-.377,1.414.02.385.396.376,1.029-.02,1.414l-2.091,2.034Zm8.135,5.479h-5c-.552,0-1-.448-1-1s.448-1,1-1h5c.552,0,1,.448,1,1s-.448,1-1,1Zm0-6h-3c-.552,0-1-.448-1-1s.448-1,1-1h3c.552,0,1,.448,1,1s-.448,1-1,1Zm0-6h-5c-.552,0-1-.448-1-1s.448-1,1-1h5c.552,0,1,.448,1,1s-.448,1-1,1Z"/></svg>

app/src/main/assets/themes/Default/icons/ballot.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M17,0H7C4.243,0,2,2.243,2,5v14c0,2.757,2.243,5,5,5h10c2.757,0,5-2.243,5-5V5c0-2.757-2.243-5-5-5Zm-7,19c0,.552-.448,1-1,1h-2c-.552,0-1-.448-1-1v-2c0-.552,.448-1,1-1h2c.552,0,1,.448,1,1v2Zm0-6c0,.552-.448,1-1,1h-2c-.552,0-1-.448-1-1v-2c0-.552,.448-1,1-1h2c.552,0,1,.448,1,1v2Zm0-6c0,.552-.448,1-1,1h-2c-.552,0-1-.448-1-1v-2c0-.552,.448-1,1-1h2c.552,0,1,.448,1,1v2Zm7,12h-4c-1.308-.006-1.307-1.994,0-2h4c1.308,.006,1.307,1.994,0,2Zm0-6h-4c-1.308-.006-1.307-1.994,0-2h4c1.308,.006,1.307,1.994,0,2Zm0-6h-4c-1.308-.006-1.307-1.994,0-2h4c1.308,.006,1.307,1.994,0,2Z"/></svg>

app/src/main/assets/themes/Default/icons/bolt-slash.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m23.707,22.293l-6.317-6.317,2.105-3.43c.606-.894.668-2.041.163-2.995-.506-.954-1.491-1.547-2.569-1.547l-3.833-.003,1.205-5.227c.309-1.078-.139-2.172-1.064-2.6-.88-.407-1.865-.086-2.473.826l-3.236,5.273L1.707.293C1.316-.098.684-.098.293.293S-.098,1.316.293,1.707l22,22c.195.195.451.293.707.293s.512-.098.707-.293c.391-.391.391-1.023,0-1.414Zm-8.471-2.815l-2.164,3.524c-.432.65-1.057,1-1.699,1-.259,0-.521-.057-.773-.174-.925-.428-1.373-1.521-1.064-2.6l1.204-5.226h-3.83c-1.08,0-2.064-.593-2.57-1.547-.506-.954-.443-2.103.163-2.996l1.033-1.683,9.701,9.701Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/bolt.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M11.24,24a2.262,2.262,0,0,1-.948-.212,2.18,2.18,0,0,1-1.2-2.622L10.653,16H6.975A3,3,0,0,1,4.1,12.131l3.024-10A2.983,2.983,0,0,1,10,0h3.693a2.6,2.6,0,0,1,2.433,3.511L14.443,8H17a3,3,0,0,1,2.483,4.684l-6.4,10.3A2.2,2.2,0,0,1,11.24,24Z"/></svg>

app/src/main/assets/themes/Default/icons/chalkboard-user.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="m14,19v5H0v-5c0-1.654,1.346-3,3-3h8c1.654,0,3,1.346,3,3Zm-7-5c2.206,0,4-1.794,4-4s-1.794-4-4-4-4,1.794-4,4,1.794,4,4,4ZM24,3v15h-8.101c-.436-2.139-2.249-3.763-4.466-3.956.974-1.067,1.567-2.486,1.567-4.044,0-3.314-2.686-6-6-6-.701,0-1.374.121-2,.342v-1.342c0-1.654,1.346-3,3-3h13c1.654,0,3,1.346,3,3Zm-2,11h-5v2h5v-2Z"/></svg>

app/src/main/assets/themes/Default/icons/checkbox.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve" width="512" height="512">
+<g>
+	<path d="M405.333,0H106.667C47.786,0.071,0.071,47.786,0,106.667v298.667C0.071,464.214,47.786,511.93,106.667,512h298.667   C464.214,511.93,511.93,464.214,512,405.333V106.667C511.93,47.786,464.214,0.071,405.333,0z M426.667,172.352L229.248,369.771   c-16.659,16.666-43.674,16.671-60.34,0.012c-0.004-0.004-0.008-0.008-0.012-0.012l-83.563-83.541   c-8.348-8.348-8.348-21.882,0-30.229s21.882-8.348,30.229,0l83.541,83.541l197.44-197.419c8.348-8.318,21.858-8.294,30.176,0.053   C435.038,150.524,435.014,164.034,426.667,172.352z"/>
+</g>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</svg>

app/src/main/assets/themes/Default/icons/choose.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m5.5,8h-3c-1.381,0-2.5-1.119-2.5-2.5v-3C0,1.119,1.119,0,2.5,0h3c1.381,0,2.5,1.119,2.5,2.5v3c0,1.381-1.119,2.5-2.5,2.5Zm0,10h-3c-1.381,0-2.5-1.119-2.5-2.5v-3c0-1.381,1.119-2.5,2.5-2.5h3c1.381,0,2.5,1.119,2.5,2.5v3c0,1.381-1.119,2.5-2.5,2.5ZM15.5,0h-3c-1.381,0-2.5,1.119-2.5,2.5v3c0,1.381,1.119,2.5,2.5,2.5h3c1.381,0,2.5-1.119,2.5-2.5v-3c0-1.381-1.119-2.5-2.5-2.5Zm-.5,4.5c0,.276-.224.5-.5.5h-1c-.276,0-.5-.224-.5-.5v-1c0-.276.224-.5.5-.5h1c.276,0,.5.224.5.5v1Zm0,7.607c0-.996-.681-1.92-1.664-2.08-1.253-.204-2.336.758-2.336,1.973v8.817c-1.076-.886-2.111-1.752-2.145-1.784-.922-.861-2.373-.813-3.235.109-.863.923-.819,2.372.098,3.23l1.821,1.628h16.462v-.593c0-2.055-1.258-3.901-3.171-4.653l-5.829-2.292v-4.355Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/document.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg" data-name="Layer 1"><path d="m14 7v-6.54a6.977 6.977 0 0 1 2.465 1.59l3.484 3.486a6.954 6.954 0 0 1 1.591 2.464h-6.54a1 1 0 0 1 -1-1zm8 3.485v8.515a5.006 5.006 0 0 1 -5 5h-10a5.006 5.006 0 0 1 -5-5v-14a5.006 5.006 0 0 1 5-5h4.515c.163 0 .324.013.485.024v6.976a3 3 0 0 0 3 3h6.976c.011.161.024.322.024.485zm-8 8.515a1 1 0 0 0 -1-1h-5a1 1 0 0 0 0 2h5a1 1 0 0 0 1-1zm3-4a1 1 0 0 0 -1-1h-8a1 1 0 0 0 0 2h8a1 1 0 0 0 1-1z"/></svg>

app/src/main/assets/themes/Default/icons/face-id-svgrepo-com.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 3H5C3.89543 3 3 3.89543 3 5V7" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 3H19C20.1046 3 21 3.89543 21 5V7" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 8L16 10" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 8L8 10" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 16C9 16 10 17 12 17C14 17 15 16 15 16" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 8L12 13L11 13" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 21H5C3.89543 21 3 20.1046 3 19V17" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 21H19C20.1046 21 21 20.1046 21 19V17" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

app/src/main/assets/themes/Default/icons/fingerprint.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M5.972,22.285a1,1,0,0,1-.515-1.857C9,18.3,9,13.73,9,11a3,3,0,0,1,6,0,1,1,0,0,1-2,0,1,1,0,0,0-2,0c0,2.947,0,8.434-4.514,11.143A1,1,0,0,1,5.972,22.285Zm4.963,1.421c2.282-2.3,3.615-5.534,3.961-9.621A1,1,0,0,0,13.985,13a.983.983,0,0,0-1.081.911c-.311,3.657-1.419,6.4-3.388,8.381a1,1,0,0,0,1.419,1.41Zm5.2-.186a17.793,17.793,0,0,0,1.508-3.181,1,1,0,0,0-1.881-.678,15.854,15.854,0,0,1-1.338,2.821,1,1,0,0,0,1.711,1.038ZM18.5,17.191A31.459,31.459,0,0,0,19,11,7,7,0,0,0,6.787,6.333,1,1,0,1,0,8.276,7.667,5,5,0,0,1,17,11a29.686,29.686,0,0,1-.462,5.809,1,1,0,0,0,.79,1.172.979.979,0,0,0,.193.019A1,1,0,0,0,18.5,17.191ZM7,11a5,5,0,0,1,.069-.833A1,1,0,1,0,5.1,9.833,6.971,6.971,0,0,0,5,11c0,4.645-1.346,7-4,7a1,1,0,0,0,0,2C4.869,20,7,16.8,7,11ZM20.7,23.414A29.76,29.76,0,0,0,23,11a10.865,10.865,0,0,0-1.1-4.794,1,1,0,1,0-1.8.875A8.9,8.9,0,0,1,21,11a27.91,27.91,0,0,1-2.119,11.586,1,1,0,0,0,.5,1.324.984.984,0,0,0,.413.09A1,1,0,0,0,20.7,23.414ZM3,14V11a9.01,9.01,0,0,1,9-9,8.911,8.911,0,0,1,5.4,1.8,1,1,0,0,0,1.2-1.6A10.9,10.9,0,0,0,12,0,11.013,11.013,0,0,0,1,11v3a1,1,0,0,0,2,0Z"/></svg>

app/src/main/assets/themes/Default/icons/fire-flame-curved.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M12,24h-.057c-5.482,0-9.943-4.486-9.943-10,0-1.929,.666-4.07,1.874-6.031,.471-.765,1.373-1.126,2.241-.896,.869,.229,1.474,.987,1.505,1.885,.096,2.74,.753,6.014,3.338,6.043,1.081,.009,1.937-.747,2.027-1.727,.094-1.026-.277-1.83-.746-2.847-.552-1.2-1.24-2.692-1.24-4.901,0-1.707,.345-3.412,.687-4.345C11.941,.488,12.542,.033,13.256-.008c.739-.04,1.414,.367,1.753,1.042,.802,1.595,1.938,3.069,3.036,4.495,1.972,2.562,4.011,5.211,3.956,8.487,0,5.464-4.483,9.95-9.994,9.983h-.006Z"/></svg>

app/src/main/assets/themes/Default/icons/gas-pump.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M6,9h4A2,2,0,0,0,6,9Z"/><path d="M8,5a3.971,3.971,0,0,1,1.339.247l1.954-1.954a1,1,0,1,1,1.414,1.414L11.014,6.4A3.963,3.963,0,0,1,12,9h4V5a5.006,5.006,0,0,0-5-5H5A5.006,5.006,0,0,0,0,5V9H4A4,4,0,0,1,8,5Z"/><path d="M23.681,3.267a1,1,0,0,0-1.414,0L19.293,6.24A1,1,0,0,0,19,6.947V18a1,1,0,0,1-1,1H16V11H0v8a5.006,5.006,0,0,0,5,5h6a5,5,0,0,0,4.576-3H18a3,3,0,0,0,3-3V7.361l2.681-2.68A1,1,0,0,0,23.681,3.267Z"/></svg>

app/src/main/assets/themes/Default/icons/heat.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M20.016,24a1,1,0,0,1-.964-1.269c.116-.419.247-.808.377-1.191,1.285-2.684.18-6.683-1.256-8.554A12.313,12.313,0,0,1,17.359.576a1,1,0,0,1,1.811.848,10.307,10.307,0,0,0,.686,10.483c1.675,2.137,2.986,7.113,1.467,10.271-.118.351-.238.708-.345,1.091A1,1,0,0,1,20.016,24Zm-7,0a1,1,0,0,1-.964-1.269c.116-.419.247-.808.377-1.191,1.285-2.684.18-6.683-1.256-8.554A12.313,12.313,0,0,1,10.359.576a1,1,0,0,1,1.811.848,10.307,10.307,0,0,0,.686,10.483c1.675,2.137,2.986,7.113,1.467,10.271-.118.351-.238.708-.345,1.091A1,1,0,0,1,13.016,24Zm-7,0a1,1,0,0,1-.964-1.269c.116-.419.247-.808.377-1.191,1.285-2.684.18-6.683-1.256-8.554A12.313,12.313,0,0,1,3.359.576a1,1,0,0,1,1.811.848,10.307,10.307,0,0,0,.686,10.483c1.675,2.137,2.986,7.113,1.467,10.271-.118.351-.238.708-.345,1.091A1,1,0,0,1,6.016,24Z"/></svg>

app/src/main/assets/themes/Default/icons/key.svg

@@ -0,0 +1,60 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="603.000000pt" height="438.000000pt" viewBox="0 0 603.000000 438.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.10, written by Peter Selinger 2001-2011
+</metadata>
+<g transform="translate(0.000000,438.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2843 4368 c1 -9 -19 -16 -58 -21 -33 -4 -81 -14 -106 -22 -26 -8
+-57 -15 -70 -15 -13 -1 -35 -7 -49 -15 -14 -8 -35 -14 -46 -15 -12 0 -27 -7
+-34 -15 -7 -8 -19 -15 -28 -15 -16 0 -135 -58 -187 -91 -16 -10 -37 -22 -45
+-26 -26 -12 -176 -127 -245 -189 -113 -100 -262 -277 -330 -392 -6 -9 -22 -35
+-35 -57 -39 -62 -47 -76 -76 -135 -14 -30 -29 -57 -31 -60 -3 -3 -233 -8 -511
+-11 -518 -6 -577 -10 -614 -47 -7 -7 -20 -12 -29 -12 -9 0 -22 -7 -29 -15 -7
+-8 -20 -15 -29 -15 -27 0 -164 -140 -202 -205 -43 -76 -59 -116 -71 -185 -6
+-30 -12 -293 -15 -585 -6 -646 -1 -706 63 -840 60 -124 150 -217 271 -282 105
+-56 108 -56 662 -62 l513 -6 44 -80 c24 -44 47 -87 51 -95 52 -106 269 -369
+385 -466 97 -81 197 -158 218 -167 8 -4 29 -16 45 -26 38 -25 157 -83 215
+-106 25 -9 54 -21 65 -26 31 -14 124 -39 190 -52 83 -15 473 -15 555 0 157 30
+330 97 470 182 19 11 42 24 50 28 64 29 294 227 374 322 153 182 210 267 313
+461 l13 25 512 6 c524 5 583 10 620 47 7 7 20 12 29 12 9 0 22 7 29 15 7 8 20
+15 29 15 28 0 165 140 202 205 43 76 59 116 71 185 6 30 12 294 15 585 6 646
+1 706 -63 840 -80 165 -217 280 -389 326 -64 17 -114 19 -551 19 -391 0 -484
+3 -493 13 -6 8 -27 45 -47 83 -20 38 -41 76 -48 84 -7 8 -16 22 -20 30 -3 8
+-15 29 -26 45 -11 17 -24 40 -30 53 -5 12 -13 22 -17 22 -5 0 -24 24 -43 53
+-19 28 -41 59 -50 68 -8 8 -46 50 -85 93 -125 139 -310 281 -480 370 -90 46
+-209 93 -270 106 -22 5 -58 13 -80 19 -22 6 -65 14 -95 19 -35 5 -54 12 -52
+20 1 9 -39 12 -163 12 -126 0 -164 -3 -162 -12z m1469 -1395 c6 -7 24 -13 38
+-13 14 0 35 -7 46 -15 10 -8 26 -15 35 -15 9 0 22 -7 29 -15 7 -8 19 -15 28
+-15 8 0 22 -7 31 -15 9 -8 33 -29 54 -46 70 -59 132 -152 170 -254 14 -37 37
+-146 37 -173 0 -19 -35 -14 -55 7 -9 11 -36 30 -59 43 -41 22 -43 22 -552 26
+-494 3 -512 4 -533 23 -11 11 -21 29 -21 40 0 37 -76 124 -131 151 -99 47
+-104 48 -424 48 -175 0 -306 -4 -310 -9 -3 -5 -20 -13 -37 -17 -18 -3 -44 -14
+-58 -23 -37 -24 -120 -113 -120 -129 0 -8 -7 -28 -15 -46 -22 -45 -17 -660 6
+-721 19 -52 122 -156 174 -174 31 -12 113 -16 365 -19 347 -3 323 -6 425 45
+50 26 125 114 125 148 0 8 9 24 20 35 19 19 33 20 498 20 300 0 492 4 517 11
+51 13 102 38 138 67 40 31 51 28 44 -10 -3 -18 -11 -60 -16 -92 -6 -33 -15
+-64 -21 -70 -5 -5 -10 -20 -10 -32 0 -12 -7 -27 -15 -34 -8 -7 -15 -21 -15
+-32 0 -10 -7 -21 -15 -24 -8 -4 -15 -12 -15 -19 0 -19 -151 -157 -194 -177
+-58 -29 -98 -45 -151 -62 -45 -14 -178 -16 -1315 -16 -1231 0 -1267 1 -1335
+20 -101 28 -166 64 -239 132 -67 61 -107 113 -140 183 -10 22 -23 48 -28 58
+-25 50 -33 146 -32 412 0 264 8 374 32 421 5 10 18 37 28 59 36 74 103 154
+176 208 90 67 146 91 283 121 11 2 588 3 1282 2 995 -1 1265 -4 1275 -13z
+m-958 -275 c83 -23 181 -127 174 -185 l-3 -28 -429 -2 c-403 -3 -433 -4 -472
+-22 -44 -21 -124 -94 -124 -114 0 -7 -4 -6 -10 3 -15 24 -12 142 5 164 8 11
+15 28 15 38 0 26 115 138 143 138 12 0 29 5 37 10 22 14 612 13 664 -2z m1301
+-269 c59 -39 105 -81 105 -98 0 -8 8 -23 17 -33 26 -29 24 -200 -2 -248 -48
+-86 -110 -132 -200 -148 -66 -11 -1817 -8 -1893 4 -24 3 -46 12 -49 20 -3 8
+-11 14 -18 14 -16 0 -80 65 -93 95 -49 104 -53 148 -23 234 35 100 110 166
+206 182 22 3 461 6 975 5 l935 -1 40 -26z m-2060 -519 c7 0 18 -6 24 -14 19
+-22 97 -27 511 -29 l395 -2 3 -37 c3 -33 -3 -43 -57 -97 -34 -34 -67 -61 -75
+-61 -7 0 -27 -7 -42 -15 -24 -12 -84 -15 -341 -15 -191 0 -314 4 -318 10 -3 5
+-24 14 -45 20 -22 6 -40 15 -40 20 0 6 -6 10 -12 10 -18 0 -78 70 -85 100 -3
+14 -12 34 -19 45 -14 20 -20 146 -8 158 4 3 27 -16 51 -43 25 -28 51 -50 58
+-50z"/>
+</g>
+</svg>

app/src/main/assets/themes/Default/icons/land-location.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m16.949,2.05c-1.321-1.322-3.079-2.05-4.949-2.05s-3.627.728-4.95,2.05c-2.729,2.729-2.729,7.17.008,9.907l2.495,2.44c.675.66,1.561.99,2.447.99s1.772-.33,2.447-.99l2.502-2.448c1.322-1.322,2.051-3.08,2.051-4.95s-.729-3.627-2.051-4.95Zm-4.949,7.94c-1.657,0-3-1.343-3-3s1.343-3,3-3,3,1.343,3,3-1.343,3-3,3Zm-4.567,5.131l-.122.879H.628l.459-2.676c.246-1.435,1.23-2.577,2.524-3.066.449,1.156,1.14,2.219,2.049,3.129l1.773,1.734ZM.285,18h6.747l-.834,6h-2.198c-1.178,0-2.291-.516-3.052-1.415-.762-.899-1.087-2.081-.893-3.243l.23-1.342Zm14.862,0l.835,6h-7.765l.834-6h6.096Zm8.225-2h-6.485l-.146-1.049,1.622-1.587c.899-.899,1.584-1.954,2.03-3.104,1.292.49,2.274,1.63,2.52,3.064l.459,2.676Zm-.32,6.586c-.762.898-1.874,1.414-3.052,1.414h-2l-.835-6h6.55l.229,1.338c.194,1.167-.131,2.349-.893,3.248Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/limit-hand.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m15.654,13.773l-4.599,7.884c-.606,1.039.143,2.343,1.346,2.343h9.197c1.203,0,1.952-1.304,1.346-2.343l-4.599-7.884c-.601-1.031-2.091-1.031-2.692,0Zm1.346,9.227h0c-.552,0-1-.448-1-1h0c0-.552.448-1,1-1h0c.552,0,1,.448,1,1h0c0,.552-.448,1-1,1Zm-1-4v-2c0-.552.448-1,1-1h0c.552,0,1,.448,1,1v2c0,.552-.448,1-1,1h0c-.552,0-1-.448-1-1Zm-6.94,4.652c-1.285-.391-2.465-1.101-3.417-2.084L.646,16.412c-.713-.715-.88-1.87-.276-2.68.63-.845,1.741-1.031,2.584-.561.201.131.353.245.441.333l2.605,2.65V3.5c0-.911.812-1.632,1.752-1.479.737.12,1.248.813,1.248,1.56v5.42c0,.552.448,1,1,1s1-.448,1-1V1.5c0-.828.672-1.5,1.5-1.5s1.5.672,1.5,1.5v7.5c0,.552.448,1,1,1s1-.448,1-1V2.5c0-.828.672-1.5,1.5-1.5s1.5.672,1.5,1.5v6.5c0,.552.448,1,1,1s1-.448,1-1v-4.5c0-.828.672-1.5,1.5-1.5s1.5.672,1.5,1.5v14.5c0,.145-.031.282-.043.424l-3.883-6.658c-.645-1.106-1.794-1.767-3.074-1.767s-2.43.66-3.074,1.767l-4.597,7.882c-.546.932-.631,2.018-.269,3.003Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/location-crosshairs.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M15,12c0,1.654-1.346,3-3,3s-3-1.346-3-3,1.346-3,3-3,3,1.346,3,3Zm9,0c0,.553-.448,1-1,1h-1.05c-.471,4.717-4.233,8.48-8.95,8.95v1.05c0,.553-.448,1-1,1s-1-.447-1-1v-1.05c-4.717-.471-8.48-4.233-8.95-8.95H1c-.552,0-1-.447-1-1s.448-1,1-1h1.05C2.52,6.283,6.283,2.52,11,2.05V1c0-.553,.448-1,1-1s1,.447,1,1v1.05c4.717,.471,8.48,4.233,8.95,8.95h1.05c.552,0,1,.447,1,1Zm-7,0c0-2.757-2.243-5-5-5s-5,2.243-5,5,2.243,5,5,5,5-2.243,5-5Z"/></svg>

app/src/main/assets/themes/Default/icons/lock.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve" width="512" height="512">
+<g>
+	<path d="M405.333,179.712v-30.379C405.333,66.859,338.475,0,256,0S106.667,66.859,106.667,149.333v30.379   c-38.826,16.945-63.944,55.259-64,97.621v128C42.737,464.214,90.452,511.93,149.333,512h213.333   c58.881-0.07,106.596-47.786,106.667-106.667v-128C469.278,234.971,444.159,196.657,405.333,179.712z M277.333,362.667   c0,11.782-9.551,21.333-21.333,21.333c-11.782,0-21.333-9.551-21.333-21.333V320c0-11.782,9.551-21.333,21.333-21.333   c11.782,0,21.333,9.551,21.333,21.333V362.667z M362.667,170.667H149.333v-21.333c0-58.91,47.756-106.667,106.667-106.667   s106.667,47.756,106.667,106.667V170.667z"/>
+</g>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</svg>

app/src/main/assets/themes/Default/icons/master-plan.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="M.101,4C.566,1.721,2.586,0,5,0h14c2.414,0,4.434,1.721,4.899,4H.101Zm23.899,2v13c0,2.757-2.243,5-5,5H5c-2.757,0-5-2.243-5-5V6H24ZM3,10c0,.552,.447,1,1,1h5c.553,0,1-.448,1-1s-.447-1-1-1H4c-.553,0-1,.448-1,1Zm12,10c0-.553-.447-1-1-1H4c-.553,0-1,.447-1,1s.447,1,1,1H14c.553,0,1-.447,1-1Zm0-5c0-.553-.447-1-1-1H7c-.553,0-1,.447-1,1s.447,1,1,1h7c.553,0,1-.447,1-1Zm6,5c0-.738-.405-1.376-1-1.723v-6.277c0-1.654-1.346-3-3-3h-1.277c-.346-.595-.984-1-1.723-1-1.105,0-2,.895-2,2s.895,2,2,2c.738,0,1.376-.405,1.723-1h1.277c.552,0,1,.449,1,1v6.277c-.595,.346-1,.984-1,1.723,0,1.105,.895,2,2,2s2-.895,2-2Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/message-alert.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="M15.47,12.377l-5.226,8.96c-.689,1.181,.163,2.663,1.53,2.663h10.453c1.367,0,2.218-1.483,1.53-2.663l-5.226-8.96c-.683-1.171-2.376-1.171-3.059,0Zm1.53,10.623h0c-.552,0-1-.448-1-1h0c0-.552,.448-1,1-1h0c.552,0,1,.448,1,1h0c0,.552-.448,1-1,1Zm-1-4v-3c0-.552,.448-1,1-1h0c.552,0,1,.448,1,1v3c0,.552-.448,1-1,1h0c-.552,0-1-.448-1-1ZM12,0C5.373,0,0,5.373,0,12v7c0,2.757,2.243,5,5,5h3.451c-.622-1.162-.603-2.525,.065-3.671l1.942-3.329h-2.458c-.552,0-1-.447-1-1s.448-1,1-1h3.625l1.167-2h-4.792c-.552,0-1-.448-1-1s.448-1,1-1h5.992c.708-.946,1.802-1.501,3.008-1.501,1.356,0,2.574,.7,3.257,1.872l2.899,4.969c.266-.682,.493-1.384,.631-2.12,.003-.014,.013-.024,.015-.038,.036-.196,.055-.395,.081-.593,.019-.142,.045-.283,.058-.426,.037-.386,.059-.774,.059-1.162C24,5.373,18.627,0,12,0Zm4,9H8c-.552,0-1-.448-1-1s.448-1,1-1h8c.553,0,1,.448,1,1s-.447,1-1,1Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/password-lock.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="M22,14.556v-1.556c0-2.206-1.794-4-4-4s-4,1.794-4,4v1.556c-1.19,.694-2,1.97-2,3.444v2c0,2.206,1.794,4,4,4h4c2.206,0,4-1.794,4-4v-2c0-1.474-.81-2.75-2-3.444Zm-4,5.944c-.828,0-1.5-.672-1.5-1.5s.672-1.5,1.5-1.5,1.5,.672,1.5,1.5-.672,1.5-1.5,1.5Zm-2-6.5v-1c0-1.103,.897-2,2-2s2,.897,2,2v1h-4Zm3-12H5C2.239,2,0,4.239,0,7v3c0,2.761,2.239,5,5,5h5.812c.318-.548,.72-1.039,1.188-1.46v-.54c0-.772,.152-1.508,.419-2.187-.063,.012-.124,.036-.188,.036-.256,0-.512-.098-.707-.293l-.643-.643-.643,.643c-.195,.195-.451,.293-.707,.293s-.512-.098-.707-.293c-.391-.391-.391-1.023,0-1.414l.643-.643-.643-.643c-.391-.391-.391-1.023,0-1.414,.39-.391,1.023-.391,1.414,0l.643,.643,.643-.643c.391-.391,1.023-.391,1.414,0,.391,.391,.39,1.023,0,1.414l-.643,.643,.643,.643c.097,.097,.17,.21,.219,.33,1.092-1.495,2.853-2.473,4.843-2.473,2.754,0,5.074,1.867,5.777,4.4,.131-.447,.223-.91,.223-1.4v-3c0-2.761-2.239-5-5-5ZM6.707,9.143c.391,.391,.391,1.023,0,1.414-.195,.195-.451,.293-.707,.293s-.512-.098-.707-.293l-.643-.643-.643,.643c-.195,.195-.451,.293-.707,.293s-.512-.098-.707-.293c-.391-.391-.391-1.023,0-1.414l.643-.643-.643-.643c-.391-.391-.391-1.023,0-1.414,.39-.391,1.023-.391,1.414,0l.643,.643,.643-.643c.391-.391,1.023-.391,1.414,0s.391,1.023,0,1.414l-.643,.643,.643,.643Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/power.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512.301 512.301" style="enable-background:new 0 0 512.301 512.301;" xml:space="preserve" width="512" height="512">
+<g>
+	<path d="M320.119,82.112L320.119,82.112c0.137,8.67,5.409,16.432,13.419,19.755c71.67,31.535,117.01,103.433,114.581,181.696   c-1.72,106.039-89.076,190.605-195.115,188.885c-106.039-1.72-190.606-89.076-188.885-195.115c0,0,0,0,0,0   c0.101-76.006,45.028-144.798,114.581-175.445c8.013-3.343,13.282-11.117,13.419-19.797l0,0c0.019-11.782-9.518-21.348-21.3-21.367   c-2.745-0.004-5.466,0.521-8.012,1.548C43.898,113.824-10.705,252.01,40.848,370.919S230.586,544.43,349.495,492.878   c118.909-51.552,173.511-189.738,121.959-308.647c-23.698-54.66-67.299-98.261-121.959-121.959   c-10.913-4.442-23.36,0.804-27.802,11.716C320.643,76.568,320.108,79.327,320.119,82.112z"/>
+	<path d="M256.119,0L256.119,0c11.782,0,21.333,9.551,21.333,21.333v128c0,11.782-9.551,21.333-21.333,21.333l0,0   c-11.782,0-21.333-9.551-21.333-21.333v-128C234.785,9.551,244.337,0,256.119,0z"/>
+</g>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</svg>

app/src/main/assets/themes/Default/icons/robotic-arm.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m18.5,10c1.381,0,2.5,1.119,2.5,2.5s-1.119,2.5-2.5,2.5-2.5-1.119-2.5-2.5,1.119-2.5,2.5-2.5Zm-8.934-5.98l-2.98,2.98h-1.929c-1.335,0-2.591.52-3.535,1.464l-.829.829c-.391.391-.391,1.023,0,1.414s1.023.391,1.414,0l.829-.829c.559-.558,1.332-.878,2.121-.878h1.343v1.343c0,.79-.32,1.562-.878,2.121l-.829.829c-.391.391-.391,1.023,0,1.414.195.195.451.293.707.293s.512-.098.707-.293l.829-.829c.944-.944,1.464-2.2,1.464-3.535v-1.929l2.98-2.98c-.585-.345-1.069-.829-1.414-1.414Zm8.896,3.984l-2.062-3.93c-.715,1.17-1.999,1.931-3.451,1.912l2.008,3.771c.816-1.052,2.074-1.74,3.505-1.752Zm-3.462-6.004c0-1.105-.895-2-2-2s-2,.895-2,2,.895,2,2,2,2-.895,2-2Zm8,20h-1v-6.703c-.825,1.03-2.078,1.703-3.5,1.703s-2.675-.673-3.5-1.703v6.703h-1c-.552,0-1,.448-1,1s.448,1,1,1h9c.552,0,1-.448,1-1s-.448-1-1-1Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/rotate-left.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M12,0c-2.978,0-5.821,1.111-8,3.057V0H2V5c0,1.103,.897,2,2,2h5v-2H4.86c1.867-1.901,4.437-3,7.14-3,5.514,0,10,4.486,10,10s-4.486,10-10,10S2,17.514,2,12H0c0,6.617,5.383,12,12,12s12-5.383,12-12S18.617,0,12,0Z"/></svg>

app/src/main/assets/themes/Default/icons/selection.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m19,2C19,.895,19.895,0,21,0s2,.895,2,2-.895,2-2,2-2-.895-2-2ZM3,4c1.105,0,2-.895,2-2S4.105,0,3,0,1,.895,1,2s.895,2,2,2Zm20.341,4c.454,0,.76-.444.628-.878-.376-1.228-1.518-2.122-2.869-2.122h-1.169c.041.328.069.661.069,1,0,.692-.097,1.36-.262,2h3.603ZM4.069,5h-1.154C1.533,5,.368,5.935.021,7.208c-.11.403.229.792.647.792h3.594c-.165-.64-.262-1.308-.262-2,0-.339.028-.672.069-1Zm18.931,18.407v.593H6.538l-1.821-1.628c-.917-.858-.96-2.307-.098-3.23.861-.922,2.313-.97,3.235-.109.034.032,1.069.898,2.145,1.784v-9.817c0-1.215,1.083-2.176,2.336-1.973.983.16,1.664,1.083,1.664,2.08v5.355l5.829,2.292c1.913.752,3.171,2.598,3.171,4.653ZM12,0c-3.309,0-6,2.691-6,6,0,1.796.8,3.401,2.054,4.501.124-.984.588-1.897,1.355-2.548.896-.761,2.078-1.088,3.248-.899,1.709.278,3.033,1.711,3.289,3.447,1.254-1.1,2.054-2.705,2.054-4.5,0-3.309-2.691-6-6-6Zm0,6c-1.105,0-2-.895-2-2s.895-2,2-2,2,.895,2,2-.895,2-2,2Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/shield-check.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Filled" viewBox="0 0 24 24" width="512" height="512"><path d="M18.581,2.14,12.316.051a1,1,0,0,0-.632,0L5.419,2.14A4.993,4.993,0,0,0,2,6.883V12c0,7.563,9.2,11.74,9.594,11.914a1,1,0,0,0,.812,0C12.8,23.74,22,19.563,22,12V6.883A4.993,4.993,0,0,0,18.581,2.14ZM16.718,9.717l-4.272,4.272a1.873,1.873,0,0,1-1.335.553h-.033a1.872,1.872,0,0,1-1.345-.6l-2.306-2.4A1,1,0,1,1,8.868,10.16L11.112,12.5,15.3,8.3a1,1,0,0,1,1.414,1.414Z"/></svg>

app/src/main/assets/themes/Default/icons/slot.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="603.000000pt" height="438.000000pt" viewBox="0 0 603.000000 438.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.10, written by Peter Selinger 2001-2011
+</metadata>
+<g transform="translate(0.000000,438.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2843 4368 c1 -9 -19 -16 -58 -21 -33 -4 -81 -14 -106 -22 -26 -8
+-57 -15 -70 -15 -13 -1 -35 -7 -49 -15 -14 -8 -35 -14 -46 -15 -12 0 -27 -7
+-34 -15 -7 -8 -19 -15 -28 -15 -16 0 -135 -58 -187 -91 -16 -10 -37 -22 -45
+-26 -26 -12 -176 -127 -245 -189 -113 -100 -262 -277 -330 -392 -6 -9 -22 -35
+-35 -57 -39 -62 -47 -76 -76 -135 -14 -30 -29 -57 -31 -60 -3 -3 -233 -8 -511
+-11 -518 -6 -577 -10 -614 -47 -7 -7 -20 -12 -29 -12 -9 0 -22 -7 -29 -15 -7
+-8 -20 -15 -29 -15 -27 0 -164 -140 -202 -205 -43 -76 -59 -116 -71 -185 -6
+-30 -12 -293 -15 -585 -6 -646 -1 -706 63 -840 60 -124 150 -217 271 -282 105
+-56 108 -56 662 -62 l513 -6 44 -80 c24 -44 47 -87 51 -95 52 -106 269 -369
+385 -466 97 -81 197 -158 218 -167 8 -4 29 -16 45 -26 38 -25 157 -83 215
+-106 25 -9 54 -21 65 -26 31 -14 124 -39 190 -52 83 -15 473 -15 555 0 157 30
+330 97 470 182 19 11 42 24 50 28 64 29 294 227 374 322 153 182 210 267 313
+461 l13 25 512 6 c524 5 583 10 620 47 7 7 20 12 29 12 9 0 22 7 29 15 7 8 20
+15 29 15 28 0 165 140 202 205 43 76 59 116 71 185 6 30 12 294 15 585 6 646
+1 706 -63 840 -80 165 -217 280 -389 326 -64 17 -114 19 -551 19 -391 0 -484
+3 -493 13 -6 8 -27 45 -47 83 -20 38 -41 76 -48 84 -7 8 -16 22 -20 30 -3 8
+-15 29 -26 45 -11 17 -24 40 -30 53 -5 12 -13 22 -17 22 -5 0 -24 24 -43 53
+-19 28 -41 59 -50 68 -8 8 -46 50 -85 93 -125 139 -310 281 -480 370 -90 46
+-209 93 -270 106 -22 5 -58 13 -80 19 -22 6 -65 14 -95 19 -35 5 -54 12 -52
+20 1 9 -39 12 -163 12 -126 0 -164 -3 -162 -12z"/>
+</g>
+</svg>

app/src/main/assets/themes/Default/icons/sop.svg

@@ -0,0 +1,80 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="900.000000pt" height="900.000000pt" viewBox="0 0 900.000000 900.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.10, written by Peter Selinger 2001-2011
+</metadata>
+<g transform="translate(0.000000,900.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M630 8985 c0 -9 -14 -16 -37 -20 -40 -7 -90 -25 -158 -57 -209 -99
+-369 -300 -424 -531 -16 -67 -13 -300 4 -367 46 -183 152 -340 304 -451 235
+-173 568 -197 826 -61 146 77 275 211 350 365 l38 77 351 -2 351 -3 0 -710 0
+-710 -420 -6 c-360 -5 -426 -8 -464 -22 -24 -9 -51 -17 -60 -17 -28 -1 -186
+-85 -247 -132 -168 -129 -272 -296 -318 -508 -14 -64 -16 -151 -16 -572 l0
+-498 -238 0 c-270 0 -308 -7 -388 -74 -63 -53 -84 -102 -84 -196 0 -94 21
+-142 86 -198 75 -64 120 -72 392 -72 l232 0 0 -497 c0 -422 2 -509 16 -573 45
+-210 151 -379 318 -508 61 -47 219 -131 247 -132 9 0 36 -8 60 -17 38 -14 104
+-17 464 -22 l420 -6 0 -710 0 -710 -351 -3 -351 -2 -38 77 c-76 156 -231 314
+-365 374 -244 110 -499 105 -717 -12 -203 -110 -341 -286 -398 -509 -17 -67
+-20 -300 -4 -367 55 -231 215 -432 424 -531 124 -59 188 -72 348 -72 212 1
+329 40 486 163 100 78 161 153 227 281 l38 75 526 3 526 3 41 27 c75 49 100
+80 126 152 8 22 13 292 17 896 l5 865 720 0 720 0 2 -470 2 -470 -72 -34
+c-161 -76 -295 -212 -371 -374 -58 -124 -70 -180 -70 -337 0 -157 12 -214 70
+-337 102 -214 304 -377 537 -432 61 -14 293 -14 354 0 231 55 438 221 537 432
+58 124 70 180 70 337 0 157 -12 213 -70 337 -75 160 -213 299 -371 374 l-72
+34 2 470 2 470 720 0 720 0 6 -865 c3 -476 9 -878 14 -895 16 -59 55 -105 128
+-153 l41 -27 526 -3 526 -3 28 -56 c115 -235 300 -390 536 -449 68 -16 301
+-18 367 -3 231 55 432 215 531 424 32 68 50 118 57 158 4 23 11 37 20 37 13 0
+15 25 15 150 0 125 -2 150 -15 150 -9 0 -16 14 -20 37 -25 150 -155 345 -304
+454 -226 167 -536 195 -801 75 -147 -67 -296 -217 -375 -379 l-38 -77 -351 2
+-351 3 0 710 0 710 425 5 c372 5 430 8 464 23 21 9 46 17 55 17 28 1 186 85
+247 132 167 129 272 297 318 508 14 64 16 151 16 573 l0 497 238 1 c195 0 246
+3 289 17 64 21 140 83 159 129 8 19 21 36 29 40 22 8 22 158 0 166 -8 4 -21
+21 -29 40 -19 46 -92 105 -157 128 -46 17 -84 19 -291 19 l-238 0 0 498 c0
+421 -2 508 -16 572 -45 209 -152 380 -318 508 -61 47 -219 131 -247 132 -9 0
+-34 8 -55 17 -34 15 -92 18 -464 23 l-425 5 0 710 0 710 351 3 351 2 38 -77
+c138 -280 410 -453 715 -453 197 0 378 70 532 206 102 90 214 280 233 397 4
+23 11 37 20 37 13 0 15 25 15 150 0 125 -2 150 -15 150 -9 0 -16 14 -20 38 -8
+50 -51 156 -88 217 -76 126 -202 241 -332 303 -68 32 -118 50 -157 57 -24 4
+-38 11 -38 20 0 13 -25 15 -150 15 -121 0 -150 -3 -150 -14 0 -8 -15 -17 -37
+-20 -121 -22 -297 -124 -394 -229 -41 -45 -112 -152 -145 -219 l-28 -57 -527
+-3 -527 -3 -57 -40 c-59 -40 -95 -87 -110 -140 -5 -16 -11 -419 -14 -895 l-6
+-865 -720 0 -720 0 -2 470 -3 470 43 19 c175 78 322 221 401 389 58 124 70
+180 70 337 0 121 -4 156 -22 212 -56 176 -147 308 -282 413 -82 63 -216 128
+-292 141 -23 4 -38 12 -38 20 0 11 -29 14 -150 14 -125 0 -150 -2 -150 -15 0
+-9 -14 -16 -37 -20 -78 -13 -210 -76 -293 -140 -135 -105 -226 -237 -282 -413
+-32 -97 -32 -327 0 -424 73 -231 219 -405 419 -499 l72 -34 -2 -470 -2 -470
+-720 0 -720 0 -6 865 c-3 476 -9 879 -14 895 -16 59 -55 105 -128 153 l-41 27
+-523 3 -523 3 -25 39 c-14 22 -25 42 -25 46 0 20 -82 137 -137 194 -103 110
+-267 205 -385 226 -23 4 -38 12 -38 20 0 11 -29 14 -150 14 -125 0 -150 -2
+-150 -15z m2086 -3344 c150 -34 269 -110 353 -225 44 -61 57 -90 82 -176 24
+-81 24 -131 2 -193 -45 -125 -168 -198 -296 -175 -94 17 -182 97 -207 191 -10
+36 -20 51 -37 58 -32 12 -405 12 -437 -1 -25 -9 -26 -12 -26 -104 0 -109 -5
+-103 130 -170 41 -21 83 -41 93 -47 26 -14 43 -23 167 -87 63 -33 165 -85 225
+-117 61 -32 122 -64 137 -72 42 -22 135 -110 171 -162 79 -114 96 -185 97
+-396 0 -211 -21 -293 -106 -406 -90 -118 -211 -193 -362 -223 -123 -24 -516
+-22 -628 3 -125 28 -207 73 -294 161 -88 88 -131 168 -149 280 -11 64 -11 84
+2 133 37 142 164 222 305 192 101 -21 167 -82 203 -188 10 -29 25 -54 36 -58
+28 -11 408 -10 437 1 25 9 26 12 26 104 0 63 -4 97 -12 104 -15 11 -101 58
+-338 180 -91 46 -208 107 -260 135 -52 27 -113 59 -135 70 -22 11 -74 55 -115
+96 -125 127 -159 224 -159 466 -1 237 34 340 159 465 86 87 169 133 290 161
+112 26 531 26 646 0z m1944 -5 c283 -64 492 -257 589 -541 30 -91 41 -246 41
+-605 0 -359 -11 -514 -41 -605 -85 -250 -266 -437 -499 -515 -146 -48 -262
+-59 -381 -36 -228 46 -380 137 -509 306 -97 128 -143 248 -159 414 -14 141
+-14 716 -1 866 16 170 61 290 160 420 77 101 148 162 253 219 89 48 139 64
+297 95 41 8 180 -2 250 -18z m2285 2 c175 -54 307 -156 389 -298 70 -123 86
+-213 86 -485 0 -213 -11 -313 -44 -403 -52 -141 -180 -276 -328 -345 -96 -46
+-187 -57 -448 -57 -170 0 -239 -3 -248 -12 -9 -9 -12 -77 -12 -246 0 -151 -4
+-249 -12 -276 -12 -41 -56 -107 -93 -138 -27 -22 -120 -58 -153 -58 -60 0
+-136 35 -187 85 -91 90 -85 18 -85 1085 0 1067 -6 995 86 1086 85 84 82 84
+574 80 348 -2 434 -6 475 -18z"/>
+<path d="M4435 5120 c-83 -15 -155 -76 -194 -165 -20 -46 -21 -63 -21 -465 0
+-402 1 -419 21 -465 27 -60 79 -118 132 -145 59 -32 175 -32 234 0 53 27 105
+85 132 145 20 46 21 63 21 459 0 462 -1 470 -72 551 -64 73 -155 103 -253 85z"/>
+<path d="M6352 5117 c-9 -11 -12 -83 -10 -273 l3 -259 243 -3 243 -2 30 29 29
+29 0 214 c-1 211 -1 213 -25 243 l-25 30 -238 3 c-199 3 -240 1 -250 -11z"/>
+</g>
+</svg>

app/src/main/assets/themes/Default/icons/to-do.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m21.5,18l-2.5-2.5V2.5c0-1.379,1.121-2.5,2.5-2.5s2.5,1.121,2.5,2.5v13l-2.5,2.5ZM14,0H3C1.343,0,0,1.343,0,3v18.357c0,1.308.941,2.499,2.242,2.63,1.496.15,2.758-1.021,2.758-2.487v-3.5h12V3c0-1.657-1.343-3-3-3Zm-7.226,13.534c-.31.31-.717.465-1.124.465s-.814-.155-1.124-.465l-1.647-1.647,1.414-1.414,1.357,1.357,2.537-2.537,1.414,1.414-2.827,2.827Zm0-6c-.31.31-.717.465-1.124.465s-.814-.155-1.124-.465l-1.647-1.647,1.414-1.414,1.357,1.357,2.537-2.537,1.414,1.414-2.827,2.827Zm13.226,13.466v-1s-13,0-13,0v1.5c0,.924-.28,1.784-.76,2.5h10.76c1.657,0,3-1.343,3-3Z"/>
+</svg>

app/src/main/assets/themes/Default/icons/unlock.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512.077 512.077" style="enable-background:new 0 0 512.077 512.077;" xml:space="preserve" width="512" height="512">
+<g>
+	<path d="M362.705,170.744H149.372v-21.333c-0.016-58.91,47.727-106.68,106.637-106.696c38.815-0.011,74.572,21.064,93.363,55.027   c5.72,10.303,18.71,14.019,29.013,8.299c10.303-5.72,14.019-18.71,8.299-29.013c-39.949-72.153-130.826-98.26-202.98-58.311   c-47.529,26.315-77.017,76.367-76.999,130.695v30.379c-38.826,16.945-63.944,55.259-64,97.621v128   c0.071,58.881,47.786,106.596,106.667,106.667h213.333c58.881-0.07,106.596-47.786,106.667-106.667v-128   C469.301,218.529,421.586,170.814,362.705,170.744z M277.372,362.744c0,11.782-9.551,21.333-21.333,21.333   s-21.333-9.551-21.333-21.333v-42.667c0-11.782,9.551-21.333,21.333-21.333s21.333,9.551,21.333,21.333V362.744z"/>
+</g>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</svg>

app/src/main/assets/themes/Default/icons/user.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve" width="512" height="512">
+<g>
+	<circle cx="256" cy="128" r="128"/>
+	<path d="M256,298.667c-105.99,0.118-191.882,86.01-192,192C64,502.449,73.551,512,85.333,512h341.333   c11.782,0,21.333-9.551,21.333-21.333C447.882,384.677,361.99,298.784,256,298.667z"/>
+</g>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</svg>

app/src/main/assets/themes/Default/icons/users-alt.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M12,16a4,4,0,1,1,4-4A4,4,0,0,1,12,16ZM5.683,16H1a1,1,0,0,1-1-1A6.022,6.022,0,0,1,5.131,9.084a1,1,0,0,1,1.1,1.266A6.009,6.009,0,0,0,6,12a5.937,5.937,0,0,0,.586,2.57,1,1,0,0,1-.9,1.43ZM17,24H7a1,1,0,0,1-1-1,6,6,0,0,1,12,0A1,1,0,0,1,17,24ZM18,8a4,4,0,1,1,4-4A4,4,0,0,1,18,8ZM6,8a4,4,0,1,1,4-4A4,4,0,0,1,6,8Zm17,8H18.317a1,1,0,0,1-.9-1.43A5.937,5.937,0,0,0,18,12a6.009,6.009,0,0,0-.236-1.65,1,1,0,0,1,1.105-1.266A6.022,6.022,0,0,1,24,15,1,1,0,0,1,23,16Z"/></svg>

app/src/main/assets/themes/Default/icons/wind.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24" width="512" height="512"><path d="M0,12a1,1,0,0,1,1-1H7a1,1,0,0,1,0,2H1A1,1,0,0,1,0,12Zm20.915-.894A5,5,0,1,0,12,8a1,1,0,0,0,2,0,3,3,0,1,1,3,3H11a1,1,0,0,0,0,2h9a2,2,0,0,1,2,2c-.009,2.337-3.281,2.648-4.057.667a1,1,0,0,0-1.886.666C17.615,20.415,23.952,19.579,24,15A4.007,4.007,0,0,0,20.915,11.106ZM11,16H1a1,1,0,0,0,0,2H11a2,2,0,0,1,2,2c-.009,2.337-3.281,2.648-4.057.667a1,1,0,1,0-1.886.666C8.615,25.415,14.952,24.579,15,20A4,4,0,0,0,11,16ZM1,8H7a4,4,0,0,0,4-4C10.952-.581,4.613-1.414,3.057,2.667a1,1,0,0,0,1.886.666C5.72,1.351,8.991,1.663,9,4A2,2,0,0,1,7,6H1A1,1,0,0,0,1,8Z"/></svg>

app/src/main/assets/themes/Default/icons/workflow-alt.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" viewBox="0 0 24 24">
+  <path d="m20.5,15.121v-6.357c.392-.142.762-.361,1.076-.675l1.564-1.564c1.145-1.145,1.145-3.008,0-4.152l-1.564-1.564c-1.145-1.144-3.006-1.145-4.152,0h0s-1.563,1.565-1.563,1.565c-.314.314-.533.684-.675,1.076h-6.322C8.387,1.475,6.618,0,4.5,0,2.019,0,0,2.018,0,4.5c0,1.953,1.258,3.602,3,4.224v7.277h-.2c-1.544,0-2.8,1.256-2.8,2.8v2.399c0,1.544,1.256,2.801,2.8,2.801h2.4c1.544,0,2.8-1.257,2.8-2.801v-2.399c0-1.544-1.256-2.8-2.8-2.8h-.2v-7.051c1.927-.217,3.492-1.635,3.895-3.501h6.29c.142.392.361.762.675,1.076l1.563,1.564c.314.313.684.533,1.076.674v6.358c-2,.457-3.5,2.242-3.5,4.379,0,2.481,2.019,4.5,4.5,4.5s4.5-2.019,4.5-4.5c0-2.137-1.5-3.922-3.5-4.379Z"/>
+</svg>

app/src/main/java/com/grkj/iscs/features/main/activity/MainActivity.kt

@@ -31,6 +31,7 @@ import com.sik.sikcore.extension.file
 import com.sik.sikcore.extension.setDebouncedClickListener
 import com.sik.sikcore.extension.toJson
 import com.sik.sikimage.ImageConvertUtils
+import com.sik.siknet.http.toMap
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -46,35 +47,35 @@ class MainActivity() : BaseActivity<ActivityMainBinding>() {
             View.generateViewId(),
             R.navigation.nav_home,
             RoleFunctionalPermissionsEnum.HOME.description,
-            R.mipmap.icon_bottom_menu_home,
+            "icon_bottom_menu_home.svg",
             RoleFunctionalPermissionsEnum.HOME.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_data_manage,
             RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE.description,
-            R.mipmap.icon_bottom_menu_data_manage,
+            "icon_bottom_menu_data_manage.svg",
             RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_job_manage,
             RoleFunctionalPermissionsEnum.JOB_TICKET_HOME_MANAGE.description,
-            R.mipmap.icon_bottom_menu_job_manage,
+            "icon_bottom_menu_job_manage.svg",
             RoleFunctionalPermissionsEnum.JOB_TICKET_HOME_MANAGE.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_hardware_manage,
             RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE.description,
-            R.mipmap.icon_bottom_menu_hardware_manage,
+            "icon_bottom_menu_hardware_manage.svg",
             RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_exception_manage,
             RoleFunctionalPermissionsEnum.EXCEPTION_HOME_MANAGE.description,
-            R.mipmap.icon_bottom_menu_exception_manage,
+            "icon_bottom_menu_exception_manage.svg",
             RoleFunctionalPermissionsEnum.EXCEPTION_HOME_MANAGE.functionalPermission
         ),
     )
@@ -106,10 +107,10 @@ class MainActivity() : BaseActivity<ActivityMainBinding>() {
         }
         binding.navBar.let {
             it.menu.clear()
+            it.setIconData(tabConfigs.associate { it.title to it.icon })
             tabConfigs.forEachIndexed { index, cfg ->
                 if (MainDomainData.permissions.contains(cfg.permission)) {
                     binding.navBar.menu.add(Menu.NONE, cfg.id, index, cfg.title)
-                        .setIcon(cfg.icon)
                 }
             }
             // 这里很关键：通知 NavBar 重建子视图

app/src/main/java/com/grkj/iscs/features/main/dialog/QuickEntranceConfigDialog.kt

@@ -19,6 +19,7 @@ import com.grkj.iscs.databinding.DialogQuickEntranceConfigBinding
 import com.grkj.iscs.databinding.ItemQuickEntranceConfigBinding
 import com.grkj.iscs.databinding.ItemQuickEntranceNotConfigBinding
 import com.grkj.iscs.features.main.entity.QuickEntranceMenuItemEntity
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip
 import com.kongzue.dialogx.dialogs.FullScreenDialog
@@ -37,7 +38,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
         RoleFunctionalPermissionsEnum.values().filter { it.level != 0 }.mapIndexed { index, value ->
             QuickEntranceMenuItemEntity(
                 index,
-                QuickEntranceMenuItemEntity.getMenuIconId(value),
+                QuickEntranceMenuItemEntity.getMenuIcon(value),
                 value.description,
                 value,
                 QuickEntranceMenuItemEntity.getNavGraphId(value),
@@ -55,7 +56,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
                 mutableListOf<QuickEntranceMenuItemEntity>(
                     QuickEntranceMenuItemEntity(
                         0,
-                        R.mipmap.icon_job_manage_create_job,
+                        "document.svg",
                         RoleFunctionalPermissionsEnum.CREATE_JOB.description,
                         RoleFunctionalPermissionsEnum.CREATE_JOB,
                         QuickEntranceMenuItemEntity.getNavGraphId(RoleFunctionalPermissionsEnum.CREATE_JOB),
@@ -66,7 +67,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
                 permissions.mapIndexed { index, value ->
                     QuickEntranceMenuItemEntity(
                         index,
-                        QuickEntranceMenuItemEntity.getMenuIconId(value),
+                        QuickEntranceMenuItemEntity.getMenuIcon(value),
                         value.description,
                         value,
                         QuickEntranceMenuItemEntity.getNavGraphId(value),
@@ -129,7 +130,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
     ) {
         val itemBinding = holder.getBinding<ItemQuickEntranceConfigBinding>()
         val item = holder.getModel<QuickEntranceMenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         itemBinding.add.isVisible =
             showAdd && !selectedQuickEntranceConfig.map { it.permission.functionalPermission }
@@ -157,7 +158,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
     ) {
         val itemBinding = holder.getBinding<ItemQuickEntranceNotConfigBinding>()
         val item = holder.getModel<QuickEntranceMenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         itemBinding.add.isVisible =
             showAdd && !selectedQuickEntranceConfig.map { it.permission.functionalPermission }

app/src/main/java/com/grkj/iscs/features/main/entity/MenuItemEntity.kt

@@ -8,7 +8,7 @@ import com.grkj.ui_base.utils.CommonUtils
  */
 data class MenuItemEntity(
     val type: Int,
-    val menuIconId: Int,
+    val menuIcon: String,
     val menuText: String,
     val permission: String,
     var badgeNum: Int = 0,

app/src/main/java/com/grkj/iscs/features/main/entity/QuickEntranceMenuItemEntity.kt

@@ -11,7 +11,7 @@ import com.grkj.iscs.R
  */
 data class QuickEntranceMenuItemEntity(
     val type: Int,
-    val menuIconId: Int,
+    val menuIcon: String,
     val menuText: String,
     val permission: RoleFunctionalPermissionsEnum,
     val navGraph: Int,
@@ -25,34 +25,34 @@ data class QuickEntranceMenuItemEntity(
          * 获取图标id
          */
         @JvmStatic
-        fun getMenuIconId(permission: RoleFunctionalPermissionsEnum): Int {
+        fun getMenuIcon(permission: RoleFunctionalPermissionsEnum): String {
             return when (permission) {
-                RoleFunctionalPermissionsEnum.USER_MANAGE -> R.mipmap.icon_data_manage_menu_user_manage
-                RoleFunctionalPermissionsEnum.ROLE_MANAGE -> R.mipmap.icon_data_manage_menu_role_manage
-                RoleFunctionalPermissionsEnum.WORKSTATION_MANAGE -> R.mipmap.icon_data_manage_menu_area_manage
-                RoleFunctionalPermissionsEnum.POINT_MANAGE -> R.mipmap.icon_data_manage_menu_point_manage
-                RoleFunctionalPermissionsEnum.TODO_LIST -> R.mipmap.icon_my_todo
-                RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB -> R.mipmap.icon_job_manage_in_progress_job
-                RoleFunctionalPermissionsEnum.CREATE_SOP -> R.mipmap.icon_job_manage_create_sop
-                RoleFunctionalPermissionsEnum.SOP_MANAGE -> R.mipmap.icon_job_manage_sop_manage
-                RoleFunctionalPermissionsEnum.EXCEPTION_JOB -> R.mipmap.icon_bottom_menu_exception_manage
-                RoleFunctionalPermissionsEnum.CREATE_JOB -> R.mipmap.icon_job_manage_create_job
-                RoleFunctionalPermissionsEnum.JOB_MANAGE -> R.mipmap.icon_bottom_menu_job_manage
-                RoleFunctionalPermissionsEnum.CREATE_SOP_JOB -> R.mipmap.icon_job_manage_create_sop
-                RoleFunctionalPermissionsEnum.LOCKED_POINT -> R.mipmap.icon_data_manage_menu_point_manage
-                RoleFunctionalPermissionsEnum.SLOT_MANAGE -> R.mipmap.dock_no_key
-                RoleFunctionalPermissionsEnum.KEY_MANAGE -> R.mipmap.dock_has_key
-                RoleFunctionalPermissionsEnum.LOCK_MANAGE -> R.drawable.icon_ticket_lock
-                RoleFunctionalPermissionsEnum.CARD_MANAGE -> R.mipmap.icon_login_menu_card
-                RoleFunctionalPermissionsEnum.RFID_MANAGE -> R.mipmap.icon_login_menu_card
-                RoleFunctionalPermissionsEnum.EXCEPTION_REPORT -> R.mipmap.icon_exception
-                RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE -> R.mipmap.icon_bottom_menu_exception_manage
-                RoleFunctionalPermissionsEnum.USER_INFO -> R.mipmap.icon_data_manage_menu_user_manage
-                RoleFunctionalPermissionsEnum.RESET_PASSWORD -> R.mipmap.icon_login_menu_password
-                RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING -> com.grkj.ui_base.R.drawable.icon_fingerprint
-                RoleFunctionalPermissionsEnum.FACE_SETTING -> R.mipmap.icon_login_menu_face
-                RoleFunctionalPermissionsEnum.CARD_SETTING -> R.mipmap.icon_login_menu_card
-                else -> 0
+                RoleFunctionalPermissionsEnum.USER_MANAGE -> "user.svg"
+                RoleFunctionalPermissionsEnum.ROLE_MANAGE -> "users-alt.svg"
+                RoleFunctionalPermissionsEnum.WORKSTATION_MANAGE -> "land-location.svg"
+                RoleFunctionalPermissionsEnum.POINT_MANAGE -> "location-crosshairs.svg"
+                RoleFunctionalPermissionsEnum.TODO_LIST -> "to-do.svg"
+                RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB -> "ballot-check.svg"
+                RoleFunctionalPermissionsEnum.CREATE_SOP -> "new_sop.svg"
+                RoleFunctionalPermissionsEnum.SOP_MANAGE -> "ballot.svg"
+                RoleFunctionalPermissionsEnum.EXCEPTION_JOB -> "message-alert.svg"
+                RoleFunctionalPermissionsEnum.CREATE_JOB -> "document.svg"
+                RoleFunctionalPermissionsEnum.JOB_MANAGE -> "icon_bottom_menu_job_manage.svg"
+                RoleFunctionalPermissionsEnum.CREATE_SOP_JOB -> "sop.svg"
+                RoleFunctionalPermissionsEnum.LOCKED_POINT -> "target.svg"
+                RoleFunctionalPermissionsEnum.SLOT_MANAGE -> "slot.svg"
+                RoleFunctionalPermissionsEnum.KEY_MANAGE -> "key.svg"
+                RoleFunctionalPermissionsEnum.LOCK_MANAGE -> "lock.svg"
+                RoleFunctionalPermissionsEnum.CARD_MANAGE -> "cards-blank.png"
+                RoleFunctionalPermissionsEnum.RFID_MANAGE -> "rfid.svg"
+                RoleFunctionalPermissionsEnum.EXCEPTION_REPORT -> "limit-hand.svg"
+                RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE -> "icon_bottom_menu_exception_manage.svg"
+                RoleFunctionalPermissionsEnum.USER_INFO -> "chalkboard-user.svg"
+                RoleFunctionalPermissionsEnum.RESET_PASSWORD -> "password-lock.svg"
+                RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING -> "fingerprint.svg"
+                RoleFunctionalPermissionsEnum.FACE_SETTING -> "face-id-svgrepo-com.svg"
+                RoleFunctionalPermissionsEnum.CARD_SETTING -> "cards-blank.png"
+                else -> ""
             }
         }
 

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/DataManageHomeFragment.kt

@@ -1,14 +1,9 @@
 package com.grkj.iscs.features.main.fragment.data_manage
 
-import android.content.res.ColorStateList
-import android.graphics.drawable.GradientDrawable
 import androidx.annotation.OptIn
-import androidx.core.view.ViewCompat
-import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
-import com.drake.brv.utils.grid
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.google.android.flexbox.AlignItems
@@ -24,6 +19,7 @@ import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.config.ISCSConfig
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
 import com.sik.sikcore.extension.setDebouncedClickListener
@@ -37,31 +33,31 @@ class DataManageHomeFragment : BaseFragment<FragmentDataManageHomeBinding>() {
     private var menuData: MutableList<MenuItemEntity> = mutableListOf(
         MenuItemEntity(
             0,
-            R.mipmap.icon_data_manage_menu_user_manage,
+            "user.svg",
             RoleFunctionalPermissionsEnum.USER_MANAGE.description,
             RoleFunctionalPermissionsEnum.USER_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             1,
-            R.mipmap.icon_data_manage_menu_role_manage,
+            "users-alt",
             RoleFunctionalPermissionsEnum.ROLE_MANAGE.description,
             RoleFunctionalPermissionsEnum.ROLE_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             2,
-            R.mipmap.icon_data_manage_menu_area_manage,
+            "land-location.svg",
             RoleFunctionalPermissionsEnum.WORKSTATION_MANAGE.description,
             RoleFunctionalPermissionsEnum.WORKSTATION_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             3,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "location-crosshairs.svg",
             RoleFunctionalPermissionsEnum.POINT_MANAGE.description,
             RoleFunctionalPermissionsEnum.POINT_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             4,
-            R.mipmap.icon_backup_and_restore,
+            "back-up.svg",
             RoleFunctionalPermissionsEnum.BACKUP_AND_RESTORE.description,
             RoleFunctionalPermissionsEnum.BACKUP_AND_RESTORE.functionalPermission
         ),
@@ -101,7 +97,7 @@ class DataManageHomeFragment : BaseFragment<FragmentDataManageHomeBinding>() {
     private fun BindingAdapter.BindingViewHolder.onHomeMenuBinding(holder: BindingAdapter.BindingViewHolder) {
         val itemBinding = holder.getBinding<ItemHomeMenuBinding>()
         val item = holder.getModel<MenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
         itemBinding.root.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionManageHomeFragment.kt

@@ -1,14 +1,8 @@
 package com.grkj.iscs.features.main.fragment.exception_manage
 
-import android.content.res.ColorStateList
-import android.widget.LinearLayout
-import androidx.core.view.ViewCompat
-import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
-import com.drake.brv.utils.grid
-import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.google.android.flexbox.AlignItems
@@ -22,6 +16,7 @@ import com.grkj.iscs.databinding.FragmentExceptionManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
 import com.sik.sikcore.extension.setDebouncedClickListener
@@ -35,19 +30,19 @@ class ExceptionManageHomeFragment : BaseFragment<FragmentExceptionManageHomeBind
     private var menuData: MutableList<MenuItemEntity> = mutableListOf(
         MenuItemEntity(
             0,
-            R.mipmap.icon_data_manage_menu_user_manage,
+            "limit-hand.svg",
             RoleFunctionalPermissionsEnum.EXCEPTION_REPORT.description,
             RoleFunctionalPermissionsEnum.EXCEPTION_REPORT.functionalPermission
         ),
         MenuItemEntity(
             1,
-            R.mipmap.icon_data_manage_menu_role_manage,
+            "icon_bottom_menu_exception_manage.svg",
             RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE.description,
             RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             2,
-            R.mipmap.icon_data_manage_menu_area_manage,
+            "message-alert.svg",
             RoleFunctionalPermissionsEnum.EXCEPTION_JOB.description,
             RoleFunctionalPermissionsEnum.EXCEPTION_JOB.functionalPermission
         ),
@@ -83,7 +78,7 @@ class ExceptionManageHomeFragment : BaseFragment<FragmentExceptionManageHomeBind
     private fun BindingAdapter.BindingViewHolder.onHomeMenuBinding(holder: BindingAdapter.BindingViewHolder) {
         val itemBinding = holder.getBinding<ItemHomeMenuBinding>()
         val item = holder.getModel<MenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
         itemBinding.root.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/HardwareManageHomeFragment.kt

@@ -1,14 +1,8 @@
 package com.grkj.iscs.features.main.fragment.hardware_manage
 
-import android.content.res.ColorStateList
-import android.widget.LinearLayout
-import androidx.core.view.ViewCompat
-import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
-import com.drake.brv.utils.grid
-import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.google.android.flexbox.AlignItems
@@ -22,6 +16,7 @@ import com.grkj.iscs.databinding.FragmentHardwareManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
 import com.sik.sikcore.extension.setDebouncedClickListener
@@ -35,31 +30,31 @@ class HardwareManageHomeFragment : BaseFragment<FragmentHardwareManageHomeBindin
     private var menuData: MutableList<MenuItemEntity> = mutableListOf(
         MenuItemEntity(
             0,
-            R.mipmap.dock_no_key,
+            "slot.svg",
             RoleFunctionalPermissionsEnum.SLOT_MANAGE.description,
             RoleFunctionalPermissionsEnum.SLOT_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             1,
-            R.mipmap.icon_data_manage_menu_role_manage,
+            "key.svg",
             RoleFunctionalPermissionsEnum.KEY_MANAGE.description,
             RoleFunctionalPermissionsEnum.KEY_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             2,
-            R.mipmap.icon_data_manage_menu_area_manage,
+            "lock.svg",
             RoleFunctionalPermissionsEnum.LOCK_MANAGE.description,
             RoleFunctionalPermissionsEnum.LOCK_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             3,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "cards-blank.png",
             RoleFunctionalPermissionsEnum.CARD_MANAGE.description,
             RoleFunctionalPermissionsEnum.CARD_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             4,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "rfid.svg",
             RoleFunctionalPermissionsEnum.RFID_MANAGE.description,
             RoleFunctionalPermissionsEnum.RFID_MANAGE.functionalPermission
         ),
@@ -95,7 +90,7 @@ class HardwareManageHomeFragment : BaseFragment<FragmentHardwareManageHomeBindin
     private fun BindingAdapter.BindingViewHolder.onHomeMenuBinding(holder: BindingAdapter.BindingViewHolder) {
         val itemBinding = holder.getBinding<ItemHomeMenuBinding>()
         val item = holder.getModel<MenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
         itemBinding.root.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/fragment/home/HomeFragment.kt

@@ -17,11 +17,10 @@ import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.iscs.features.main.entity.QuickEntranceMenuItemEntity
 import com.grkj.iscs.features.main.viewmodel.home.HomeViewModel
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
 import com.grkj.ui_base.utils.event.JumpViewEvent
-import com.grkj.ui_base.utils.extension.tip
-import com.kongzue.dialogx.dialogs.PopTip
 import com.loper7.date_time_picker.dialog.CardDatePickerDialog
 import com.sik.sikcore.date.TimeUtils
 import com.sik.sikcore.extension.setDebouncedClickListener
@@ -45,7 +44,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                 mutableListOf<QuickEntranceMenuItemEntity>(
                     QuickEntranceMenuItemEntity(
                         0,
-                        R.mipmap.icon_job_manage_create_job,
+                        "document.svg",
                         RoleFunctionalPermissionsEnum.CREATE_JOB.description,
                         RoleFunctionalPermissionsEnum.CREATE_JOB,
                         QuickEntranceMenuItemEntity.getNavGraphId(RoleFunctionalPermissionsEnum.CREATE_JOB),
@@ -56,7 +55,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                 permissions.mapIndexed { index, value ->
                     QuickEntranceMenuItemEntity(
                         index,
-                        QuickEntranceMenuItemEntity.getMenuIconId(value),
+                        QuickEntranceMenuItemEntity.getMenuIcon(value),
                         value.description,
                         value,
                         QuickEntranceMenuItemEntity.getNavGraphId(value),
@@ -292,7 +291,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
     private fun BindingAdapter.BindingViewHolder.onQuickEntranceBinding(holder: BindingAdapter.BindingViewHolder) {
         val itemBinding = holder.getBinding<ItemHomeQuickEntranceBinding>()
         val item = holder.getModel<QuickEntranceMenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         if (item.badgeNum == 0) {
             itemBinding.quickEntranceLayout.hiddenBadge()

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobManageHomeFragment.kt

@@ -1,14 +1,10 @@
 package com.grkj.iscs.features.main.fragment.job_manage
 
-import android.content.res.ColorStateList
-import androidx.core.view.ViewCompat
-import androidx.core.widget.ImageViewCompat
 import androidx.fragment.app.viewModels
 import cn.bingoogolapple.badgeview.BGABadgeViewHelper
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
-import com.drake.brv.utils.grid
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.google.android.flexbox.AlignItems
@@ -23,6 +19,7 @@ import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.iscs.features.main.viewmodel.job_manage.JobManageHomeViewModel
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
@@ -38,63 +35,63 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
     private var menuData: MutableList<MenuItemEntity> = mutableListOf(
         MenuItemEntity(
             0,
-            R.mipmap.icon_my_todo,
+            "to-do.svg",
             RoleFunctionalPermissionsEnum.TODO_LIST.description,
             RoleFunctionalPermissionsEnum.TODO_LIST.functionalPermission
         ),
         MenuItemEntity(
             1,
-            R.mipmap.icon_job_manage_in_progress_job,
+            "ballot-check.svg",
             RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.description,
             RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.functionalPermission,
             menuBgTint = CommonUtils.getColor(com.grkj.ui_base.R.attr.colorJobManageHomeInProgressBg),
         ),
         MenuItemEntity(
             2,
-            R.mipmap.icon_job_manage_create_sop,
+            "new_sop.svg",
             RoleFunctionalPermissionsEnum.CREATE_SOP.description,
             RoleFunctionalPermissionsEnum.CREATE_SOP.functionalPermission
         ),
         MenuItemEntity(
             3,
-            R.mipmap.icon_job_manage_sop_manage,
+            "ballot.svg",
             RoleFunctionalPermissionsEnum.SOP_MANAGE.description,
             RoleFunctionalPermissionsEnum.SOP_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             4,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "message-alert.svg",
             RoleFunctionalPermissionsEnum.EXCEPTION_JOB.description,
             RoleFunctionalPermissionsEnum.EXCEPTION_JOB.functionalPermission,
             menuBgTint = CommonUtils.getColor(com.grkj.ui_base.R.attr.colorJobManageHomeExceptionJobBg),
         ),
         MenuItemEntity(
             5,
-            R.mipmap.icon_job_manage_create_job,
+            "document.svg",
             RoleFunctionalPermissionsEnum.CREATE_JOB.description,
             RoleFunctionalPermissionsEnum.CREATE_JOB.functionalPermission
         ),
         MenuItemEntity(
             6,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "icon_bottom_menu_job_manage.svg",
             RoleFunctionalPermissionsEnum.JOB_MANAGE.description,
             RoleFunctionalPermissionsEnum.JOB_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             7,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "sop.svg",
             RoleFunctionalPermissionsEnum.CREATE_SOP_JOB.description,
             RoleFunctionalPermissionsEnum.CREATE_SOP_JOB.functionalPermission
         ),
         MenuItemEntity(
             8,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "target.svg",
             RoleFunctionalPermissionsEnum.LOCKED_POINT.description,
             RoleFunctionalPermissionsEnum.LOCKED_POINT.functionalPermission
         ),
         MenuItemEntity(
             9,
-            R.mipmap.icon_workflow_setting,
+            "workflow-alt.svg",
             RoleFunctionalPermissionsEnum.WORKFLOW_MANAGE.description,
             RoleFunctionalPermissionsEnum.WORKFLOW_MANAGE.functionalPermission
         ),
@@ -123,7 +120,7 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
     private fun onHomeMenuBinding(holder: BindingAdapter.BindingViewHolder) {
         val itemBinding = holder.getBinding<ItemHomeMenuBinding>()
         val item = holder.getModel<MenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         itemBinding.homeMenuLayout.apply {
             this.badgeViewHelper.apply {

app/src/main/java/com/grkj/iscs/features/main/fragment/user_info/UserInfoHomeFragment.kt

@@ -1,13 +1,8 @@
 package com.grkj.iscs.features.main.fragment.user_info
 
-import android.content.res.ColorStateList
-import androidx.core.view.ViewCompat
-import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
-import com.drake.brv.utils.grid
-import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.google.android.flexbox.AlignItems
@@ -21,6 +16,7 @@ import com.grkj.iscs.databinding.FragmentUserInfoHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.LogoutEvent
 import com.sik.sikcore.extension.setDebouncedClickListener
@@ -34,31 +30,31 @@ class UserInfoHomeFragment : BaseFragment<FragmentUserInfoHomeBinding>() {
     private var menuData: MutableList<MenuItemEntity> = mutableListOf(
         MenuItemEntity(
             0,
-            R.mipmap.icon_data_manage_menu_user_manage,
+            "chalkboard-user.svg",
             RoleFunctionalPermissionsEnum.USER_INFO.description,
             RoleFunctionalPermissionsEnum.USER_INFO.functionalPermission
         ),
         MenuItemEntity(
             1,
-            R.mipmap.icon_data_manage_menu_role_manage,
+            "password-lock.svg",
             RoleFunctionalPermissionsEnum.RESET_PASSWORD.description,
             RoleFunctionalPermissionsEnum.RESET_PASSWORD.functionalPermission
         ),
         MenuItemEntity(
             2,
-            R.mipmap.icon_login_menu_fingerprint,
+            "fingerprint.svg",
             RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING.description,
             RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING.functionalPermission
         ),
         MenuItemEntity(
             3,
-            R.mipmap.icon_login_menu_face,
+            "face-id-svgrepo-com.svg",
             RoleFunctionalPermissionsEnum.FACE_SETTING.description,
             RoleFunctionalPermissionsEnum.FACE_SETTING.functionalPermission
         ),
         MenuItemEntity(
             4,
-            R.mipmap.icon_login_menu_card,
+            "cards-blank.png",
             RoleFunctionalPermissionsEnum.CARD_SETTING.description,
             RoleFunctionalPermissionsEnum.CARD_SETTING.functionalPermission
         ),
@@ -70,7 +66,7 @@ class UserInfoHomeFragment : BaseFragment<FragmentUserInfoHomeBinding>() {
 //        ),
         MenuItemEntity(
             6,
-            R.mipmap.icon_data_manage_menu_point_manage,
+            "leave.svg",
             RoleFunctionalPermissionsEnum.LOGOUT.description,
             RoleFunctionalPermissionsEnum.LOGOUT.functionalPermission
         ),
@@ -106,7 +102,7 @@ class UserInfoHomeFragment : BaseFragment<FragmentUserInfoHomeBinding>() {
     private fun BindingAdapter.BindingViewHolder.onHomeMenuBinding(holder: BindingAdapter.BindingViewHolder) {
         val itemBinding = holder.getBinding<ItemHomeMenuBinding>()
         val item = holder.getModel<MenuItemEntity>()
-        itemBinding.homeMenuIv.setImageResource(item.menuIconId)
+        itemBinding.homeMenuIv.loadSkinIcon(item.menuIcon)
         itemBinding.homeMenuTv.text = item.menuText
         itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
         itemBinding.root.setDebouncedClickListener {

app/src/main/res/color/text_color_workstation_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorWhite" android:state_selected="true" />
-    <item android:color="?attr/colorBlack" />
+    <item android:color="?attr/colorTextSecondary" android:state_selected="true" />
+    <item android:color="?attr/colorTextPrimary" />
 </selector>

app/src/main/res/drawable/bg_workstation_item_normal.xml

@@ -4,6 +4,6 @@
     <solid android:color="?attr/colorWhite" />
     <stroke
         android:width="@dimen/iscs_stroke_sm"
-        android:color="?attr/colorBlack" />
+        android:color="?attr/colorContainerBg" />
     <corners android:radius="@dimen/iscs_radius_sm"/>
 </shape>

app/src/main/res/layout-land/activity_login.xml

@@ -31,7 +31,7 @@
                 android:format12Hour="yyyy-MM-dd    HH:mm"
                 android:format24Hour="yyyy-MM-dd    HH:mm"
                 android:gravity="center_vertical"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 android:textStyle="bold|italic" />
         </FrameLayout>

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

@@ -111,10 +111,10 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/header_layout"
             app:navBarBackground="?attr/colorSecBg"
-            app:navIconSelectedSize="@dimen/home_bottom_nav_icon_selected_size"
+            app:navIconSelectedSize="@dimen/home_bottom_nav_icon_size"
             app:navIconSize="@dimen/home_bottom_nav_icon_size"
             app:navOrientation="vertical"
-            app:navTextSelectedSize="@dimen/iscs_text_xs"
-            app:navTextSize="@dimen/iscs_text_xsm" />
+            app:navTextSelectedSize="@dimen/iscs_text_sm"
+            app:navTextSize="@dimen/iscs_text_sm" />
     </RelativeLayout>
 </layout>

app/src/main/res/layout-land/dialog_slots_exception_report.xml

@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/iscs_space_3"
                 android:layout_marginTop="@dimen/iscs_space_3"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="@string/hardware_info" />
@@ -52,7 +52,7 @@
                 android:gravity="left|top"
                 app:i18nHint='@{"please_input_exception_reason"}'
                 android:padding="@dimen/selectable_input_edit_padding"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/hardware_info" />

app/src/main/res/layout-land/fragment_backup_and_restore.xml

@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold"
                 app:i18nKey='@{"backup_title"}' />
@@ -46,11 +46,12 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size"
                 app:i18nKey='@{"back"}' />
         </LinearLayout>
@@ -83,7 +84,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_25"
                         android:textStyle="bold"
                         app:i18nKey='@{"backup"}' />
@@ -105,7 +106,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"backup_now"}' />
                 </LinearLayout>
@@ -125,7 +126,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_path"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -142,7 +143,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/backup_path_tv"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -153,7 +154,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"maximum_number_of_backups"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -171,7 +172,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/maximum_number_of_backups_tv"
                         app:layout_constraintEnd_toStartOf="@+id/maximum_number_of_backups_range"
@@ -181,7 +182,7 @@
                         android:id="@+id/maximum_number_of_backups_range"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nArg0='@{"5-20"}'
                         app:i18nKey='@{"backup_range"}'
@@ -194,7 +195,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"auto_backup"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -231,7 +232,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_frequency"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -248,7 +249,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/backup_frequency_tv"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -260,7 +261,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_frequency"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -276,7 +277,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/backup_time_tv"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -314,7 +315,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"save"}'
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -340,7 +341,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_25"
                         android:textStyle="bold"
                         app:i18nKey='@{"restore"}' />
@@ -359,7 +360,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"common_batch_export"}' />
 
@@ -374,7 +375,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"common_batch_delete"}' />
                 </LinearLayout>

app/src/main/res/layout-land/fragment_create_job.xml

@@ -28,7 +28,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"create_job_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
 
@@ -40,12 +40,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -82,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_18" />
 
                     <View
@@ -107,7 +108,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"job_workstation"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
@@ -122,7 +123,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
@@ -138,7 +139,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"workflow_mode"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
@@ -153,7 +154,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
@@ -170,7 +171,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"create_job_name"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <EditText
@@ -184,7 +185,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </LinearLayout>
@@ -211,7 +212,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -222,7 +223,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -252,7 +253,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"please_select_workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
                     </FrameLayout>
                 </LinearLayout>
@@ -286,7 +287,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -297,7 +298,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -336,7 +337,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_must_select_at_least_one_point"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
                     </FrameLayout>
@@ -365,7 +366,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -376,7 +377,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -410,7 +411,7 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
-                                    android:textColor="?attr/colorBlack"
+                                    android:textColor="?attr/colorTextPrimary"
                                     android:textSize="@dimen/normal_text_size_18" />
 
                                 <View
@@ -441,7 +442,7 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"colocker"}'
-                                    android:textColor="?attr/colorBlack"
+                                    android:textColor="?attr/colorTextPrimary"
                                     android:layout_gravity="center"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -478,7 +479,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_select_member"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
                     </FrameLayout>
@@ -498,7 +499,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"save_sop_check"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <View

app/src/main/res/layout-land/fragment_create_sop.xml

@@ -28,7 +28,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"create_sop_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
 
@@ -40,12 +40,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -82,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_18" />
 
                     <View
@@ -107,7 +108,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"sop_workstation"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
@@ -122,7 +123,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
@@ -138,7 +139,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"workflow_mode"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
@@ -153,7 +154,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
@@ -170,7 +171,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"create_sop_name"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <EditText
@@ -184,7 +185,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </LinearLayout>
@@ -210,7 +211,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -221,7 +222,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -251,7 +252,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"please_select_workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
                     </FrameLayout>
                 </LinearLayout>
@@ -286,7 +287,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -297,7 +298,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -336,7 +337,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_must_select_at_least_one_point"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
                     </FrameLayout>
@@ -365,7 +366,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -376,7 +377,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -410,7 +411,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
                                     android:layout_gravity="center"
-                                    android:textColor="?attr/colorBlack"
+                                    android:textColor="?attr/colorTextPrimary"
                                     android:textSize="@dimen/normal_text_size_18" />
 
                                 <View
@@ -442,7 +443,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"colocker"}'
                                     android:layout_gravity="center"
-                                    android:textColor="?attr/colorBlack"
+                                    android:textColor="?attr/colorTextPrimary"
                                     android:textSize="@dimen/normal_text_size_18" />
 
                                 <View
@@ -478,7 +479,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_select_member"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
                     </FrameLayout>

app/src/main/res/layout-land/fragment_create_sop_job.xml

@@ -28,7 +28,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"create_sop_job_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -40,12 +40,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -82,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_18" />
 
                     <View
@@ -103,7 +104,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/iscs_space_3"
                             app:i18nKey='@{"sop_workstation"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -120,7 +121,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintBottom_toBottomOf="@+id/sop_workstation_tv"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -133,7 +134,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/iscs_space_3"
                             app:i18nKey='@{"create_sop_job_sop"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
                             app:layout_constraintTop_toBottomOf="@+id/sop_workstation_tv" />
@@ -150,7 +151,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintBottom_toBottomOf="@+id/sop_title"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -163,7 +164,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/iscs_space_3"
                             app:i18nKey='@{"job_name"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintEnd_toEndOf="@+id/sop_title"
                             app:layout_constraintTop_toBottomOf="@+id/sop_title" />
@@ -179,7 +180,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintBottom_toBottomOf="@+id/job_name_tv"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -208,7 +209,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -219,7 +220,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -249,7 +250,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"please_select_workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
                     </FrameLayout>
                 </LinearLayout>
@@ -283,7 +284,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                     </LinearLayout>
@@ -318,7 +319,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"show_points_when_selected_sop"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
                     </FrameLayout>
@@ -347,7 +348,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -358,7 +359,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -392,7 +393,7 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
-                                    android:textColor="?attr/colorBlack"
+                                    android:textColor="?attr/colorTextPrimary"
                                     android:textSize="@dimen/normal_text_size_18" />
 
                                 <View
@@ -423,7 +424,7 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"colocker"}'
-                                    android:textColor="?attr/colorBlack"
+                                    android:textColor="?attr/colorTextPrimary"
                                     android:layout_gravity="center"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -455,7 +456,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"show_member_when_selected_sop"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
                     </FrameLayout>

app/src/main/res/layout-land/fragment_edit_job.xml

@@ -28,7 +28,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"edit_job_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -40,12 +40,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -83,7 +84,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_18" />
 
                     <View
@@ -108,7 +109,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"job_workstation"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
@@ -123,7 +124,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
@@ -139,7 +140,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"workflow_mode"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
@@ -154,7 +155,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
@@ -171,7 +172,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 app:i18nKey='@{"create_job_name"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
 
                             <EditText
@@ -185,7 +186,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_3"
                                 android:paddingVertical="2dp"
                                 android:singleLine="true"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </LinearLayout>
@@ -211,7 +212,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -222,7 +223,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -274,7 +275,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -285,7 +286,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -324,7 +325,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -335,7 +336,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -366,7 +367,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"locker"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/normal_text_size_18" />
 
                             <View
@@ -397,7 +398,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"colocker"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:layout_gravity="center"
                                 android:textSize="@dimen/normal_text_size_18" />
 

app/src/main/res/layout-land/fragment_edit_sop.xml

@@ -27,7 +27,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"edit_sop_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
 
@@ -39,12 +39,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -81,7 +82,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_18" />
 
                     <View
@@ -102,7 +103,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:i18nKey='@{"sop_workstation"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
@@ -117,7 +118,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
@@ -133,7 +134,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:i18nKey='@{"workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
@@ -148,7 +149,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
@@ -165,7 +166,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             app:i18nKey='@{"create_sop_name"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md" />
 
                         <EditText
@@ -179,7 +180,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
                 </LinearLayout>
@@ -204,7 +205,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -215,7 +216,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -267,7 +268,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -278,7 +279,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -318,7 +319,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -329,7 +330,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -359,7 +360,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"locker"}'
                                 android:layout_gravity="center"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/normal_text_size_18" />
 
                             <View
@@ -390,7 +391,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"colocker"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:layout_gravity="center"
                                 android:textSize="@dimen/normal_text_size_18" />
 

app/src/main/res/layout-land/fragment_edit_sop_job.xml

@@ -28,7 +28,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"edit_sop_job_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
 
@@ -40,12 +40,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -82,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_18" />
 
                     <View
@@ -104,7 +105,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/iscs_space_3"
                             app:i18nKey='@{"sop_workstation"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -121,7 +122,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintBottom_toBottomOf="@+id/sop_workstation_tv"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -134,7 +135,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/iscs_space_3"
                             app:i18nKey='@{"create_sop_job_sop"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
                             app:layout_constraintTop_toBottomOf="@+id/sop_workstation_tv" />
@@ -151,7 +152,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintBottom_toBottomOf="@+id/sop_title"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -164,7 +165,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/iscs_space_3"
                             app:i18nKey='@{"job_name"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintEnd_toEndOf="@+id/sop_title"
                             app:layout_constraintTop_toBottomOf="@+id/sop_title" />
@@ -180,7 +181,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="2dp"
                             android:singleLine="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md"
                             app:layout_constraintBottom_toBottomOf="@+id/job_name_tv"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -209,7 +210,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -220,7 +221,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -272,7 +273,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             app:i18nKey='@{"point_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                     </LinearLayout>
@@ -312,7 +313,7 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -323,7 +324,7 @@
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
 
@@ -353,7 +354,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"locker"}'
                                 android:layout_gravity="center"
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/normal_text_size_18" />
 
                             <View
@@ -384,7 +385,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"colocker"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:layout_gravity="center"
                                 android:textSize="@dimen/normal_text_size_18" />
 

app/src/main/res/layout-land/fragment_job_execute.xml

@@ -30,7 +30,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"job_manage_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -42,12 +42,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -193,7 +194,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerInParent="true"
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/iscs_text_md" />
 
                         <ImageView

app/src/main/res/layout-land/fragment_point_manage.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -19,17 +19,17 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:src='@{"location-crosshairs.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
-                app:i18nKey='@{"point_manage_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                app:i18nKey='@{"point_manage_title"}' />
 
             <TextView
                 android:id="@+id/back"
@@ -40,12 +40,13 @@
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
                 android:drawablePadding="@dimen/iscs_space_3"
+                android:drawableTint="?attr/colorPrimary"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/common_btn_text_size"
+                app:i18nKey='@{"back"}' />
         </LinearLayout>
 
         <View
@@ -68,9 +69,9 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"insert"}'
-                android:textColor="?attr/colorBlack"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/common_btn_text_size"
+                app:i18nKey='@{"insert"}' />
 
             <TextView
                 android:id="@+id/delete_point"
@@ -79,9 +80,9 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"delete"}'
-                android:textColor="?attr/colorBlack"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/common_btn_text_size"
+                app:i18nKey='@{"delete"}' />
 
             <TextView
                 android:id="@+id/reset"
@@ -90,9 +91,9 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"reset"}'
-                android:textColor="?attr/colorBlack"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/common_btn_text_size"
+                app:i18nKey='@{"reset"}' />
 
             <View
                 android:layout_width="0dp"
@@ -106,9 +107,9 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"filter"}'
-                android:textColor="?attr/colorBlack"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/common_btn_text_size"
+                app:i18nKey='@{"filter"}' />
         </LinearLayout>
 
         <LinearLayout
@@ -122,42 +123,45 @@
 
             <CheckBox
                 android:id="@+id/select_all"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/iscs_space_3" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center" />
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                app:i18nKey='@{"point_manage_point_name"}'
-                android:textSize="@dimen/iscs_text_md" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"point_manage_point_name"}' />
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                app:i18nKey='@{"point_manage_point_function"}'
-                android:textSize="@dimen/iscs_text_md" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"point_manage_point_function"}' />
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                app:i18nKey='@{"point_manage_workstation"}'
-                android:textSize="@dimen/iscs_text_md" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"point_manage_workstation"}' />
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                app:i18nKey='@{"point_manage_rfid"}'
-                android:textSize="@dimen/iscs_text_md" />
+                android:textColor="?attr/colorTextPrimary"
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"point_manage_rfid"}' />
         </LinearLayout>
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout

app/src/main/res/layout-land/fragment_select_memeber.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"create_sop_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"select_member_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_18"
                 android:textStyle="bold" />
 
@@ -67,12 +67,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -120,7 +121,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"locker"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                     </LinearLayout>
@@ -156,7 +157,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"colocker"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/normal_text_size_18" />
 
                         <TextView
@@ -193,7 +194,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"select_colocker_tip"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/normal_text_size" />
 
                 <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout-land/fragment_select_point.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"create_sop_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"select_point_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_18"
                 android:textStyle="bold" />
 
@@ -67,12 +67,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -104,7 +105,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"point_list_title"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/normal_text_size_18" />
 
                 <View
@@ -141,7 +142,7 @@
                         android:drawablePadding="@dimen/iscs_space_3"
                         android:gravity="center_vertical"
                         app:i18nKey='@{"select_group_tip"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md" />
 
                     <View
@@ -161,7 +162,7 @@
                         android:gravity="center"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         app:i18nKey='@{"add_group"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size" />
                 </LinearLayout>
 

app/src/main/res/layout-land/fragment_set_face.xml

@@ -30,7 +30,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"set_face_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -42,12 +42,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -86,7 +87,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/iscs_space_4"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md"
                     tools:text="您尚未设置人脸数据" />
 
@@ -98,7 +99,7 @@
                     android:background="@drawable/common_btn"
                     android:paddingHorizontal="@dimen/iscs_space_4"
                     android:paddingVertical="@dimen/iscs_space_3"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md"
                     tools:text="点击设置" />
             </LinearLayout>
@@ -210,7 +211,7 @@
                                 style="@style/CommonTextView"
                                 android:layout_marginLeft="@dimen/iscs_space_1"
                                 app:i18nKey='@{"capture_tip_title"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/common_text_size_small" />
                         </LinearLayout>
 
@@ -219,7 +220,7 @@
                             android:layout_marginTop="@dimen/iscs_space_3"
                             android:gravity="left"
                             app:i18nKey='@{"capture_tip_content"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_text_size_small" />
 
                     </LinearLayout>

app/src/main/res/layout-land/fragment_user_info.xml

@@ -29,7 +29,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_info_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -41,12 +41,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 
@@ -92,7 +93,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_3"
                         app:i18nKey='@{"user_name"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/avatar" />
@@ -108,7 +109,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/username_tv"
@@ -120,7 +121,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_3"
                         app:i18nKey='@{"nickname"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintEnd_toEndOf="@+id/username_tv"
                         app:layout_constraintTop_toBottomOf="@+id/username_tv" />
@@ -136,7 +137,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/nickname_tv"
@@ -149,7 +150,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_3"
                         app:i18nKey='@{"phone"}'
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintEnd_toEndOf="@+id/nickname_tv"
                         app:layout_constraintTop_toBottomOf="@+id/nickname_tv" />
@@ -165,7 +166,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/phone_tv"
@@ -328,7 +329,7 @@
                                 style="@style/CommonTextView"
                                 android:layout_marginLeft="@dimen/iscs_space_1"
                                 app:i18nKey='@{"capture_tip_title"}'
-                                android:textColor="?attr/colorBlack"
+                                android:textColor="?attr/colorTextPrimary"
                                 android:textSize="@dimen/common_text_size_small" />
                         </LinearLayout>
 
@@ -337,7 +338,7 @@
                             android:layout_marginTop="@dimen/iscs_space_3"
                             android:gravity="left"
                             app:i18nKey='@{"capture_tip_content"}'
-                            android:textColor="?attr/colorBlack"
+                            android:textColor="?attr/colorTextPrimary"
                             android:textSize="@dimen/common_text_size_small" />
 
                     </LinearLayout>

app/src/main/res/layout-land/fragment_workflow_setting.xml

@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"create_sop_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"workflow_setting"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
 
@@ -68,12 +68,13 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
 

app/src/main/res/layout-land/item_home_menu.xml

@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/home_menu_width"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"

app/src/main/res/layout-land/item_job_execute_colock.xml

@@ -19,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textColor="?attr/colorBlack"
+            android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/normal_text_size"
             tools:text="王俊杰" />
     </LinearLayout>

app/src/main/res/layout-land/item_point_manage_point.xml

@@ -9,10 +9,9 @@
 
         <CheckBox
             android:id="@+id/select"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:layout_margin="@dimen/iscs_space_3" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
 
         <TextView
             android:id="@+id/point_name"
@@ -20,6 +19,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
+            android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/iscs_text_md" />
 
         <TextView
@@ -28,6 +28,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
+            android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/iscs_text_md" />
 
         <TextView
@@ -36,6 +37,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
+            android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/iscs_text_md" />
 
         <TextView
@@ -44,6 +46,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
+            android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/iscs_text_md" />
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/item_quick_entrance_config.xml

@@ -21,6 +21,7 @@
                 android:id="@+id/home_menu_iv"
                 android:layout_width="@dimen/home_item_quick_entrance_iv"
                 android:layout_height="@dimen/home_item_quick_entrance_iv"
+                android:tint="?attr/colorPrimary"
                 android:layout_gravity="center" />
 
             <ImageView

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

@@ -31,7 +31,7 @@
                 android:format12Hour="yyyy-MM-dd    HH:mm"
                 android:format24Hour="yyyy-MM-dd    HH:mm"
                 android:gravity="center_vertical"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 android:textStyle="bold|italic" />
         </FrameLayout>

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

@@ -111,10 +111,10 @@
             android:layout_height="@dimen/home_bottom_nav_size"
             android:layout_alignParentBottom="true"
             app:navBarBackground="?attr/colorSecBg"
-            app:navIconSelectedSize="@dimen/home_bottom_nav_icon_selected_size"
+            app:navIconSelectedSize="@dimen/home_bottom_nav_icon_size"
             app:navIconSize="@dimen/home_bottom_nav_icon_size"
             app:navOrientation="horizontal"
-            app:navTextSelectedSize="@dimen/iscs_text_md"
+            app:navTextSelectedSize="@dimen/iscs_text_sm"
             app:navTextSize="@dimen/iscs_text_sm" />
     </RelativeLayout>
 </layout>

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"card_manage_new_card_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"card_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -69,7 +69,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/card_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"username"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/card_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/card_nfc_tv" />
@@ -99,7 +99,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/username_title_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -112,7 +112,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/username_title_tv"
                 app:layout_constraintTop_toBottomOf="@+id/username_title_tv" />
@@ -150,7 +150,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -166,7 +166,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/iscs_space_3"
             app:i18nKey='@{"fingerprint_scan_tip"}'
-            android:textColor="?attr/colorBlack"
+            android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/iscs_text_md" />
 
         <TextView

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"key_manage_new_key_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +67,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_code_tv" />
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_mac"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_nfc_tv" />
@@ -125,7 +125,7 @@
                 app:i18nHint='@{"please_input_key_mac"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_mac_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -139,7 +139,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_mac_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_mac_tv" />
@@ -178,7 +178,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -192,7 +192,7 @@
                 app:i18nHint='@{"please_input_remark"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"lock_manage_new_lock_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"lock_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -69,7 +69,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/lock_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"lock_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/lock_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_code_tv" />
@@ -98,7 +98,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/lock_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/lock_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_nfc_tv" />
@@ -149,7 +149,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -165,7 +165,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"point_manage_add_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -51,7 +51,7 @@
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -70,7 +70,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/point_name_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -83,7 +83,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_function"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/point_name_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/point_name_tv_title"
@@ -102,7 +102,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/function_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -115,7 +115,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_power_type"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/function_tv"
                 app:layout_constraintTop_toBottomOf="@+id/function_tv"
@@ -135,7 +135,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/power_type_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_workstation"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/power_type_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/power_type_tv_title"
@@ -168,7 +168,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/workstation_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -181,7 +181,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_rfid_tag"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/workstation_tv_title"
@@ -200,7 +200,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/rfid_tag_tv_title"

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"rfid_token_manage_new_rfid_token_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"rfid_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -69,7 +69,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/rfid_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"rfid"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/rfid_code_tv" />
@@ -98,7 +98,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/rfid_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_tv"
                 app:layout_constraintTop_toBottomOf="@+id/rfid_tv" />
@@ -149,7 +149,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -165,7 +165,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"role_manage_add_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -51,7 +51,7 @@
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"role_manage_role_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -70,7 +70,7 @@
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/role_name_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -83,7 +83,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"role_manage_permission_string"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/role_name_tv"
                 app:layout_constraintTop_toBottomOf="@+id/role_name_tv"
@@ -102,7 +102,7 @@
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/role_key_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -115,7 +115,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/role_key_tv"
                 app:layout_constraintTop_toBottomOf="@+id/role_key_tv"
@@ -155,7 +155,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_role_function_permission"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -176,7 +176,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"expand_collapse"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <CheckBox
@@ -185,7 +185,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"all_select_not_all_select"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
 

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_new_user_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -70,7 +70,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/username_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"nickname"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/username_tv"
                 app:layout_constraintTop_toBottomOf="@+id/username_tv"
@@ -100,7 +100,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/nickname_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -113,7 +113,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_manage_card_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/nickname_tv"
                 app:layout_constraintTop_toBottomOf="@+id/nickname_tv" />
@@ -129,7 +129,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/card_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_manage_role"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/card_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/card_code_tv"
@@ -159,7 +159,7 @@
                 app:i18nHint='@{"please_select_role"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 android:singleLine="true"
                 android:ellipsize="end"
@@ -174,7 +174,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_manage_area"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/role_title_tv"
                 app:layout_constraintTop_toBottomOf="@+id/role_title_tv"
@@ -191,7 +191,7 @@
                 app:i18nHint='@{"please_select_area"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/workstation_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -204,7 +204,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv"
                 app:layout_constraintTop_toBottomOf="@+id/workstation_tv"

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"workstation_manage_new_workstation"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -56,7 +56,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"workstation_manage_workstation_name"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md"
                     app:markPosition="end"
                     app:required="true" />
@@ -72,7 +72,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
         </LinearLayout>

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"card_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -68,7 +68,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/card_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"username"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/card_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/card_nfc_tv" />
@@ -99,7 +99,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/username_title_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -113,7 +113,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/username_title_tv"
                 app:layout_constraintTop_toBottomOf="@+id/username_title_tv" />

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +67,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_code_tv" />
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_mac"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_nfc_tv" />
@@ -125,7 +125,7 @@
                 app:i18nHint='@{"please_input_key_mac"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_mac_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -139,7 +139,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_mac_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_mac_tv" />

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"lock_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -68,7 +68,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/lock_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"lock_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/lock_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_code_tv" />
@@ -98,7 +98,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/lock_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -112,7 +112,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/lock_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_nfc_tv" />

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

@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"filter"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -50,7 +50,7 @@
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -69,7 +69,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/point_name_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_function"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/point_name_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/point_name_tv_title"
@@ -101,7 +101,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/function_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -114,7 +114,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_power_type"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/function_tv"
                 app:layout_constraintTop_toBottomOf="@+id/function_tv"
@@ -134,7 +134,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/power_type_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -147,7 +147,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_workstation"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/power_type_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/power_type_tv_title"
@@ -167,7 +167,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/workstation_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -180,7 +180,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_rfid_tag"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/workstation_tv_title"
@@ -199,7 +199,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/rfid_tag_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"rfid_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -68,7 +68,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/rfid_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"rfid"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/rfid_code_tv" />
@@ -98,7 +98,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/rfid_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -112,7 +112,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_tv"
                 app:layout_constraintTop_toBottomOf="@+id/rfid_tv" />

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -56,7 +56,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"role_manage_role_name"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <EditText
@@ -70,7 +70,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
 
@@ -86,7 +86,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"role_manage_permission_string"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <EditText
@@ -100,7 +100,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
 
@@ -116,7 +116,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"manage_filter_status"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <RadioGroup

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -56,7 +56,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"nickname"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <EditText
@@ -70,7 +70,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
 
@@ -86,7 +86,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"user_manage_card_code"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <EditText
@@ -100,7 +100,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
 
@@ -117,7 +117,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"user_manage_area"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <EditText
@@ -131,7 +131,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
 
@@ -147,7 +147,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"manage_filter_status"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <RadioGroup

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

@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/iscs_space_3"
                 android:layout_marginTop="@dimen/iscs_space_3"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="@string/hardware_info" />
@@ -52,7 +52,7 @@
                 android:gravity="left|top"
                 app:i18nHint='@{"please_input_exception_reason"}'
                 android:padding="@dimen/selectable_input_edit_padding"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/hardware_info" />

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

@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:padding="@dimen/iscs_space_4"
             app:i18nKey='@{"point_detail"}'
-            android:textColor="?attr/colorBlack"
+            android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/iscs_text_md"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"card_manage_card_detail_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"card_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -68,7 +68,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/card_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"username"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/card_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/card_nfc_tv" />
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/username_title_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -110,7 +110,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/username_title_tv"
                 app:layout_constraintTop_toBottomOf="@+id/username_title_tv" />
@@ -149,7 +149,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -164,7 +164,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"key_manage_key_detail_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +67,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_code_tv" />
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"key_mac"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_nfc_tv" />
@@ -125,7 +125,7 @@
                 app:i18nHint='@{"please_input_key_mac"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/key_mac_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -139,7 +139,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/key_mac_tv"
                 app:layout_constraintTop_toBottomOf="@+id/key_mac_tv" />
@@ -178,7 +178,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -192,7 +192,7 @@
                 app:i18nHint='@{"please_input_remark"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"lock_manage_lock_detail_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"lock_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -68,7 +68,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/lock_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"lock_nfc"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/lock_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_code_tv" />
@@ -96,7 +96,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/lock_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -109,7 +109,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/lock_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_nfc_tv" />
@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -163,7 +163,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"point_manage_update_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -51,7 +51,7 @@
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -70,7 +70,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/point_name_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -83,7 +83,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_function"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/point_name_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/point_name_tv_title"
@@ -102,7 +102,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/function_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -115,7 +115,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_point_power_type"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/function_tv"
                 app:layout_constraintTop_toBottomOf="@+id/function_tv"
@@ -135,7 +135,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/power_type_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_workstation"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/power_type_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/power_type_tv_title"
@@ -168,7 +168,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/workstation_tv_title"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -181,7 +181,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"point_manage_rfid_tag"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv_title"
                 app:layout_constraintTop_toBottomOf="@+id/workstation_tv_title"
@@ -200,7 +200,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/rfid_tag_tv_title"

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"rfid_token_manage_rfid_token_detail_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"rfid_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -68,7 +68,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/rfid_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"rfid"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/rfid_code_tv" />
@@ -96,7 +96,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/rfid_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -109,7 +109,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_tv"
                 app:layout_constraintTop_toBottomOf="@+id/rfid_tv" />
@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"remark"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -163,7 +163,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBaseline_toBaselineOf="@+id/remark_tv"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -52,7 +52,7 @@
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"role_manage_role_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -71,7 +71,7 @@
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/role_name_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -84,7 +84,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"role_manage_permission_string"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/role_name_tv"
                 app:layout_constraintTop_toBottomOf="@+id/role_name_tv"
@@ -103,7 +103,7 @@
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/role_key_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -116,7 +116,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/role_key_tv"
                 app:layout_constraintTop_toBottomOf="@+id/role_key_tv"
@@ -156,7 +156,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_role_function_permission"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toBottomOf="@+id/status_tv" />
@@ -177,7 +177,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"expand_collapse"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
 
                 <CheckBox
@@ -186,7 +186,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"all_select_not_all_select"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
 

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_user_detail_title"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +67,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/username_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -79,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"nickname"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/username_tv"
                 app:layout_constraintTop_toBottomOf="@+id/username_tv" />
@@ -95,7 +95,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/nickname_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -108,7 +108,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_manage_card_code"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/nickname_tv"
                 app:layout_constraintTop_toBottomOf="@+id/nickname_tv" />
@@ -124,7 +124,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/card_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -137,7 +137,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_manage_role"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/card_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/card_code_tv" />
@@ -152,7 +152,7 @@
                 app:i18nHint='@{"please_select_role"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 android:singleLine="true"
                 android:ellipsize="end"
@@ -167,7 +167,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"user_manage_area"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/role_title_tv"
                 app:layout_constraintTop_toBottomOf="@+id/role_title_tv" />
@@ -182,7 +182,7 @@
                 app:i18nHint='@{"please_select_area"}'
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintBottom_toBottomOf="@+id/workstation_tv"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -195,7 +195,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
                 app:i18nKey='@{"manage_filter_status"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv"
                 app:layout_constraintTop_toBottomOf="@+id/workstation_tv" />

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

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:i18nKey='@{"workstation_manage_workstation_name"}'
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <ImageView
@@ -56,7 +56,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"workstation_manage_workstation_name"}'
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md"
                     app:markPosition="end"
                     app:required="true" />
@@ -72,7 +72,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorBlack"
+                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md" />
             </LinearLayout>
         </LinearLayout>

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

@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -26,14 +25,14 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_backup_and_restore" />
+                android:src='@{"back-up.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold"
                 app:i18nKey='@{"backup_title"}' />
@@ -46,11 +45,12 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn"
                 android:drawableLeft="@mipmap/icon_back"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                android:textColor="?attr/colorBlack"
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/common_btn_text_size"
                 app:i18nKey='@{"back"}' />
         </LinearLayout>
@@ -70,7 +70,6 @@
                 android:layout_height="0dp"
                 android:layout_margin="@dimen/iscs_space_4"
                 android:layout_weight="1"
-                android:background="@drawable/common_card_bg"
                 android:orientation="vertical">
 
                 <LinearLayout
@@ -83,7 +82,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_25"
                         android:textStyle="bold"
                         app:i18nKey='@{"backup"}' />
@@ -104,7 +103,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"backup_now"}' />
                 </LinearLayout>
@@ -124,7 +123,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_path"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -141,7 +140,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/backup_path_tv"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -152,7 +151,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"maximum_number_of_backups"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -169,7 +168,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/maximum_number_of_backups_tv"
                         app:layout_constraintEnd_toStartOf="@+id/maximum_number_of_backups_range"
@@ -180,7 +179,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nArg0='@{"5-20"}'
                         app:i18nKey='@{"backup_range"}'
@@ -193,7 +192,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"auto_backup"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -214,6 +213,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/iscs_space_3"
                             android:textSize="@dimen/iscs_text_md"
+                            android:textColor="?attr/colorTextPrimary"
                             app:i18nKey='@{"common_enable"}' />
 
                         <RadioButton
@@ -222,6 +222,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/iscs_space_3"
                             android:textSize="@dimen/iscs_text_md"
+                            android:textColor="?attr/colorTextPrimary"
                             app:i18nKey='@{"common_disable"}' />
                     </RadioGroup>
 
@@ -230,7 +231,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_frequency"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -247,7 +248,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/backup_frequency_tv"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -259,7 +260,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_frequency"}'
                         app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -275,7 +276,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="2dp"
                         android:singleLine="true"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintBottom_toBottomOf="@+id/backup_time_tv"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -314,7 +315,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"save"}'
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -327,7 +328,6 @@
                 android:layout_height="0dp"
                 android:layout_margin="@dimen/iscs_space_4"
                 android:layout_weight="1"
-                android:background="@drawable/common_card_bg"
                 android:orientation="vertical">
 
                 <LinearLayout
@@ -340,7 +340,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/normal_text_size_25"
                         android:textStyle="bold"
                         app:i18nKey='@{"restore"}' />
@@ -359,7 +359,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"common_batch_export"}' />
 
@@ -374,7 +374,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
-                        android:textColor="?attr/colorBlack"
+                        android:textColor="?attr/colorTextPrimary"
                         android:textSize="@dimen/common_btn_text_size"
                         app:i18nKey='@{"common_batch_delete"}' />
                 </LinearLayout>
@@ -396,10 +396,9 @@
 
                     <CheckBox
                         android:id="@+id/select_all"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_gravity="center"
-                        android:layout_margin="@dimen/iscs_space_3" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center" />
 
                     <TextView
                         android:layout_width="0dp"
@@ -407,6 +406,7 @@
                         android:layout_weight="2"
                         android:gravity="center"
                         android:textSize="@dimen/iscs_text_md"
+                        android:textColor="?attr/colorTextPrimary"
                         app:i18nKey='@{"backup"}' />
 
                     <TextView
@@ -415,6 +415,7 @@
                         android:layout_weight="1"
                         android:gravity="center"
                         android:textSize="@dimen/iscs_text_md"
+                        android:textColor="?attr/colorTextPrimary"
                         app:i18nKey='@{"operation"}' />
                 </LinearLayout>
 
@@ -423,8 +424,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginHorizontal="@dimen/iscs_space_4"
-                    android:layout_marginBottom="@dimen/iscs_space_3"
-                    android:background="@drawable/common_card_bg">
+                    android:background="@drawable/common_card_bg"
+                    android:layout_marginBottom="@dimen/iscs_space_3">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/list_rv"