diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-05-10 19:21:39 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 19:21:39 +0530 |
| commit | 041cf00510a75042223d1857660fc7f1dff958ef (patch) | |
| tree | 1b56e67e2b71afe23ac51b680b62ad778272f162 /app/src/main/res | |
| parent | 94dc92f8d70870b57a7f8c4fe8adef152c1211ce (diff) | |
Treewide codestyle cleanup (#765)
- Updated gitignore and checked in the IDE's codestyle config
- Removed spotless as the underlying ktlint backend has failed to resolve the super frustrating import order bug[1] in nearly a year
- Reformat the entire codebase based on the previously committed code style configuration.
1: https://github.com/pinterest/ktlint/issues/527
Diffstat (limited to 'app/src/main/res')
72 files changed, 474 insertions, 458 deletions
diff --git a/app/src/main/res/anim/scale_down.xml b/app/src/main/res/anim/scale_down.xml index b6ece430..3d574180 100644 --- a/app/src/main/res/anim/scale_down.xml +++ b/app/src/main/res/anim/scale_down.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" > +<set xmlns:android="http://schemas.android.com/apk/res/android"> <scale android:duration="300" android:fromXScale="1.0" diff --git a/app/src/main/res/anim/scale_up.xml b/app/src/main/res/anim/scale_up.xml index 07dd5787..e429b8bf 100644 --- a/app/src/main/res/anim/scale_up.xml +++ b/app/src/main/res/anim/scale_up.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" > +<set xmlns:android="http://schemas.android.com/apk/res/android"> <scale android:duration="300" android:fromXScale="0" diff --git a/app/src/main/res/color/toggle_button_selector.xml b/app/src/main/res/color/toggle_button_selector.xml index cb4de6a7..31dde915 100644 --- a/app/src/main/res/color/toggle_button_selector.xml +++ b/app/src/main/res/color/toggle_button_selector.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_checked="false" - android:color="#00FFFFFF" /> + <item android:color="#00FFFFFF" android:state_checked="false" /> <item android:color="@color/button_color" /> </selector> diff --git a/app/src/main/res/drawable/ic_action_new_folder.xml b/app/src/main/res/drawable/ic_action_new_folder.xml index 44666001..99e306a0 100644 --- a/app/src/main/res/drawable/ic_action_new_folder.xml +++ b/app/src/main/res/drawable/ic_action_new_folder.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0,0 0,4 20H20A2,2 0,0 0,22 18V8C22,6.89 21.1,6 20,6Z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0,0 0,4 20H20A2,2 0,0 0,22 18V8C22,6.89 21.1,6 20,6Z" /> </vector> diff --git a/app/src/main/res/drawable/ic_action_new_password.xml b/app/src/main/res/drawable/ic_action_new_password.xml index 38350bd3..4ccd0dc9 100644 --- a/app/src/main/res/drawable/ic_action_new_password.xml +++ b/app/src/main/res/drawable/ic_action_new_password.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M14,2H6A2,2 0,0 0,4 4V20A2,2 0,0 0,6 22H18A2,2 0,0 0,20 20V8L14,2M18,20H6V4H13V9H18M12.83,15A3,3 0,1 0,12.83 17H14V19H16V17H17V15M10,17A1,1 0,1 1,11 16A1,1 0,0 1,10 17Z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M14,2H6A2,2 0,0 0,4 4V20A2,2 0,0 0,6 22H18A2,2 0,0 0,20 20V8L14,2M18,20H6V4H13V9H18M12.83,15A3,3 0,1 0,12.83 17H14V19H16V17H17V15M10,17A1,1 0,1 1,11 16A1,1 0,0 1,10 17Z" /> </vector> diff --git a/app/src/main/res/drawable/ic_action_secure_24dp.xml b/app/src/main/res/drawable/ic_action_secure_24dp.xml index ec7b4c21..8d6bfabf 100644 --- a/app/src/main/res/drawable/ic_action_secure_24dp.xml +++ b/app/src/main/res/drawable/ic_action_secure_24dp.xml @@ -1,10 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorOnPrimary" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?attr/colorOnPrimary"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/> + android:viewportHeight="24"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z" /> </vector> diff --git a/app/src/main/res/drawable/ic_add_white_48dp.xml b/app/src/main/res/drawable/ic_add_white_48dp.xml index fe734cc1..76c77217 100644 --- a/app/src/main/res/drawable/ic_add_white_48dp.xml +++ b/app/src/main/res/drawable/ic_add_white_48dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> </vector> diff --git a/app/src/main/res/drawable/ic_autofill_new_password.xml b/app/src/main/res/drawable/ic_autofill_new_password.xml index 958de190..e4426a93 100644 --- a/app/src/main/res/drawable/ic_autofill_new_password.xml +++ b/app/src/main/res/drawable/ic_autofill_new_password.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FF000000" - android:pathData="M14,2H6A2,2 0,0 0,4 4V20A2,2 0,0 0,6 22H18A2,2 0,0 0,20 20V8L14,2M18,20H6V4H13V9H18M12.83,15A3,3 0,1 0,12.83 17H14V19H16V17H17V15M10,17A1,1 0,1 1,11 16A1,1 0,0 1,10 17Z"/> + <path + android:fillColor="#FF000000" + android:pathData="M14,2H6A2,2 0,0 0,4 4V20A2,2 0,0 0,6 22H18A2,2 0,0 0,20 20V8L14,2M18,20H6V4H13V9H18M12.83,15A3,3 0,1 0,12.83 17H14V19H16V17H17V15M10,17A1,1 0,1 1,11 16A1,1 0,0 1,10 17Z" /> </vector> diff --git a/app/src/main/res/drawable/ic_clear_white_24dp.xml b/app/src/main/res/drawable/ic_clear_white_24dp.xml index 24b2e1c6..644238d0 100644 --- a/app/src/main/res/drawable/ic_clear_white_24dp.xml +++ b/app/src/main/res/drawable/ic_clear_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15.59,7L12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 17,8.41z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15.59,7L12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 17,8.41z" /> </vector> diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml index 1c426554..a4ef6408 100644 --- a/app/src/main/res/drawable/ic_content_copy.xml +++ b/app/src/main/res/drawable/ic_content_copy.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FF000000" - android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z"/> + <path + android:fillColor="#FF000000" + android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z" /> </vector> diff --git a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml index 45a8b864..ecae410f 100644 --- a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml +++ b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z" /> </vector> diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml index 2ca348f9..869f6347 100644 --- a/app/src/main/res/drawable/ic_delete_white_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" /> </vector> diff --git a/app/src/main/res/drawable/ic_done_white_24dp.xml b/app/src/main/res/drawable/ic_done_white_24dp.xml index 1f17bd43..436553a0 100644 --- a/app/src/main/res/drawable/ic_done_white_24dp.xml +++ b/app/src/main/res/drawable/ic_done_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" /> </vector> diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml index 7f32de65..a0af4c84 100644 --- a/app/src/main/res/drawable/ic_edit_white_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z" /> </vector> diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml index ede2c488..2a2bfe9b 100644 --- a/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml @@ -1,10 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorOnPrimary" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?attr/colorOnPrimary"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/> + android:viewportHeight="24"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z" /> </vector> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 4072a948..037467fb 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -3,23 +3,24 @@ android:height="108dp" android:viewportWidth="110.34687" android:viewportHeight="110.34687"> - <group android:translateX="24.828047" - android:translateY="24.828047"> - <path - android:pathData="m18.8,30.2129v-11.546c0,-6.4144 5.1315,-11.546 11.546,-11.546 6.4144,0 11.546,5.1315 11.546,11.546v11.546" - android:strokeWidth="5.349" - android:fillColor="#00000000" - android:strokeColor="#013e5b"/> - <path - android:pathData="M15.4099,21.8429L45.2811,21.8429A2.2639,2.2639 0,0 1,47.545 24.1068L47.545,53.977A2.2639,2.2639 0,0 1,45.2811 56.2409L15.4099,56.2409A2.2639,2.2639 0,0 1,13.146 53.977L13.146,24.1068A2.2639,2.2639 0,0 1,15.4099 21.8429z" - android:fillColor="#00c7a0"/> - <path - android:pathData="m44.8267,37.6961 l-13.1408,-13.1393c-0.7569,-0.7566 -1.9838,-0.7566 -2.7408,0l-13.08,13.0785c-0.7567,0.7573 -0.7567,1.9846 0,2.7419l13.1415,13.14c0.7572,0.7567 1.9842,0.7567 2.7414,0l13.0778,-13.0785c0.7572,-0.7572 0.7572,-1.9849 0,-2.7421" - android:strokeWidth=".35344" - android:fillColor="#fff"/> - <path - android:pathData="m30.3156,23.9881c-0.496,0 -0.992,0.1893 -1.3705,0.5676l-2.7282,2.7288 3.4612,3.4606c0.8044,-0.2715 1.727,-0.0892 2.368,0.5517 0.6237,0.624 0.8361,1.5493 0.5471,2.3828l3.3357,3.3357c0.8076,-0.2777 1.738,-0.098 2.3828,0.5476 0.9008,0.9005 0.9008,2.361 0,3.2615 -1.7823,1.7848 -4.7253,-0.1767 -3.7641,-2.5087l-3.1111,-3.1106c-2.2315,0.5285 -3.8934,-1.2655 -3.149,-3.1674l-0.6863,-0.6863l0,15.9165l5.4913,0l0,-5.8608c-0.0315,-0.7566 1.1201,-0.7566 1.0886,0l0,6.4043c0.0005,0.3013 -0.2438,0.5457 -0.545,0.5455l-6.5804,0c-0.3015,0.0005 -0.546,-0.2441 -0.5456,-0.5455l0,-17.4333c-0.0005,-0.0363 0.0029,-0.0728 0.0097,-0.1085l-1.6444,-1.6444 -9.0106,9.0084c-0.7567,0.7573 -0.7567,1.9848 0,2.7421l13.1415,13.14c0.7572,0.7567 1.9844,0.7567 2.7416,0l13.0778,-13.0785c0.7572,-0.7572 0.7572,-1.9849 0,-2.7421l-13.14,-13.1393c-0.3785,-0.3783 -0.8746,-0.5676 -1.3705,-0.5676zM29.9512,39.1825c0.1001,0 0.1808,0.0381 0.2426,0.1146 0.0648,0.0736 0.1326,0.1975 0.2032,0.371 0.0705,0.1706 0.1089,0.2615 0.1146,0.2733 0.0059,-0.0119 0.0424,-0.1026 0.11,-0.2733 0.0707,-0.1705 0.1401,-0.2946 0.2078,-0.371 0.0677,-0.0765 0.1513,-0.1146 0.2513,-0.1146 0.1412,0 0.2646,0.047 0.3705,0.1412 0.1059,0.0941 0.1592,0.2103 0.1592,0.3485 0,0.0676 -0.0179,0.1368 -0.0532,0.2073 -0.0323,0.0707 -0.0777,0.1444 -0.1366,0.2211 -0.056,0.0734 -0.1164,0.1571 -0.1812,0.2513 0.0648,-0.0089 0.1589,-0.0251 0.2825,-0.0486 0.1265,-0.0236 0.2268,-0.0354 0.3004,-0.0354 0.0969,0 0.1762,0.0224 0.238,0.0666 0.0648,0.0442 0.1118,0.1042 0.1413,0.1807 0.0294,0.0734 0.044,0.1544 0.044,0.2426 0,0.1384 -0.0337,0.2544 -0.1013,0.3485 -0.0677,0.0912 -0.1749,0.1372 -0.3219,0.1372 -0.0472,0 -0.14,-0.0119 -0.2784,-0.0354 -0.1382,-0.0236 -0.2397,-0.0386 -0.3045,-0.0446 0.1531,0.2177 0.2534,0.3652 0.3004,0.4417 0.047,0.0736 0.0706,0.1544 0.0706,0.2426 0,0.1412 -0.0533,0.2556 -0.1592,0.3439 -0.1028,0.0853 -0.2264,0.1279 -0.3705,0.1279 -0.1028,0 -0.1882,-0.0366 -0.2559,-0.11 -0.0646,-0.0767 -0.1309,-0.1955 -0.1986,-0.3572 -0.0646,-0.1647 -0.1028,-0.259 -0.1146,-0.2825 -0.0117,0.0235 -0.0516,0.1178 -0.1192,0.2825 -0.0648,0.1646 -0.1281,0.2836 -0.1899,0.3572 -0.0617,0.0735 -0.1454,0.11 -0.2513,0.11 -0.15,0 -0.2779,-0.0427 -0.3838,-0.1279 -0.1059,-0.0883 -0.1587,-0.2027 -0.1587,-0.3439 0,-0.0618 0.0156,-0.1263 0.0481,-0.194 0.0323,-0.0707 0.0665,-0.1311 0.1018,-0.1812 0.0382,-0.0499 0.1118,-0.1532 0.2206,-0.3091 -0.0736,0.0059 -0.1751,0.021 -0.3045,0.0446 -0.1294,0.0236 -0.2176,0.0354 -0.2646,0.0354 -0.1472,0 -0.2577,-0.046 -0.3311,-0.1372 -0.0707,-0.0941 -0.1059,-0.2101 -0.1059,-0.3485 0,-0.1411 0.0352,-0.2573 0.1059,-0.3485 0.0734,-0.0942 0.184,-0.1412 0.3311,-0.1412 0.0736,0 0.1628,0.0107 0.2687,0.0312 0.1059,0.0206 0.2062,0.038 0.3004,0.0527 -0.0824,-0.1177 -0.1648,-0.2366 -0.2472,-0.3572 -0.0824,-0.1206 -0.1233,-0.2282 -0.1233,-0.3224 0,-0.1382 0.0543,-0.2544 0.1633,-0.3485 0.1088,-0.0942 0.2351,-0.1412 0.3792,-0.1412zM29.9512,43.2235c0.1001,0 0.1808,0.0383 0.2426,0.1146 0.0648,0.0735 0.1326,0.197 0.2032,0.3705 0.0705,0.1707 0.1089,0.262 0.1146,0.2738 0.0059,-0.0119 0.0424,-0.1031 0.11,-0.2738 0.0707,-0.1705 0.1401,-0.2941 0.2078,-0.3705 0.0677,-0.0765 0.1513,-0.1146 0.2513,-0.1146 0.1412,0 0.2646,0.047 0.3705,0.1412 0.1059,0.0941 0.1592,0.2102 0.1592,0.3485 0,0.0675 -0.0179,0.1366 -0.0532,0.2073 -0.0323,0.0705 -0.0777,0.1441 -0.1366,0.2206 -0.056,0.0735 -0.1164,0.1576 -0.1812,0.2518 0.0648,-0.0089 0.1589,-0.0251 0.2825,-0.0486 0.1265,-0.0236 0.2268,-0.0353 0.3004,-0.0353 0.0969,0 0.1762,0.0219 0.238,0.0661 0.0648,0.0442 0.1118,0.1047 0.1413,0.1812 0.0294,0.0736 0.044,0.1542 0.044,0.2426 0,0.1382 -0.0337,0.2544 -0.1013,0.3485 -0.0677,0.0912 -0.1749,0.1366 -0.3219,0.1366 -0.0472,0 -0.14,-0.0119 -0.2784,-0.0354 -0.1382,-0.0236 -0.2397,-0.038 -0.3045,-0.044 0.1531,0.2177 0.2534,0.3647 0.3004,0.4411 0.047,0.0736 0.0706,0.1549 0.0706,0.2431 0,0.1411 -0.0533,0.2558 -0.1592,0.3439 -0.1028,0.0854 -0.2264,0.1279 -0.3705,0.1279 -0.1028,0 -0.1882,-0.0371 -0.2559,-0.1105 -0.0646,-0.0765 -0.1309,-0.1955 -0.1986,-0.3572 -0.0646,-0.1647 -0.1028,-0.259 -0.1146,-0.2825 -0.0117,0.0236 -0.0516,0.1178 -0.1192,0.2825 -0.0648,0.1648 -0.1281,0.2836 -0.1899,0.3572 -0.0617,0.0735 -0.1454,0.1105 -0.2513,0.1105 -0.15,0 -0.2779,-0.0425 -0.3838,-0.1279 -0.1059,-0.0881 -0.1587,-0.2028 -0.1587,-0.3439 0,-0.0617 0.0156,-0.1268 0.0481,-0.1945 0.0323,-0.0705 0.0665,-0.1311 0.1018,-0.1812 0.0382,-0.0499 0.1118,-0.1527 0.2206,-0.3086 -0.0736,0.0059 -0.1751,0.0205 -0.3045,0.044 -0.1294,0.0236 -0.2176,0.0354 -0.2646,0.0354 -0.1472,0 -0.2577,-0.0454 -0.3311,-0.1366 -0.0707,-0.0941 -0.1059,-0.2103 -0.1059,-0.3485 0,-0.1412 0.0352,-0.2573 0.1059,-0.3485 0.0734,-0.0942 0.184,-0.1412 0.3311,-0.1412 0.0736,0 0.1628,0.0101 0.2687,0.0307 0.1059,0.0204 0.2062,0.0384 0.3004,0.0532 -0.0824,-0.1177 -0.1648,-0.2371 -0.2472,-0.3577 -0.0824,-0.1206 -0.1233,-0.2278 -0.1233,-0.3219 0,-0.1384 0.0543,-0.2544 0.1633,-0.3485 0.1088,-0.0942 0.2351,-0.1412 0.3792,-0.1412z" - android:strokeWidth="1.3358" - android:fillColor="#3bdbbc"/> + <group + android:translateX="24.828047" + android:translateY="24.828047"> + <path + android:fillColor="#00000000" + android:pathData="m18.8,30.2129v-11.546c0,-6.4144 5.1315,-11.546 11.546,-11.546 6.4144,0 11.546,5.1315 11.546,11.546v11.546" + android:strokeWidth="5.349" + android:strokeColor="#013e5b" /> + <path + android:fillColor="#00c7a0" + android:pathData="M15.4099,21.8429L45.2811,21.8429A2.2639,2.2639 0,0 1,47.545 24.1068L47.545,53.977A2.2639,2.2639 0,0 1,45.2811 56.2409L15.4099,56.2409A2.2639,2.2639 0,0 1,13.146 53.977L13.146,24.1068A2.2639,2.2639 0,0 1,15.4099 21.8429z" /> + <path + android:fillColor="#fff" + android:pathData="m44.8267,37.6961 l-13.1408,-13.1393c-0.7569,-0.7566 -1.9838,-0.7566 -2.7408,0l-13.08,13.0785c-0.7567,0.7573 -0.7567,1.9846 0,2.7419l13.1415,13.14c0.7572,0.7567 1.9842,0.7567 2.7414,0l13.0778,-13.0785c0.7572,-0.7572 0.7572,-1.9849 0,-2.7421" + android:strokeWidth=".35344" /> + <path + android:fillColor="#3bdbbc" + android:pathData="m30.3156,23.9881c-0.496,0 -0.992,0.1893 -1.3705,0.5676l-2.7282,2.7288 3.4612,3.4606c0.8044,-0.2715 1.727,-0.0892 2.368,0.5517 0.6237,0.624 0.8361,1.5493 0.5471,2.3828l3.3357,3.3357c0.8076,-0.2777 1.738,-0.098 2.3828,0.5476 0.9008,0.9005 0.9008,2.361 0,3.2615 -1.7823,1.7848 -4.7253,-0.1767 -3.7641,-2.5087l-3.1111,-3.1106c-2.2315,0.5285 -3.8934,-1.2655 -3.149,-3.1674l-0.6863,-0.6863l0,15.9165l5.4913,0l0,-5.8608c-0.0315,-0.7566 1.1201,-0.7566 1.0886,0l0,6.4043c0.0005,0.3013 -0.2438,0.5457 -0.545,0.5455l-6.5804,0c-0.3015,0.0005 -0.546,-0.2441 -0.5456,-0.5455l0,-17.4333c-0.0005,-0.0363 0.0029,-0.0728 0.0097,-0.1085l-1.6444,-1.6444 -9.0106,9.0084c-0.7567,0.7573 -0.7567,1.9848 0,2.7421l13.1415,13.14c0.7572,0.7567 1.9844,0.7567 2.7416,0l13.0778,-13.0785c0.7572,-0.7572 0.7572,-1.9849 0,-2.7421l-13.14,-13.1393c-0.3785,-0.3783 -0.8746,-0.5676 -1.3705,-0.5676zM29.9512,39.1825c0.1001,0 0.1808,0.0381 0.2426,0.1146 0.0648,0.0736 0.1326,0.1975 0.2032,0.371 0.0705,0.1706 0.1089,0.2615 0.1146,0.2733 0.0059,-0.0119 0.0424,-0.1026 0.11,-0.2733 0.0707,-0.1705 0.1401,-0.2946 0.2078,-0.371 0.0677,-0.0765 0.1513,-0.1146 0.2513,-0.1146 0.1412,0 0.2646,0.047 0.3705,0.1412 0.1059,0.0941 0.1592,0.2103 0.1592,0.3485 0,0.0676 -0.0179,0.1368 -0.0532,0.2073 -0.0323,0.0707 -0.0777,0.1444 -0.1366,0.2211 -0.056,0.0734 -0.1164,0.1571 -0.1812,0.2513 0.0648,-0.0089 0.1589,-0.0251 0.2825,-0.0486 0.1265,-0.0236 0.2268,-0.0354 0.3004,-0.0354 0.0969,0 0.1762,0.0224 0.238,0.0666 0.0648,0.0442 0.1118,0.1042 0.1413,0.1807 0.0294,0.0734 0.044,0.1544 0.044,0.2426 0,0.1384 -0.0337,0.2544 -0.1013,0.3485 -0.0677,0.0912 -0.1749,0.1372 -0.3219,0.1372 -0.0472,0 -0.14,-0.0119 -0.2784,-0.0354 -0.1382,-0.0236 -0.2397,-0.0386 -0.3045,-0.0446 0.1531,0.2177 0.2534,0.3652 0.3004,0.4417 0.047,0.0736 0.0706,0.1544 0.0706,0.2426 0,0.1412 -0.0533,0.2556 -0.1592,0.3439 -0.1028,0.0853 -0.2264,0.1279 -0.3705,0.1279 -0.1028,0 -0.1882,-0.0366 -0.2559,-0.11 -0.0646,-0.0767 -0.1309,-0.1955 -0.1986,-0.3572 -0.0646,-0.1647 -0.1028,-0.259 -0.1146,-0.2825 -0.0117,0.0235 -0.0516,0.1178 -0.1192,0.2825 -0.0648,0.1646 -0.1281,0.2836 -0.1899,0.3572 -0.0617,0.0735 -0.1454,0.11 -0.2513,0.11 -0.15,0 -0.2779,-0.0427 -0.3838,-0.1279 -0.1059,-0.0883 -0.1587,-0.2027 -0.1587,-0.3439 0,-0.0618 0.0156,-0.1263 0.0481,-0.194 0.0323,-0.0707 0.0665,-0.1311 0.1018,-0.1812 0.0382,-0.0499 0.1118,-0.1532 0.2206,-0.3091 -0.0736,0.0059 -0.1751,0.021 -0.3045,0.0446 -0.1294,0.0236 -0.2176,0.0354 -0.2646,0.0354 -0.1472,0 -0.2577,-0.046 -0.3311,-0.1372 -0.0707,-0.0941 -0.1059,-0.2101 -0.1059,-0.3485 0,-0.1411 0.0352,-0.2573 0.1059,-0.3485 0.0734,-0.0942 0.184,-0.1412 0.3311,-0.1412 0.0736,0 0.1628,0.0107 0.2687,0.0312 0.1059,0.0206 0.2062,0.038 0.3004,0.0527 -0.0824,-0.1177 -0.1648,-0.2366 -0.2472,-0.3572 -0.0824,-0.1206 -0.1233,-0.2282 -0.1233,-0.3224 0,-0.1382 0.0543,-0.2544 0.1633,-0.3485 0.1088,-0.0942 0.2351,-0.1412 0.3792,-0.1412zM29.9512,43.2235c0.1001,0 0.1808,0.0383 0.2426,0.1146 0.0648,0.0735 0.1326,0.197 0.2032,0.3705 0.0705,0.1707 0.1089,0.262 0.1146,0.2738 0.0059,-0.0119 0.0424,-0.1031 0.11,-0.2738 0.0707,-0.1705 0.1401,-0.2941 0.2078,-0.3705 0.0677,-0.0765 0.1513,-0.1146 0.2513,-0.1146 0.1412,0 0.2646,0.047 0.3705,0.1412 0.1059,0.0941 0.1592,0.2102 0.1592,0.3485 0,0.0675 -0.0179,0.1366 -0.0532,0.2073 -0.0323,0.0705 -0.0777,0.1441 -0.1366,0.2206 -0.056,0.0735 -0.1164,0.1576 -0.1812,0.2518 0.0648,-0.0089 0.1589,-0.0251 0.2825,-0.0486 0.1265,-0.0236 0.2268,-0.0353 0.3004,-0.0353 0.0969,0 0.1762,0.0219 0.238,0.0661 0.0648,0.0442 0.1118,0.1047 0.1413,0.1812 0.0294,0.0736 0.044,0.1542 0.044,0.2426 0,0.1382 -0.0337,0.2544 -0.1013,0.3485 -0.0677,0.0912 -0.1749,0.1366 -0.3219,0.1366 -0.0472,0 -0.14,-0.0119 -0.2784,-0.0354 -0.1382,-0.0236 -0.2397,-0.038 -0.3045,-0.044 0.1531,0.2177 0.2534,0.3647 0.3004,0.4411 0.047,0.0736 0.0706,0.1549 0.0706,0.2431 0,0.1411 -0.0533,0.2558 -0.1592,0.3439 -0.1028,0.0854 -0.2264,0.1279 -0.3705,0.1279 -0.1028,0 -0.1882,-0.0371 -0.2559,-0.1105 -0.0646,-0.0765 -0.1309,-0.1955 -0.1986,-0.3572 -0.0646,-0.1647 -0.1028,-0.259 -0.1146,-0.2825 -0.0117,0.0236 -0.0516,0.1178 -0.1192,0.2825 -0.0648,0.1648 -0.1281,0.2836 -0.1899,0.3572 -0.0617,0.0735 -0.1454,0.1105 -0.2513,0.1105 -0.15,0 -0.2779,-0.0425 -0.3838,-0.1279 -0.1059,-0.0881 -0.1587,-0.2028 -0.1587,-0.3439 0,-0.0617 0.0156,-0.1268 0.0481,-0.1945 0.0323,-0.0705 0.0665,-0.1311 0.1018,-0.1812 0.0382,-0.0499 0.1118,-0.1527 0.2206,-0.3086 -0.0736,0.0059 -0.1751,0.0205 -0.3045,0.044 -0.1294,0.0236 -0.2176,0.0354 -0.2646,0.0354 -0.1472,0 -0.2577,-0.0454 -0.3311,-0.1366 -0.0707,-0.0941 -0.1059,-0.2103 -0.1059,-0.3485 0,-0.1412 0.0352,-0.2573 0.1059,-0.3485 0.0734,-0.0942 0.184,-0.1412 0.3311,-0.1412 0.0736,0 0.1628,0.0101 0.2687,0.0307 0.1059,0.0204 0.2062,0.0384 0.3004,0.0532 -0.0824,-0.1177 -0.1648,-0.2371 -0.2472,-0.3577 -0.0824,-0.1206 -0.1233,-0.2278 -0.1233,-0.3219 0,-0.1384 0.0543,-0.2544 0.1633,-0.3485 0.1088,-0.0942 0.2351,-0.1412 0.3792,-0.1412z" + android:strokeWidth="1.3358" /> </group> </vector> diff --git a/app/src/main/res/drawable/ic_move_folder_white_24dp.xml b/app/src/main/res/drawable/ic_move_folder_white_24dp.xml index 2849e158..dcc65e6b 100644 --- a/app/src/main/res/drawable/ic_move_folder_white_24dp.xml +++ b/app/src/main/res/drawable/ic_move_folder_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M20,6L12,6L10,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,8A2,2 0,0 0,20 6ZM20,18L4,18L4,8L20,8ZM13,12L7,12v2h6v2l4,-3 -4,-3Z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M20,6L12,6L10,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,8A2,2 0,0 0,20 6ZM20,18L4,18L4,8L20,8ZM13,12L7,12v2h6v2l4,-3 -4,-3Z" /> </vector> diff --git a/app/src/main/res/drawable/ic_multiple_files_24dp.xml b/app/src/main/res/drawable/ic_multiple_files_24dp.xml index a504b9cc..1894abbf 100644 --- a/app/src/main/res/drawable/ic_multiple_files_24dp.xml +++ b/app/src/main/res/drawable/ic_multiple_files_24dp.xml @@ -1,10 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?colorOnPrimary" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?colorOnPrimary"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z"/> + android:viewportHeight="24"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5L8,5c-1.1,0 -1.99,0.9 -1.99,2L6,21c0,1.1 0.89,2 1.99,2L19,23c1.1,0 2,-0.9 2,-2L21,11l-6,-6zM8,21L8,7h6v5h5v9L8,21z" /> </vector> diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml index b2cb337b..55495d5a 100644 --- a/app/src/main/res/drawable/ic_person_black_24dp.xml +++ b/app/src/main/res/drawable/ic_person_black_24dp.xml @@ -1,9 +1,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> <path android:fillColor="#FF000000" - android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/> + android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" /> </vector> diff --git a/app/src/main/res/drawable/ic_save_copy_white_24dp.xml b/app/src/main/res/drawable/ic_save_copy_white_24dp.xml index 53465e16..224ffd6b 100644 --- a/app/src/main/res/drawable/ic_save_copy_white_24dp.xml +++ b/app/src/main/res/drawable/ic_save_copy_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M19,5L7,5A2,2 0,0 0,5 7L5,21a2,2 0,0 0,2 2L21,23a2,2 0,0 0,2 -2L23,9ZM21,21L7,21L7,7L18.17,7L21,9.83ZM14,14a3,3 0,1 0,3 3A3,3 0,0 0,14 14ZM8,8h9v4L8,12ZM15,1L3,1A2,2 0,0 0,1 3L1,17L3,17L3,3L15,3Z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M19,5L7,5A2,2 0,0 0,5 7L5,21a2,2 0,0 0,2 2L21,23a2,2 0,0 0,2 -2L23,9ZM21,21L7,21L7,7L18.17,7L21,9.83ZM14,14a3,3 0,1 0,3 3A3,3 0,0 0,14 14ZM8,8h9v4L8,12ZM15,1L3,1A2,2 0,0 0,1 3L1,17L3,17L3,3L15,3Z" /> </vector> diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml index cac6eef4..721f1629 100644 --- a/app/src/main/res/drawable/ic_save_white_24dp.xml +++ b/app/src/main/res/drawable/ic_save_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM19,19L5,19L5,5h11.17L19,7.83L19,19zM12,12c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3zM6,6h9v4L6,10z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM19,19L5,19L5,5h11.17L19,7.83L19,19zM12,12c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3zM6,6h9v4L6,10z" /> </vector> diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search_black_24dp.xml index affc7ba2..d23ea57f 100644 --- a/app/src/main/res/drawable/ic_search_black_24dp.xml +++ b/app/src/main/res/drawable/ic_search_black_24dp.xml @@ -1,9 +1,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> <path android:fillColor="#FF000000" - android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> + android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" /> </vector> diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_white_24dp.xml index 6a5ca808..54f8c20e 100644 --- a/app/src/main/res/drawable/ic_search_white_24dp.xml +++ b/app/src/main/res/drawable/ic_search_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" /> </vector> diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml index cbe3d4aa..e22fc850 100644 --- a/app/src/main/res/drawable/ic_share_white_24dp.xml +++ b/app/src/main/res/drawable/ic_share_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" /> </vector> diff --git a/app/src/main/res/drawable/ic_warning_red_24dp.xml b/app/src/main/res/drawable/ic_warning_red_24dp.xml index cea44306..6b60ad67 100644 --- a/app/src/main/res/drawable/ic_warning_red_24dp.xml +++ b/app/src/main/res/drawable/ic_warning_red_24dp.xml @@ -1,9 +1,9 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> <path android:fillColor="#FFFF0000" - android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/> + android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" /> </vector> diff --git a/app/src/main/res/drawable/password_row_background.xml b/app/src/main/res/drawable/password_row_background.xml index 51f14173..c7fb2949 100644 --- a/app/src/main/res/drawable/password_row_background.xml +++ b/app/src/main/res/drawable/password_row_background.xml @@ -1,14 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- Requires a layer-list since attributes cannot be resolved in selectors, see: https://stackoverflow.com/a/36424426/297261 --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> -<item> - <selector> - <item android:drawable="@color/list_multiselect_background" android:state_selected="true" /> - <item android:drawable="@android:color/transparent"/> - </selector> -</item> -<item android:drawable="?android:attr/selectableItemBackground"/> + <item> + <selector> + <item + android:drawable="@color/list_multiselect_background" + android:state_selected="true" /> + <item android:drawable="@android:color/transparent" /> + </selector> + </item> + <item android:drawable="?android:attr/selectableItemBackground" /> </layer-list> diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index d4113cd6..9249ffbf 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -3,44 +3,44 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?android:attr/windowBackground" android:padding="@dimen/activity_horizontal_margin" - tools:context="com.zeapo.pwdstore.git.GitOperationActivity" - android:background="?android:attr/windowBackground"> + tools:context="com.zeapo.pwdstore.git.GitOperationActivity"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"> <androidx.appcompat.widget.AppCompatTextView - style="@style/TextAppearance.MaterialComponents.Headline5" android:id="@+id/server_label" - android:textStyle="bold" - android:textSize="24sp" - android:text="@string/server_name" + style="@style/TextAppearance.MaterialComponents.Headline5" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" + android:text="@string/server_name" + android:textSize="24sp" + android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <androidx.appcompat.widget.AppCompatTextView - style="@style/TextAppearance.MaterialComponents.Headline6" android:id="@+id/label_server_protocol" + style="@style/TextAppearance.MaterialComponents.Headline6" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/server_protocol" android:layout_margin="8dp" - app:layout_constraintTop_toBottomOf="@id/server_label" - app:layout_constraintStart_toStartOf="parent" /> + android:text="@string/server_protocol" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/server_label" /> <com.google.android.material.button.MaterialButtonToggleGroup - style="@style/TextAppearance.MaterialComponents.Headline1" android:id="@+id/clone_protocol_group" + style="@style/TextAppearance.MaterialComponents.Headline1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - app:layout_constraintTop_toBottomOf="@id/label_server_protocol" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_server_protocol" app:selectionRequired="true" app:singleSelection="true"> @@ -61,11 +61,12 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_user_layout" - android:hint="@string/server_user" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" + android:hint="@string/server_user" app:layout_constraintTop_toBottomOf="@id/clone_protocol_group"> + <com.google.android.material.textfield.TextInputEditText android:id="@+id/server_user" android:layout_width="match_parent" @@ -79,14 +80,14 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:hint="@string/server_url" - app:layout_constraintTop_toBottomOf="@id/server_user_layout" + app:layout_constraintEnd_toStartOf="@id/label_server_port" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/label_server_port"> + app:layout_constraintTop_toBottomOf="@id/server_user_layout"> <com.google.android.material.textfield.TextInputEditText + android:id="@+id/server_url" android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/server_url" android:inputType="textWebEmailAddress" /> </com.google.android.material.textfield.TextInputLayout> @@ -97,10 +98,10 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:hint="@string/server_port_hint" - app:layout_constraintStart_toEndOf="@id/label_server_url" - app:layout_constraintTop_toBottomOf="@id/server_user_layout" + app:layout_constraintDimensionRatio="1:0.8" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintDimensionRatio="1:0.8"> + app:layout_constraintStart_toEndOf="@id/label_server_url" + app:layout_constraintTop_toBottomOf="@id/server_user_layout"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/server_port" @@ -123,19 +124,19 @@ android:id="@+id/server_path" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="textWebEmailAddress"/> + android:inputType="textWebEmailAddress" /> </com.google.android.material.textfield.TextInputLayout> <androidx.appcompat.widget.AppCompatTextView - style="@style/TextAppearance.MaterialComponents.Headline6" android:id="@+id/label_connection_mode" + style="@style/TextAppearance.MaterialComponents.Headline6" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/connection_mode" android:layout_margin="8dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" + android:text="@string/connection_mode" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/label_server_path" /> @@ -144,8 +145,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintTop_toBottomOf="@id/label_connection_mode" - app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_connection_mode"> <RadioButton android:id="@+id/connection_mode_ssh_key" @@ -179,11 +180,11 @@ <com.google.android.material.button.MaterialButton android:id="@+id/save_button" - android:text="@string/crypto_save" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - app:layout_constraintTop_toBottomOf="@id/connection_mode_group" - app:layout_constraintEnd_toEndOf="parent" /> + android:text="@string/crypto_save" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/connection_mode_group" /> </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index e9d769b8..ec6ff7a1 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/activity_horizontal_margin" android:background="?android:attr/windowBackground" + android:padding="@dimen/activity_horizontal_margin" tools:context="com.zeapo.pwdstore.git.GitConfigActivity" tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteY="81dp"> @@ -15,8 +15,8 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:hint="@string/git_user_name_hint" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:layout_editor_absoluteY="64dp"> <com.google.android.material.textfield.TextInputEditText @@ -33,8 +33,8 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:hint="@string/git_user_email" - app:layout_constraintTop_toBottomOf="@id/username_input_layout" - app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/username_input_layout"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/git_user_email" @@ -50,20 +50,20 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/crypto_save" - app:layout_constraintTop_toBottomOf="@id/email_input_layout" - app:layout_constraintEnd_toEndOf="parent"/> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/email_input_layout" /> <androidx.appcompat.widget.AppCompatTextView - style="@style/TextAppearance.MaterialComponents.Headline5" - android:textStyle="bold" - android:textSize="24sp" android:id="@+id/git_tools_title" + style="@style/TextAppearance.MaterialComponents.Headline5" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/hackish_tools" - app:layout_constraintTop_toBottomOf="@id/save_button" - app:layout_constraintStart_toStartOf="parent" /> + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/save_button" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/commit_hash_label" @@ -71,8 +71,8 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/commit_hash" - app:layout_constraintTop_toBottomOf="@id/git_tools_title" - app:layout_constraintStart_toStartOf="parent"/> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/git_tools_title" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/git_commit_hash" @@ -80,9 +80,9 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:textStyle="bold" - app:layout_constraintTop_toBottomOf="@id/git_tools_title" app:layout_constraintStart_toEndOf="@id/commit_hash_label" - tools:text="HASH"/> + app:layout_constraintTop_toBottomOf="@id/git_tools_title" + tools:text="HASH" /> <com.google.android.material.button.MaterialButton android:id="@+id/git_abort_rebase" diff --git a/app/src/main/res/layout/activity_oreo_autofill_filter.xml b/app/src/main/res/layout/activity_oreo_autofill_filter.xml index da965e05..319ce2f0 100644 --- a/app/src/main/res/layout/activity_oreo_autofill_filter.xml +++ b/app/src/main/res/layout/activity_oreo_autofill_filter.xml @@ -42,15 +42,16 @@ android:inputType="text" tools:text="example.com" /> </com.google.android.material.textfield.TextInputLayout> + <ViewSwitcher android:id="@+id/rvPasswordSwitcher" android:layout_width="0dp" + android:layout_height="0dp" android:layout_marginTop="@dimen/activity_vertical_margin" app:layout_constraintBottom_toTopOf="@id/strictDomainSearch" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/searchLayout" - android:layout_height="0dp"> + app:layout_constraintTop_toBottomOf="@id/searchLayout"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvPassword" @@ -84,7 +85,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/rvPasswordSwitcher" app:layout_constraintVertical_bias="1.0" - tools:text="Phishing-resistant search"/> + tools:text="Phishing-resistant search" /> <Switch android:id="@+id/shouldMatch" diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml index e76b88a1..509a41da 100644 --- a/app/src/main/res/layout/activity_pwdstore.xml +++ b/app/src/main/res/layout/activity_pwdstore.xml @@ -2,13 +2,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".PasswordStore" - android:orientation="vertical"> + android:orientation="vertical" + tools:context=".PasswordStore"> <LinearLayout android:id="@+id/main_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"/> + android:orientation="vertical" /> </LinearLayout> diff --git a/app/src/main/res/layout/autofill_instructions.xml b/app/src/main/res/layout/autofill_instructions.xml index e7cf3dd1..4193c4b9 100644 --- a/app/src/main/res/layout/autofill_instructions.xml +++ b/app/src/main/res/layout/autofill_instructions.xml @@ -7,10 +7,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="20dp" android:paddingLeft="24dp" + android:paddingTop="20dp" android:paddingRight="24dp" - android:paddingTop="20dp"> + android:paddingBottom="20dp"> <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" @@ -21,19 +21,19 @@ <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="8dp" android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" android:adjustViewBounds="true" - android:src="@drawable/autofill_ins_1" - android:contentDescription="@string/autofill_ins_1_hint" /> + android:contentDescription="@string/autofill_ins_1_hint" + android:src="@drawable/autofill_ins_1" /> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:adjustViewBounds="true" - android:src="@drawable/autofill_ins_2" - android:contentDescription="@string/autofill_ins_2_hint" /> + android:contentDescription="@string/autofill_ins_2_hint" + android:src="@drawable/autofill_ins_2" /> <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" @@ -44,10 +44,10 @@ <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="114dp" - android:layout_marginBottom="8dp" android:layout_marginTop="8dp" - android:src="@drawable/autofill_ins_3" - android:contentDescription="@string/autofill_ins_3_hint" /> + android:layout_marginBottom="8dp" + android:contentDescription="@string/autofill_ins_3_hint" + android:src="@drawable/autofill_ins_3" /> <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml index c3a4a9f3..beb87fd5 100644 --- a/app/src/main/res/layout/autofill_recycler_view.xml +++ b/app/src/main/res/layout/autofill_recycler_view.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/autofill_recycler" android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="none" - tools:listitem="@layout/autofill_row_layout" - tools:itemCount="20"/> + tools:itemCount="20" + tools:listitem="@layout/autofill_row_layout" /> <ProgressBar android:id="@+id/progress_bar" @@ -24,16 +24,16 @@ <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" - android:src="@drawable/ic_add_white_48dp" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" android:layout_gravity="bottom|end" - app:elevation="6dp" - app:pressedTranslationZ="12dp" + android:layout_margin="@dimen/fab_compat_margin" + android:src="@drawable/ic_add_white_48dp" app:backgroundTint="?attr/colorSecondary" - app:rippleColor="?attr/colorSecondary" app:borderWidth="0dp" - android:layout_margin="@dimen/fab_compat_margin" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true"/> + app:elevation="6dp" + app:pressedTranslationZ="12dp" + app:rippleColor="?attr/colorSecondary" /> </RelativeLayout> diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml index acdeed6b..56a72854 100644 --- a/app/src/main/res/layout/autofill_row_layout.xml +++ b/app/src/main/res/layout/autofill_row_layout.xml @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:layout_width="match_parent" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="64dp" android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical" android:orientation="horizontal" android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - xmlns:android="http://schemas.android.com/apk/res/android"> + android:paddingRight="@dimen/activity_horizontal_margin"> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/app_icon" - android:layout_width="48dp" - android:layout_height="48dp" - android:contentDescription="@string/app_icon_hint"/> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/app_icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:contentDescription="@string/app_icon_hint" /> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginStart="8dp" - android:gravity="center_vertical" - android:orientation="vertical" > + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginStart="8dp" + android:gravity="center_vertical" + android:orientation="vertical"> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/secondary_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColor" /> - </LinearLayout> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/secondary_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColor" /> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 71566178..1c0c9b35 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?android:attr/windowBackground" android:orientation="vertical" tools:context="com.zeapo.pwdstore.crypto.PgpActivity"> @@ -58,8 +58,8 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" android:src="@drawable/divider" app:layout_constraintTop_toBottomOf="@id/crypto_password_last_changed" tools:ignore="ContentDescription" /> @@ -70,8 +70,8 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/activity_vertical_margin" android:visibility="invisible" - tools:visibility="visible" - app:layout_constraintTop_toBottomOf="@id/divider"> + app:layout_constraintTop_toBottomOf="@id/divider" + tools:visibility="visible"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_password_show_label" @@ -79,9 +79,9 @@ android:layout_height="wrap_content" android:text="@string/password" android:textColor="?android:attr/textColor" + android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:textStyle="bold" /> + app:layout_constraintTop_toTopOf="parent" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_password_show" @@ -90,16 +90,16 @@ android:layout_gravity="fill" android:gravity="bottom" android:textColor="?android:attr/textColor" - app:layout_constraintStart_toEndOf="@id/crypto_password_show_label" + android:typeface="monospace" app:layout_constraintBaseline_toBaselineOf="@id/crypto_password_show_label" - android:typeface="monospace" /> + app:layout_constraintStart_toEndOf="@id/crypto_password_show_label" /> <com.google.android.material.button.MaterialButton android:id="@+id/crypto_password_toggle_show" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/show_password" android:layout_marginTop="8dp" + android:text="@string/show_password" app:layout_constraintTop_toBottomOf="@id/crypto_password_show_label" /> </androidx.constraintlayout.widget.ConstraintLayout> @@ -116,15 +116,15 @@ android:id="@+id/crypto_copy_username" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" android:background="?android:attr/windowBackground" android:contentDescription="@string/copy_username" android:src="@drawable/ic_content_copy" android:visibility="invisible" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" - tools:visibility="visible"/> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_username_show_label" @@ -139,84 +139,84 @@ android:visibility="invisible" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:visibility="visible"/> + tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_username_show" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" android:layout_below="@id/crypto_username_show_label" + android:layout_alignParentStart="true" android:layout_toStartOf="@id/crypto_copy_username" android:textColor="?android:attr/textColor" android:textIsSelectable="true" android:typeface="monospace" android:visibility="invisible" - app:layout_constraintTop_toBottomOf="@id/crypto_username_show_label" app:layout_constraintStart_toStartOf="parent" - tools:visibility="visible"/> + app:layout_constraintTop_toBottomOf="@id/crypto_username_show_label" + tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/crypto_copy_otp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" android:layout_below="@id/crypto_username_show" + android:layout_alignParentEnd="true" android:background="?android:attr/windowBackground" android:contentDescription="@string/copy_otp" android:src="@drawable/ic_content_copy" android:visibility="invisible" - app:layout_constraintTop_toTopOf="@id/crypto_otp_show_label" app:layout_constraintEnd_toEndOf="parent" - tools:visibility="visible"/> + app:layout_constraintTop_toTopOf="@id/crypto_otp_show_label" + tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_otp_show_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentStart="true" android:layout_below="@id/crypto_username_show" + android:layout_alignParentStart="true" android:layout_toStartOf="@id/crypto_copy_otp" android:text="@string/otp" android:textColor="?android:attr/textColor" - app:layout_constraintTop_toBottomOf="@id/crypto_username_show" + android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" - android:textStyle="bold" /> + app:layout_constraintTop_toBottomOf="@id/crypto_username_show" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_otp_show" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" android:layout_below="@id/crypto_otp_show_label" + android:layout_alignParentStart="true" android:layout_toStartOf="@id/crypto_copy_otp" android:textColor="?android:attr/textColor" android:textIsSelectable="true" - app:layout_constraintTop_toBottomOf="@id/crypto_otp_show_label" - android:typeface="monospace" /> + android:typeface="monospace" + app:layout_constraintTop_toBottomOf="@id/crypto_otp_show_label" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_extra_show_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentStart="true" android:layout_below="@id/crypto_otp_show" + android:layout_alignParentStart="true" android:text="@string/extra_content" android:textColor="?android:attr/textColor" - app:layout_constraintTop_toBottomOf="@id/crypto_otp_show" + android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" - android:textStyle="bold" /> + app:layout_constraintTop_toBottomOf="@id/crypto_otp_show" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/crypto_extra_show" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" android:layout_below="@id/crypto_extra_show_label" + android:layout_alignParentStart="true" android:textColor="?android:attr/textColor" android:textIsSelectable="true" - app:layout_constraintTop_toBottomOf="@id/crypto_extra_show_label" - android:typeface="monospace" /> + android:typeface="monospace" + app:layout_constraintTop_toBottomOf="@id/crypto_extra_show_label" /> <ToggleButton android:id="@+id/crypto_extra_toggle_show" @@ -225,13 +225,13 @@ android:layout_height="wrap_content" android:layout_below="@id/crypto_extra_show" android:layout_alignParentStart="true" + android:backgroundTint="?attr/colorSecondary" android:checked="false" android:paddingTop="8dp" android:textColor="?android:attr/windowBackground" android:textOff="@string/show_extra" android:textOn="@string/hide_extra" - app:layout_constraintTop_toBottomOf="@id/crypto_extra_show" - android:backgroundTint="?attr/colorSecondary"/> + app:layout_constraintTop_toBottomOf="@id/crypto_extra_show" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml index 3b0b8068..bab1214e 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?android:attr/windowBackground" android:orientation="vertical" android:padding="@dimen/activity_horizontal_margin" @@ -14,8 +14,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" - android:textColor="?android:attr/textColor" android:enabled="false" + android:textColor="?android:attr/textColor" android:textSize="18sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -23,17 +23,18 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/name_input_layout" - android:layout_gravity="center_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_margin="8dp" android:hint="@string/crypto_name_hint" - app:layout_constraintTop_toBottomOf="@id/crypto_password_category" - app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/crypto_password_category"> + <com.google.android.material.textfield.TextInputEditText android:id="@+id/crypto_password_file_edit" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" /> </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputLayout @@ -43,13 +44,14 @@ android:layout_margin="8dp" android:hint="@string/crypto_pass_label" app:endIconMode="password_toggle" - app:layout_constraintTop_toBottomOf="@id/name_input_layout" - app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/name_input_layout"> + <com.google.android.material.textfield.TextInputEditText android:id="@+id/crypto_password_edit" - android:inputType="textVisiblePassword" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:inputType="textVisiblePassword" /> </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.button.MaterialButton @@ -58,8 +60,8 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/pwd_generate_button" - app:layout_constraintTop_toBottomOf="@id/password_input_layout" - app:layout_constraintEnd_toEndOf="parent"/> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/password_input_layout" /> <com.google.android.material.textfield.TextInputLayout android:id="@+id/extra_input_layout" @@ -67,14 +69,14 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:hint="@string/crypto_extra_label" - app:layout_constraintTop_toBottomOf="@id/generate_password" - app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/generate_password"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/crypto_extra_edit" - android:inputType="textMultiLine|textVisiblePassword" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:inputType="textMultiLine|textVisiblePassword" /> </com.google.android.material.textfield.TextInputLayout> diff --git a/app/src/main/res/layout/folder_creation_dialog_fragment.xml b/app/src/main/res/layout/folder_creation_dialog_fragment.xml index 375b4a30..eaae3c60 100644 --- a/app/src/main/res/layout/folder_creation_dialog_fragment.xml +++ b/app/src/main/res/layout/folder_creation_dialog_fragment.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" @@ -17,7 +15,7 @@ android:id="@+id/folder_name_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="textNoSuggestions|textVisiblePassword"/> + android:inputType="textNoSuggestions|textVisiblePassword" /> </com.google.android.material.textfield.TextInputLayout> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml index 21a9d95a..713c8ba5 100644 --- a/app/src/main/res/layout/fragment_autofill.xml +++ b/app/src/main/res/layout/fragment_autofill.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingBottom="20dp" android:paddingLeft="24dp" + android:paddingTop="20dp" android:paddingRight="24dp" - android:paddingTop="20dp"> + android:paddingBottom="20dp"> <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="URL"> + <com.google.android.material.textfield.TextInputEditText android:id="@+id/webURL" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="textUri"/> + android:inputType="textUri" /> </com.google.android.material.textfield.TextInputLayout> <RadioGroup @@ -56,14 +56,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_weight="1"/> + android:layout_weight="1" /> <com.google.android.material.button.MaterialButton + android:id="@+id/matchButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="+" - android:id="@+id/matchButton" android:layout_gravity="center_horizontal" + android:text="+" tools:ignore="HardcodedText" /> <RadioButton @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:checked="false" - android:text="@string/autofill_apps_never"/> + android:text="@string/autofill_apps_never" /> </RadioGroup> diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml index df01c62e..6510c006 100644 --- a/app/src/main/res/layout/fragment_pwgen.xml +++ b/app/src/main/res/layout/fragment_pwgen.xml @@ -7,10 +7,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="20dp" android:paddingLeft="24dp" - android:paddingRight="24dp" android:paddingTop="20dp" + android:paddingRight="24dp" + android:paddingBottom="20dp" tools:context=".MainActivityFragment"> <androidx.appcompat.widget.AppCompatTextView diff --git a/app/src/main/res/layout/fragment_show_ssh_key.xml b/app/src/main/res/layout/fragment_show_ssh_key.xml index eff30360..312a9c8e 100644 --- a/app/src/main/res/layout/fragment_show_ssh_key.xml +++ b/app/src/main/res/layout/fragment_show_ssh_key.xml @@ -7,10 +7,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="20dp" android:paddingLeft="24dp" + android:paddingTop="20dp" android:paddingRight="24dp" - android:paddingTop="20dp"> + android:paddingBottom="20dp"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/public_key" diff --git a/app/src/main/res/layout/fragment_ssh_keygen.xml b/app/src/main/res/layout/fragment_ssh_keygen.xml index 803debc4..91e5b772 100644 --- a/app/src/main/res/layout/fragment_ssh_keygen.xml +++ b/app/src/main/res/layout/fragment_ssh_keygen.xml @@ -18,18 +18,20 @@ android:text="@string/ssh_keygen_length" /> <com.google.android.material.button.MaterialButtonToggleGroup - style="@style/TextAppearance.MaterialComponents.Headline1" android:id="@+id/key_length_group" + style="@style/TextAppearance.MaterialComponents.Headline1" android:layout_width="wrap_content" android:layout_height="wrap_content" app:selectionRequired="true" app:singleSelection="true"> + <com.google.android.material.button.MaterialButton android:id="@+id/key_length_2048" style="?attr/materialButtonOutlinedStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/key_length_2048" /> + <com.google.android.material.button.MaterialButton android:id="@+id/key_length_4096" style="?attr/materialButtonOutlinedStyle" @@ -49,8 +51,8 @@ android:id="@+id/passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" - android:importantForAccessibility="no" android:fontFamily="@font/sourcecodepro" + android:importantForAccessibility="no" android:inputType="textPassword" /> </com.google.android.material.textfield.TextInputLayout> diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml index 5aa94e8a..80b5e7b5 100644 --- a/app/src/main/res/layout/fragment_to_clone_or_not.xml +++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml @@ -1,8 +1,7 @@ <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorPrimary" android:orientation="vertical"> @@ -11,37 +10,37 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@mipmap/ic_launcher" android:contentDescription="@string/app_icon_hint" - app:layout_constraintTop_toTopOf="parent" + android:src="@mipmap/ic_launcher" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/app_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/app_name" android:layout_below="@+id/app_icon" android:layout_centerHorizontal="true" + android:text="@string/app_name" + android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@android:color/white" android:textStyle="bold" - app:layout_constraintTop_toBottomOf="@+id/app_icon" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/app_icon" /> <com.google.android.material.button.MaterialButton style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:onClick="openSettings" - android:text="@string/action_settings" - android:textColor="@android:color/white" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:onClick="openSettings" + android:text="@string/action_settings" + android:textColor="@android:color/white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -49,13 +48,13 @@ android:id="@+id/use_local_directory" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="48dp" android:onClick="createNewRepository" android:text="@string/initialize" android:textSize="12sp" - android:layout_marginTop="48dp" - app:layout_constraintTop_toBottomOf="@id/app_name" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/app_name" /> <com.google.android.material.button.MaterialButton android:layout_width="wrap_content" @@ -63,8 +62,8 @@ android:onClick="cloneExistingRepository" android:text="@string/clone" android:textSize="12sp" - app:layout_constraintTop_toBottomOf="@id/use_local_directory" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/use_local_directory" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_xkpwgen.xml b/app/src/main/res/layout/fragment_xkpwgen.xml index 6e9ebd29..c6b03445 100644 --- a/app/src/main/res/layout/fragment_xkpwgen.xml +++ b/app/src/main/res/layout/fragment_xkpwgen.xml @@ -49,19 +49,19 @@ <CheckBox android:id="@+id/xknumerals" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:gravity="center_vertical" - android:text="@string/xkpwgen_numbers" - android:layout_height="wrap_content" /> + android:text="@string/xkpwgen_numbers" /> <Spinner android:id="@+id/xk_numbers_count" android:layout_width="fill_parent" - android:minWidth="40dp" - android:dropDownWidth="40dp" - android:gravity="center_vertical" android:layout_height="wrap_content" + android:dropDownWidth="40dp" android:entries="@array/xk_range_1_10" android:entryValues="@array/xk_range_1_10" + android:gravity="center_vertical" + android:minWidth="40dp" android:spinnerMode="dropdown" /> </LinearLayout> @@ -73,19 +73,19 @@ <CheckBox android:id="@+id/xksymbols" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:gravity="center_vertical" - android:text="@string/xkpwgen_symbols" - android:layout_height="wrap_content"/> + android:text="@string/xkpwgen_symbols" /> <Spinner android:id="@+id/xk_symbols_count" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:gravity="center_vertical" - android:minWidth="40dp" android:dropDownWidth="40dp" android:entries="@array/xk_range_1_10" android:entryValues="@array/xk_range_1_10" + android:gravity="center_vertical" + android:minWidth="40dp" android:spinnerMode="dropdown" /> </LinearLayout> @@ -116,9 +116,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:maxLength="2" android:ems="10" - android:inputType="number" /> + android:inputType="number" + android:maxLength="2" /> <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" @@ -132,8 +132,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:ems="10" android:autofillHints="" + android:ems="10" android:hint="@string/xkpwgen_separator_character" android:inputType="text" /> </LinearLayout> diff --git a/app/src/main/res/layout/git_passphrase_layout.xml b/app/src/main/res/layout/git_passphrase_layout.xml index c0922471..27c52412 100644 --- a/app/src/main/res/layout/git_passphrase_layout.xml +++ b/app/src/main/res/layout/git_passphrase_layout.xml @@ -13,6 +13,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> + <com.google.android.material.textfield.TextInputEditText android:id="@+id/git_auth_passphrase" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_create_sheet.xml b/app/src/main/res/layout/item_create_sheet.xml index 244537ad..b6e0c8d9 100644 --- a/app/src/main/res/layout/item_create_sheet.xml +++ b/app/src/main/res/layout/item_create_sheet.xml @@ -1,39 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> <com.google.android.material.button.MaterialButton - style="@style/Widget.MaterialComponents.Button.TextButton" android:id="@+id/create_folder" + style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_item_height" + android:layout_margin="@dimen/normal_margin" android:text="@string/bottom_sheet_create_new_folder" android:textAlignment="viewStart" android:textColor="?attr/colorOnSurface" - android:layout_margin="@dimen/normal_margin" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" app:icon="@drawable/ic_action_new_folder" app:iconPadding="@dimen/normal_margin" app:iconTint="?attr/colorSecondary" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" app:rippleColor="?attr/colorSecondary" /> <com.google.android.material.button.MaterialButton - style="@style/Widget.MaterialComponents.Button.TextButton" android:id="@+id/create_password" + style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_item_height" + android:layout_margin="@dimen/normal_margin" android:text="@string/bottom_sheet_create_new_password" android:textAlignment="viewStart" android:textColor="?attr/colorOnSurface" - android:layout_margin="@dimen/normal_margin" - app:layout_constraintTop_toBottomOf="@id/create_folder" app:icon="@drawable/ic_action_new_password" app:iconPadding="@dimen/normal_margin" app:iconTint="?attr/colorSecondary" + app:layout_constraintTop_toBottomOf="@id/create_folder" app:rippleColor="?attr/colorSecondary" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/oreo_autofill_dataset.xml b/app/src/main/res/layout/oreo_autofill_dataset.xml index 4917347c..9176dc7d 100644 --- a/app/src/main/res/layout/oreo_autofill_dataset.xml +++ b/app/src/main/res/layout/oreo_autofill_dataset.xml @@ -12,13 +12,13 @@ <ImageView android:id="@+id/icon" android:layout_width="wrap_content" - android:tint="@color/secondary_color" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginEnd="10dp" android:adjustViewBounds="true" android:maxWidth="20dp" android:maxHeight="20dp" + android:tint="@color/secondary_color" tools:src="@mipmap/ic_launcher" /> <LinearLayout diff --git a/app/src/main/res/layout/oreo_autofill_instructions.xml b/app/src/main/res/layout/oreo_autofill_instructions.xml index 874d764f..07571fac 100644 --- a/app/src/main/res/layout/oreo_autofill_instructions.xml +++ b/app/src/main/res/layout/oreo_autofill_instructions.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - xmlns:tools="http://schemas.android.com/tools"> + android:layout_height="match_parent"> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="20dp" android:paddingLeft="24dp" + android:paddingTop="20dp" android:paddingRight="24dp" - android:paddingTop="20dp"> + android:paddingBottom="20dp"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/intro_text" @@ -32,15 +32,15 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/activity_vertical_margin" android:text="@string/oreo_autofill_enable_dialog_installed_browsers" - android:textStyle="bold" - android:textSize="16sp" /> + android:textSize="16sp" + android:textStyle="bold" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/supportedBrowsers" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:text="Firefox: Fill and save credentials" - android:textSize="16sp" /> + android:textSize="16sp" + tools:text="Firefox: Fill and save credentials" /> </LinearLayout> diff --git a/app/src/main/res/layout/otp_confirm_layout.xml b/app/src/main/res/layout/otp_confirm_layout.xml index 4e6e777a..c94a9404 100644 --- a/app/src/main/res/layout/otp_confirm_layout.xml +++ b/app/src/main/res/layout/otp_confirm_layout.xml @@ -8,9 +8,9 @@ android:id="@+id/hotp_remember_checkbox" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" android:layout_marginStart="16dp" android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" android:text="@string/dialog_update_check" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml index 05707f04..2ee16478 100644 --- a/app/src/main/res/layout/password_recycler_view.xml +++ b/app/src/main/res/layout/password_recycler_view.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:clipChildren="false" android:clipToPadding="false" + android:orientation="vertical" tools:context="com.zeapo.pwdstore.PasswordFragment"> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout @@ -26,13 +25,13 @@ <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" - android:src="@drawable/ic_add_white_48dp" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_compat_margin" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" + android:src="@drawable/ic_add_white_48dp" app:backgroundTint="?attr/colorSecondary" app:rippleColor="?attr/colorSecondary" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml index 257b9d4c..72dc72bf 100644 --- a/app/src/main/res/layout/password_row_layout.xml +++ b/app/src/main/res/layout/password_row_layout.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/password_row_background" @@ -15,9 +15,9 @@ android:layout_gravity="bottom" android:alpha="0.5" android:contentDescription="@string/folder_icon_hint" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" tools:src="@drawable/ic_multiple_files_24dp" /> <TextView @@ -35,11 +35,11 @@ android:id="@+id/child_count" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="12dp" android:textSize="18sp" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/folder_indicator" - android:layout_marginEnd="12dp" + app:layout_constraintTop_toTopOf="parent" tools:text="12" /> <ImageView @@ -48,8 +48,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:src="@drawable/ic_keyboard_arrow_right_24dp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/select_folder_layout.xml b/app/src/main/res/layout/select_folder_layout.xml index 1fd32853..b89b0943 100644 --- a/app/src/main/res/layout/select_folder_layout.xml +++ b/app/src/main/res/layout/select_folder_layout.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <LinearLayout android:id="@+id/pgp_handler_linearlayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"/> + android:orientation="vertical" /> </LinearLayout> diff --git a/app/src/main/res/menu/autofill_preference.xml b/app/src/main/res/menu/autofill_preference.xml index ff184adc..6f516499 100644 --- a/app/src/main/res/menu/autofill_preference.xml +++ b/app/src/main/res/menu/autofill_preference.xml @@ -1,12 +1,12 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:pwstore="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:context=".pwdstore.autofill.AutofillPreferenceActivity"> + xmlns:pwstore="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".pwdstore.autofill.AutofillPreferenceActivity"> <item android:id="@+id/action_search" android:icon="@drawable/ic_search_white_24dp" android:title="@string/action_search" pwstore:actionViewClass="androidx.appcompat.widget.SearchView" - pwstore:showAsAction="ifRoom|collapseActionView"/> + pwstore:showAsAction="ifRoom|collapseActionView" /> </menu> diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml index d170cca8..9197996b 100644 --- a/app/src/main/res/menu/git_clone.xml +++ b/app/src/main/res/menu/git_clone.xml @@ -1,9 +1,10 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:pwstore="http://schemas.android.com/apk/res-auto" - tools:context="com.zeapo.pwdstore.git.GitServerConfigActivity" > - <item android:id="@+id/user_pref" - android:title="@string/action_settings" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.zeapo.pwdstore.git.GitServerConfigActivity"> + <item + android:id="@+id/user_pref" android:orderInCategory="100" + android:title="@string/action_settings" pwstore:showAsAction="never" /> </menu> diff --git a/app/src/main/res/menu/main_menu_git.xml b/app/src/main/res/menu/main_menu_git.xml index 90989495..fd71cb15 100644 --- a/app/src/main/res/menu/main_menu_git.xml +++ b/app/src/main/res/menu/main_menu_git.xml @@ -1,26 +1,31 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"> - <item android:id="@+id/action_search" - android:title="@string/action_search" + <item + android:id="@+id/action_search" android:icon="@drawable/ic_search_white_24dp" - app:showAsAction="always|collapseActionView" - app:actionViewClass="androidx.appcompat.widget.SearchView" /> + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="always|collapseActionView" /> - <item android:id="@+id/git_sync" + <item + android:id="@+id/git_sync" android:title="@string/git_sync" /> - <item android:id="@+id/git_pull" + <item + android:id="@+id/git_pull" android:title="@string/git_pull" /> - <item android:id="@+id/git_push" + <item + android:id="@+id/git_push" android:title="@string/git_push" /> - <item android:id="@+id/refresh" + <item + android:id="@+id/refresh" android:title="@string/refresh_list" /> - <item android:id="@+id/user_pref" - android:title="@string/action_settings" - android:orderInCategory="100" /> + <item + android:id="@+id/user_pref" + android:orderInCategory="100" + android:title="@string/action_settings" /> </menu> diff --git a/app/src/main/res/menu/main_menu_no_auth.xml b/app/src/main/res/menu/main_menu_no_auth.xml index 9036c261..dac7fa3a 100644 --- a/app/src/main/res/menu/main_menu_no_auth.xml +++ b/app/src/main/res/menu/main_menu_no_auth.xml @@ -1,20 +1,23 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"> - <item android:id="@+id/action_search" - android:title="@string/action_search" + <item + android:id="@+id/action_search" android:icon="@drawable/ic_search_white_24dp" - app:showAsAction="always|collapseActionView" - app:actionViewClass="androidx.appcompat.widget.SearchView" /> + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="always|collapseActionView" /> - <item android:id="@+id/git_pull" - android:title="@string/git_pull"/> + <item + android:id="@+id/git_pull" + android:title="@string/git_pull" /> - <item android:id="@+id/refresh" + <item + android:id="@+id/refresh" android:title="@string/refresh_list" /> - <item android:id="@+id/user_pref" - android:title="@string/action_settings" - android:orderInCategory="100" /> + <item + android:id="@+id/user_pref" + android:orderInCategory="100" + android:title="@string/action_settings" /> </menu> diff --git a/app/src/main/res/menu/main_menu_non_git.xml b/app/src/main/res/menu/main_menu_non_git.xml index 7745b544..bb12b269 100644 --- a/app/src/main/res/menu/main_menu_non_git.xml +++ b/app/src/main/res/menu/main_menu_non_git.xml @@ -1,17 +1,19 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"> - <item android:id="@+id/action_search" - android:title="@string/action_search" + <item + android:id="@+id/action_search" android:icon="@drawable/ic_search_white_24dp" - app:showAsAction="always|collapseActionView" - app:actionViewClass="androidx.appcompat.widget.SearchView" /> + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="always|collapseActionView" /> - <item android:id="@+id/refresh" + <item + android:id="@+id/refresh" android:title="@string/refresh_list" /> - <item android:id="@+id/user_pref" - android:title="@string/action_settings" - android:orderInCategory="100" /> + <item + android:id="@+id/user_pref" + android:orderInCategory="100" + android:title="@string/action_settings" /> </menu> diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml index 755ee209..e00bec6d 100644 --- a/app/src/main/res/menu/pgp_handler.xml +++ b/app/src/main/res/menu/pgp_handler.xml @@ -1,20 +1,20 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:pwstore="http://schemas.android.com/apk/res-auto" - tools:context="com.zeapo.pwdstore.crypto.PgpActivity" > - <item android:title="@string/share_as_plaintext" - android:icon="@drawable/ic_share_white_24dp" - pwstore:showAsAction="ifRoom" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.zeapo.pwdstore.crypto.PgpActivity"> + <item android:id="@+id/share_password_as_plaintext" - /> - <item android:title="@string/copy_password" - android:icon="@drawable/ic_content_copy_white_24dp" - pwstore:showAsAction="ifRoom" + android:icon="@drawable/ic_share_white_24dp" + android:title="@string/share_as_plaintext" + pwstore:showAsAction="ifRoom" /> + <item android:id="@+id/copy_password" - /> - <item android:title="@string/edit_password" - android:icon="@drawable/ic_edit_white_24dp" - pwstore:showAsAction="ifRoom" + android:icon="@drawable/ic_content_copy_white_24dp" + android:title="@string/copy_password" + pwstore:showAsAction="ifRoom" /> + <item android:id="@+id/edit_password" - /> + android:icon="@drawable/ic_edit_white_24dp" + android:title="@string/edit_password" + pwstore:showAsAction="ifRoom" /> </menu> diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml index 6b110ba1..18ba3729 100644 --- a/app/src/main/res/menu/pgp_handler_new_password.xml +++ b/app/src/main/res/menu/pgp_handler_new_password.xml @@ -1,20 +1,20 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:pwstore="http://schemas.android.com/apk/res-auto" - tools:context="com.zeapo.pwdstore.crypto.PgpActivity" > - <item android:title="@string/crypto_cancel" - android:icon="@drawable/ic_clear_white_24dp" - pwstore:showAsAction="ifRoom" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.zeapo.pwdstore.crypto.PgpActivity"> + <item android:id="@+id/crypto_cancel_add" - /> - <item android:title="@string/crypto_save" - android:icon="@drawable/ic_save_white_24dp" - pwstore:showAsAction="ifRoom" + android:icon="@drawable/ic_clear_white_24dp" + android:title="@string/crypto_cancel" + pwstore:showAsAction="ifRoom" /> + <item android:id="@+id/crypto_confirm_add" - /> - <item android:title="@string/crypto_save_and_copy" - android:icon="@drawable/ic_save_copy_white_24dp" - pwstore:showAsAction="ifRoom" + android:icon="@drawable/ic_save_white_24dp" + android:title="@string/crypto_save" + pwstore:showAsAction="ifRoom" /> + <item android:id="@+id/crypto_confirm_add_and_copy" - /> + android:icon="@drawable/ic_save_copy_white_24dp" + android:title="@string/crypto_save_and_copy" + pwstore:showAsAction="ifRoom" /> </menu> diff --git a/app/src/main/res/menu/pgp_handler_select_folder.xml b/app/src/main/res/menu/pgp_handler_select_folder.xml index a09c6b56..f278f5ae 100644 --- a/app/src/main/res/menu/pgp_handler_select_folder.xml +++ b/app/src/main/res/menu/pgp_handler_select_folder.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:pwstore="http://schemas.android.com/apk/res-auto" - tools:context="com.zeapo.pwdstore.SelectFolderActivity" > - <item android:title="@string/crypto_select" - android:icon="@drawable/ic_done_white_24dp" - pwstore:showAsAction="ifRoom" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.zeapo.pwdstore.SelectFolderActivity"> + <item android:id="@+id/crypto_select" - /> + android:icon="@drawable/ic_done_white_24dp" + android:title="@string/crypto_select" + pwstore:showAsAction="ifRoom" /> </menu> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 5ed0a2df..a8a8fa55 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <background android:drawable="@color/ic_launcher_background" /> + <foreground android:drawable="@drawable/ic_launcher_foreground" /> </adaptive-icon> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 5ed0a2df..a8a8fa55 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@drawable/ic_launcher_foreground"/> + <background android:drawable="@color/ic_launcher_background" /> + <foreground android:drawable="@drawable/ic_launcher_foreground" /> </adaptive-icon> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 133f96a5..50662965 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -130,4 +130,4 @@ <string name="autofill_pick_and_match">إختر و طابق مع ...</string> <string name="autofill_paste">إلصاق</string> <string name="new_password_title">كلمة السر الجديدة</string> - </resources> +</resources> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d29e8f82..3da83d33 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -180,4 +180,4 @@ <string name="autofill_apps_never">Nikdy nepárovat</string> <string name="autofill_apps_delete">Smazat</string> <string name="get_last_changed_failed">Failed to get last changed date</string> - </resources> +</resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 372b3154..ce19d489 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -171,4 +171,4 @@ <string name="autofill_ins_2_hint">Bildschirmfoto des Schalters in Accessibility Services</string> <string name="autofill_ins_3_hint">Bildschirmfoto von Autofill in Aktion</string> <string name="get_last_changed_failed">Das Abrufen des letzten Änderungsdatums ist fehlgeschlagen.</string> - </resources> +</resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1916cc83..12b48b8b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -220,4 +220,4 @@ <string name="crypto_extra_edit_hint">Username: Nombre de usuario\n… o algún contenido extra</string> <string name="get_last_changed_failed">Error al obtener la fecha de último cambio</string> <string name="hotp_pending">Presiona copiar para calcular el HOTP</string> - </resources> +</resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3dad40e9..ba1bf538 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -220,4 +220,4 @@ <string name="crypto_extra_edit_hint">nom d\'utilisateur: quelque chose d\'autre contenu supplémentaire</string> <string name="get_last_changed_failed">Failed to get last changed date</string> <string name="hotp_pending">Appuyez sur copie pour calculer le HOTP</string> - </resources> +</resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c8fb396b..61eb4337 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -137,4 +137,4 @@ <string name="autofill_apps_never">一致しない</string> <string name="autofill_apps_delete">削除</string> <string name="get_last_changed_failed">最終変更日の取得に失敗しました</string> - </resources> +</resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6b87a10c..a536a54b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -134,4 +134,4 @@ <string name="autofill_apps_never">从不匹配</string> <string name="autofill_apps_delete">删除</string> <string name="get_last_changed_failed">获取上次修改日期失败</string> - </resources> +</resources> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index db52f31b..7ba5cf93 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -131,4 +131,4 @@ <string name="autofill_apps_never">手動</string> <string name="autofill_apps_delete">刪除</string> <string name="get_last_changed_failed">Failed to get last changed date</string> - </resources> +</resources> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 913b7a4d..86a86e63 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <declare-styleable name="Multiselected"> - <attr name="state_multiselected" format="boolean"/> + <attr name="state_multiselected" format="boolean" /> </declare-styleable> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1f1bb005..da33e0b6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -83,7 +83,9 @@ <item name="boxStrokeColor">@color/secondary_color</item> <item name="hintTextColor">@color/color_control_normal</item> <item name="hintEnabled">true</item> - <item name="materialThemeOverlay">@style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox</item> + <item name="materialThemeOverlay"> + @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox + </item> </style> <style name="DialogLikeTheme" parent="AppTheme"> diff --git a/app/src/main/res/xml/autofill_config.xml b/app/src/main/res/xml/autofill_config.xml index 7816ef4f..aa9c8716 100644 --- a/app/src/main/res/xml/autofill_config.xml +++ b/app/src/main/res/xml/autofill_config.xml @@ -1,9 +1,8 @@ <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android" - android:description="@string/autofill_description" - android:summary="@string/autofill_description" - android:accessibilityEventTypes="typeViewFocused|typeViewClicked|typeWindowStateChanged|typeWindowContentChanged" - android:accessibilityFlags="flagDefault|flagRetrieveInteractiveWindows|flagReportViewIds" - android:accessibilityFeedbackType="feedbackGeneric" - android:notificationTimeout="100" - android:canRetrieveWindowContent="true" - /> + android:accessibilityEventTypes="typeViewFocused|typeViewClicked|typeWindowStateChanged|typeWindowContentChanged" + android:accessibilityFeedbackType="feedbackGeneric" + android:accessibilityFlags="flagDefault|flagRetrieveInteractiveWindows|flagReportViewIds" + android:canRetrieveWindowContent="true" + android:description="@string/autofill_description" + android:notificationTimeout="100" + android:summary="@string/autofill_description" /> diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index dcb33e3e..e59e1c8c 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -5,7 +5,7 @@ <SwitchPreferenceCompat app:defaultValue="true" app:key="autofill_enable" - app:title="@string/pref_autofill_enable_title"/> + app:title="@string/pref_autofill_enable_title" /> <ListPreference app:defaultValue="file" app:entries="@array/oreo_autofill_directory_structure_entries" @@ -15,21 +15,21 @@ app:useSimpleSummaryProvider="true" /> <Preference app:key="autofill_apps" - app:title="@string/pref_autofill_apps_title"/> + app:title="@string/pref_autofill_apps_title" /> <CheckBoxPreference app:defaultValue="true" app:key="autofill_default" app:summary="@string/pref_autofill_default_hint" - app:title="@string/pref_autofill_default_title"/> + app:title="@string/pref_autofill_default_title" /> <CheckBoxPreference app:defaultValue="false" app:key="autofill_always" - app:title="@string/pref_autofill_always_title"/> + app:title="@string/pref_autofill_always_title" /> <CheckBoxPreference app:defaultValue="false" app:key="autofill_full_path" app:summary="@string/pref_autofill_full_path_hint" - app:title="@string/pref_autofill_full_path_title"/> + app:title="@string/pref_autofill_full_path_title" /> </PreferenceCategory> <PreferenceCategory app:title="@string/pref_repository_title"> @@ -80,41 +80,41 @@ <PreferenceCategory app:title="@string/password_generator_category_title"> <ListPreference - app:key="pref_key_pwgen_type" - app:title="@string/xkpwgen_pref_gentype_title" app:defaultValue="classic" app:entries="@array/pwgen_provider_labels" app:entryValues="@array/pwgen_provider_values" - app:useSimpleSummaryProvider="true" - app:persistent="true" /> + app:key="pref_key_pwgen_type" + app:persistent="true" + app:title="@string/xkpwgen_pref_gentype_title" + app:useSimpleSummaryProvider="true" /> <CheckBoxPreference app:key="pref_key_is_custom_dict" - app:title="@string/xkpwgen_pref_custom_dict_title" + app:summaryOff="@string/xkpwgen_pref_custom_dict_summary_off" app:summaryOn="@string/xkpwgen_pref_custom_dict_summary_on" - app:summaryOff="@string/xkpwgen_pref_custom_dict_summary_off"/> + app:title="@string/xkpwgen_pref_custom_dict_title" /> <Preference + app:dependency="pref_key_is_custom_dict" app:key="pref_key_custom_dict" - app:title="@string/xkpwgen_pref_custom_dict_picker_title" app:summary="@string/xkpwgen_pref_custom_dict_picker_summary" - app:dependency="pref_key_is_custom_dict"/> + app:title="@string/xkpwgen_pref_custom_dict_picker_title" /> </PreferenceCategory> <PreferenceCategory app:title="@string/pref_category_general_title"> <ListPreference android:defaultValue="@string/app_theme_def" - android:key="app_theme" android:entries="@array/app_theme_options" android:entryValues="@array/app_theme_values" + android:key="app_theme" android:summary="%s" android:title="@string/theme_title" /> <ListPreference - app:title="@string/pref_sort_order_title" app:defaultValue="FOLDER_FIRST" - app:key="sort_order" app:entries="@array/sort_order_entries" app:entryValues="@array/sort_order_values" + app:key="sort_order" app:persistent="true" - app:summary="%s" /> + app:summary="%s" + app:title="@string/pref_sort_order_title" /> <CheckBoxPreference app:defaultValue="true" app:key="filter_recursively" @@ -126,15 +126,15 @@ app:summary="@string/pref_search_on_start_hint" app:title="@string/pref_search_on_start" /> <CheckBoxPreference - app:title="@string/pref_show_hidden_title" - app:summary="@string/pref_show_hidden_summary" - app:key="show_hidden_folders" app:defaultValue="false" - app:persistent="true" /> + app:key="show_hidden_folders" + app:persistent="true" + app:summary="@string/pref_show_hidden_summary" + app:title="@string/pref_show_hidden_title" /> <CheckBoxPreference app:key="biometric_auth" - app:title="@string/biometric_auth_title" - app:summary="@string/biometric_auth_summary" /> + app:summary="@string/biometric_auth_summary" + app:title="@string/biometric_auth_title" /> </PreferenceCategory> <PreferenceCategory app:title="@string/pref_category_title_passwords"> <EditTextPreference @@ -145,14 +145,14 @@ app:title="@string/pref_clipboard_timeout_title" /> <CheckBoxPreference app:defaultValue="true" - app:title="@string/show_password_pref_title" + app:key="show_password" app:summary="@string/show_password_pref_summary" - app:key="show_password" /> + app:title="@string/show_password_pref_title" /> <CheckBoxPreference app:defaultValue="true" - app:title="@string/show_extra_content_pref_title" + app:key="show_extra_content" app:summary="@string/show_extra_content_pref_summary" - app:key="show_extra_content" /> + app:title="@string/show_extra_content_pref_title" /> <CheckBoxPreference app:defaultValue="true" app:dialogTitle="@string/pref_copy_dialog_title" @@ -164,8 +164,8 @@ <PreferenceCategory app:title="@string/pref_misc_title"> <Preference app:key="export_passwords" - app:title="@string/prefs_export_passwords_title" - app:summary="@string/prefs_export_passwords_summary"/> + app:summary="@string/prefs_export_passwords_summary" + app:title="@string/prefs_export_passwords_title" /> <CheckBoxPreference app:defaultValue="false" |