diff options
| author | Felix Bechstein <f@ub0r.de> | 2017-07-25 15:23:50 +0200 |
|---|---|---|
| committer | Mohamed Zenadi <zeapo@users.noreply.github.com> | 2017-07-25 14:23:50 +0100 |
| commit | 5da9e67545644925902b04a11306289add29c033 (patch) | |
| tree | de8ec31c4fe216157b7680a4defdee86429a4122 /app/src/main/res/values | |
| parent | 5cba6c62d7b4628dfaf482dd883e333f93d323d4 (diff) | |
| download | HardenedPass-5da9e67545644925902b04a11306289add29c033.tar.gz HardenedPass-5da9e67545644925902b04a11306289add29c033.zip | |
Fix lint warnings (#319)
* Fix lint errors/warnings
Fix a lot of lint errors and warnings.
Most things are automatically applied fixes done with android studio:
* externalize strings
* remove unused code / classes / layouts / imports
* migrate some fields to local variables
* Remove dead code from comments
Removed code that is commented out long ago.
* remove unused resources
* colors
* strings
* drawables
* layouts
* menus
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 278 | ||||
| -rw-r--r-- | app/src/main/res/values/refs.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 43 |
3 files changed, 22 insertions, 310 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7e1e3814..6293755e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,279 +2,17 @@ <resources> <color name="accent">#ff7043</color> <color name="background">#eee</color> - - <color name="red_50">#fde0dc</color> - <color name="red_100">#f9bdbb</color> - <color name="red_200">#f69988</color> - <color name="red_300">#f36c60</color> - <color name="red_400">#e84e40</color> - <color name="red_500">#e51c23</color> - <color name="red_600">#dd191d</color> - <color name="red_700">#d01716</color> - <color name="red_800">#c41411</color> - <color name="red_900">#b0120a</color> - <color name="red_A100">#ff7997</color> - <color name="red_A200">#ff5177</color> - <color name="red_A400">#ff2d6f</color> - <color name="red_A700">#e00032</color> - - <color name="pink_50">#fce4ec</color> - <color name="pink_100">#f8bbd0</color> - <color name="pink_200">#f48fb1</color> - <color name="pink_300">#f06292</color> - <color name="pink_400">#ec407a</color> - <color name="pink_500">#e91e63</color> - <color name="pink_600">#d81b60</color> - <color name="pink_700">#c2185b</color> - <color name="pink_800">#ad1457</color> - <color name="pink_900">#880e4f</color> - <color name="pink_A100">#ff80ab</color> - <color name="pink_A200">#ff4081</color> - <color name="pink_A400">#f50057</color> - <color name="pink_A700">#c51162</color> - - <color name="purple_50">#f3e5f5</color> - <color name="purple_100">#e1bee7</color> - <color name="purple_200">#ce93d8</color> - <color name="purple_300">#ba68c8</color> - <color name="purple_400">#ab47bc</color> - <color name="purple_500">#9c27b0</color> - <color name="purple_600">#8e24aa</color> - <color name="purple_700">#7b1fa2</color> - <color name="purple_800">#6a1b9a</color> - <color name="purple_900">#4a148c</color> - <color name="purple_A100">#ea80fc</color> - <color name="purple_A200">#e040fb</color> - <color name="purple_A400">#d500f9</color> - <color name="purple_A700">#aa00ff</color> - - <color name="dark_purple_50">#ede7f6</color> - <color name="dark_purple_100">#d1c4e9</color> - <color name="dark_purple_200">#b39ddb</color> - <color name="dark_purple_300">#9575cd</color> - <color name="dark_purple_400">#7e57c2</color> - <color name="dark_purple_500">#673ab7</color> - <color name="dark_purple_600">#5e35b1</color> - <color name="dark_purple_700">#512da8</color> - <color name="dark_purple_800">#4527a0</color> - <color name="dark_purple_900">#311b92</color> - <color name="dark_purple_A100">#b388ff</color> - <color name="dark_purple_A200">#7c4dff</color> - <color name="dark_purple_A400">#651fff</color> - <color name="dark_purple_A700">#6200ea</color> - - <color name="indigo_50">#e8eaf6</color> - <color name="indigo_100">#c5cae9</color> - <color name="indigo_200">#9fa8da</color> - <color name="indigo_300">#7986cb</color> - <color name="indigo_400">#5c6bc0</color> - <color name="indigo_500">#3f51b5</color> - <color name="indigo_600">#3949ab</color> - <color name="indigo_700">#303f9f</color> - <color name="indigo_800">#283593</color> - <color name="indigo_900">#1a237e</color> - <color name="indigo_A100">#8c9eff</color> - <color name="indigo_A200">#536dfe</color> - <color name="indigo_A400">#3d5afe</color> - <color name="indigo_A700">#304ffe</color> - - <color name="blue_50">#e7e9fd</color> - <color name="blue_100">#d0d9ff</color> - <color name="blue_200">#afbfff</color> - <color name="blue_300">#91a7ff</color> - <color name="blue_400">#738ffe</color> - <color name="blue_500">#5677fc</color> - <color name="blue_600">#4e6cef</color> - <color name="blue_700">#455ede</color> - <color name="blue_800">#3b50ce</color> - <color name="blue_900">#2a36b1</color> - <color name="blue_A100">#a6baff</color> - <color name="blue_A200">#6889ff</color> - <color name="blue_A400">#4d73ff</color> - <color name="blue_A700">#4d69ff</color> - - <color name="light_blue_50">#e1f5fe</color> - <color name="light_blue_100">#b3e5fc</color> - <color name="light_blue_200">#81d4fa</color> - <color name="light_blue_300">#4fc3f7</color> - <color name="light_blue_400">#29b6f6</color> - <color name="light_blue_500">#03a9f4</color> - <color name="light_blue_600">#039be5</color> - <color name="light_blue_700">#0288d1</color> - <color name="light_blue_800">#0277bd</color> - <color name="light_blue_900">#01579b</color> - <color name="light_blue_A100">#80d8ff</color> - <color name="light_blue_A200">#40c4ff</color> - <color name="light_blue_A400">#00b0ff</color> - <color name="light_blue_A700">#0091ea</color> - - <color name="cyan_50">#e0f7fa</color> - <color name="cyan_100">#b2ebf2</color> - <color name="cyan_200">#80deea</color> - <color name="cyan_300">#4dd0e1</color> - <color name="cyan_400">#26c6da</color> - <color name="cyan_500">#00bcd4</color> - <color name="cyan_600">#00acc1</color> - <color name="cyan_700">#0097a7</color> - <color name="cyan_800">#00838f</color> - <color name="cyan_900">#006064</color> - <color name="cyan_A100">#84ffff</color> - <color name="cyan_A200">#18ffff</color> - <color name="cyan_A400">#00e5ff</color> - <color name="cyan_A700">#00b8d4</color> - - <color name="teal_50">#e0f2f1</color> - <color name="teal_100">#b2dfdb</color> - <color name="teal_200">#80cbc4</color> - <color name="teal_300">#4db6ac</color> - <color name="teal_400">#26a69a</color> - <color name="teal_500">#9688</color> - <color name="teal_600">#00897b</color> - <color name="teal_700">#00796b</color> - <color name="teal_800">#00695c</color> - <color name="teal_900">#004d40</color> - <color name="teal_A100">#a7ffeb</color> - <color name="teal_A200">#64ffda</color> - <color name="teal_A400">#1de9b6</color> - <color name="teal_A700">#00bfa5</color> - - <color name="green_50">#d0f8ce</color> - <color name="green_100">#a3e9a4</color> - <color name="green_200">#72d572</color> - <color name="green_300">#42bd41</color> - <color name="green_400">#2baf2b</color> - <color name="green_500">#259b24</color> - <color name="green_600">#0a8f08</color> - <color name="green_700">#0a7e07</color> - <color name="green_800">#056f00</color> - <color name="green_900">#0d5302</color> - <color name="green_A100">#a2f78d</color> - <color name="green_A200">#5af158</color> - <color name="green_A400">#14e715</color> - <color name="green_A700">#12c700</color> - - <color name="light_green_50">#f1f8e9</color> - <color name="light_green_100">#dcedc8</color> - <color name="light_green_200">#c5e1a5</color> - <color name="light_green_300">#aed581</color> - <color name="light_green_400">#9ccc65</color> - <color name="light_green_500">#8bc34a</color> - <color name="light_green_600">#7cb342</color> - <color name="light_green_700">#689f38</color> - <color name="light_green_800">#558b2f</color> - <color name="light_green_900">#33691e</color> - <color name="light_green_A100">#ccff90</color> - <color name="light_green_A200">#b2ff59</color> - <color name="light_green_A400">#76ff03</color> - <color name="light_green_A700">#64dd17</color> - - <color name="lime_50">#f9fbe7</color> - <color name="lime_100">#f0f4c3</color> - <color name="lime_200">#e6ee9c</color> - <color name="lime_300">#dce775</color> - <color name="lime_400">#d4e157</color> - <color name="lime_500">#cddc39</color> - <color name="lime_600">#c0ca33</color> - <color name="lime_700">#afb42b</color> - <color name="lime_800">#9e9d24</color> - <color name="lime_900">#827717</color> - <color name="lime_A100">#f4ff81</color> - <color name="lime_A200">#eeff41</color> - <color name="lime_A400">#c6ff00</color> - <color name="lime_A700">#aeea00</color> - - <color name="yellow_50">#fffde7</color> - <color name="yellow_100">#fff9c4</color> - <color name="yellow_200">#fff59d</color> - <color name="yellow_300">#fff176</color> - <color name="yellow_400">#ffee58</color> - <color name="yellow_500">#ffeb3b</color> - <color name="yellow_600">#fdd835</color> - <color name="yellow_700">#fbc02d</color> - <color name="yellow_800">#f9a825</color> - <color name="yellow_900">#f57f17</color> - <color name="yellow_A100">#ffff8d</color> - <color name="yellow_A200">#ffff00</color> - <color name="yellow_A400">#ffea00</color> - <color name="yellow_A700">#ffd600</color> - - <color name="amber_50">#fff8e1</color> - <color name="amber_100">#ffecb3</color> - <color name="amber_200">#ffe082</color> - <color name="amber_300">#ffd54f</color> - <color name="amber_400">#ffca28</color> - <color name="amber_500">#ffc107</color> - <color name="amber_600">#ffb300</color> - <color name="amber_700">#ffa000</color> - <color name="amber_800">#ff8f00</color> - <color name="amber_900">#ff6f00</color> - <color name="amber_A100">#ffe57f</color> - <color name="amber_A200">#ffd740</color> - <color name="amber_A400">#ffc400</color> - <color name="amber_A700">#ffab00</color> - - <color name="orange_50">#fff3e0</color> - <color name="orange_100">#ffe0b2</color> - <color name="orange_200">#ffcc80</color> - <color name="orange_300">#ffb74d</color> - <color name="orange_400">#ffa726</color> - <color name="orange_500">#ff9800</color> - <color name="orange_600">#fb8c00</color> - <color name="orange_700">#f57c00</color> - <color name="orange_800">#ef6c00</color> - <color name="orange_900">#e65100</color> - <color name="orange_A100">#ffd180</color> - <color name="orange_A200">#ffab40</color> - <color name="orange_A400">#ff9100</color> - <color name="orange_A700">#ff6d00</color> - - <color name="deep_orange_50">#fbe9e7</color> - <color name="deep_orange_100">#ffccbc</color> + <color name="blue_grey_50">#eceff1</color> + <color name="blue_grey_500">#607d8b</color> + <color name="blue_grey_200">#b0bec5</color> + <color name="blue_grey_700">#455a64</color> + <color name="blue_grey_900">#263238</color> <color name="deep_orange_200">#ffab91</color> - <color name="deep_orange_300">#ff8a65</color> - <color name="deep_orange_400">#ff7043</color> - <color name="deep_orange_500">#ff5722</color> - <color name="deep_orange_600">#f4511e</color> - <color name="deep_orange_700">#e64a19</color> - <color name="deep_orange_800">#d84315</color> - <color name="deep_orange_900">#bf360c</color> - <color name="deep_orange_A100">#ff9e80</color> - <color name="deep_orange_A200">#ff6e40</color> - <color name="deep_orange_A400">#ff3d00</color> - <color name="deep_orange_A700">#dd2c00</color> - - <color name="brown_50">#efebe9</color> - <color name="brown_100">#d7ccc8</color> - <color name="brown_200">#bcaaa4</color> - <color name="brown_300">#a1887f</color> - <color name="brown_400">#8d6e63</color> - <color name="brown_500">#795548</color> - <color name="brown_600">#6d4c41</color> - <color name="brown_700">#5d4037</color> - <color name="brown_800">#4e342e</color> - <color name="brown_900">#3e2723</color> - - <color name="grey_50">#fafafa</color> - <color name="grey_100">#f5f5f5</color> - <color name="grey_200">#eeeeee</color> <color name="grey_300">#e0e0e0</color> - <color name="grey_400">#bdbdbd</color> <color name="grey_500">#9e9e9e</color> <color name="grey_600">#757575</color> - <color name="grey_700">#616161</color> - <color name="grey_800">#424242</color> - <color name="grey_900">#212121</color> - <color name="grey_black_1000">#000000</color> <color name="grey_white_1000">#ffffff</color> - - <color name="blue_grey_50">#eceff1</color> - <color name="blue_grey_100">#cfd8dc</color> - <color name="blue_grey_200">#b0bec5</color> - <color name="blue_grey_300">#90a4ae</color> - <color name="blue_grey_400">#78909c</color> - <color name="blue_grey_500">#607d8b</color> - <color name="blue_grey_600">#546e7a</color> - <color name="blue_grey_700">#455a64</color> - <color name="blue_grey_800">#37474f</color> - <color name="blue_grey_900">#263238</color> + <color name="grey_black_1000">#000000</color> + <color name="teal_900">#004d40</color> + <color name="teal_A700">#00bfa5</color> </resources> diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml deleted file mode 100644 index 830f4848..00000000 --- a/app/src/main/res/values/refs.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <!-- - Layout alias to replace the single-pane version of the layout with a - two-pane version on Large screens. - - For more on layout aliases, see: - http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters - --> -</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 51b23002..6003c585 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,11 +3,8 @@ <!-- Activity names --> <string name="app_name">Password Store</string> - <string name="activity_clone_name">Clone a Git repo</string> - <string name="clone_settings">Clone</string> <string name="action_settings">Settings</string> - <string name="hello_world">Hello world!</string> <string name="dialog_delete_title">Directory already exist</string> <string name="dialog_delete_msg">Target directory already exist. Current version support only a single store. Do you want to delete the current password store directory:</string> <string name="dialog_delete">Delete directory</string> @@ -19,24 +16,20 @@ <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string> <string name="store_git">/store/.git</string> <string name="key_dialog_text">You have to select your "PGP-Key ID" before initializing the repository</string> - <string name="connection_dialog_text">Which connection method do you prefer?</string> <string name="delete_dialog_text">Are you sure you want to delete the password /"</string> + <string name="move">Move</string> + <string name="edit">Edit</string> + <string name="delete">Delete</string> <!-- git commits --> - <string name="initialization_commit_text">[ANDROID PwdStore] Initialized store with keyID: </string> <string name="add_commit_text">[ANDROID PwdStore] Add  </string> - <string name="remove_commit_text">[ANDROID PwdStore] Remove  </string> <string name="edit_commit_text">[ANDROID PwdStore] Edit  </string> <string name="from_store">  from store.</string> <!-- PGPHandler --> <string name="provider_toast_text">No OpenPGP Provider selected!</string> - <string name="okc_progress_text">Waiting for OpenKeychain…</string> <string name="clipboard_password_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string> <string name="clipboard_username_toast_text">Username copied to clipboard</string> - <string name="name_settings_toast_text">Please set your account name in settings whenever you can</string> - <string name="account_settings_dialog_text">Please set your OpenKeychain account (email) in the preferences</string> - <string name="account_settings_dialog_title">Account name empty!</string> <string name="file_toast_text">Please provide a file name</string> <string name="empty_toast_text">You cannot use an empty password or empty extra content</string> @@ -46,7 +39,6 @@ <string name="jgit_error_dialog_text">Message from jgit: \n</string> <!-- Git Handler --> - <string name="read_only_dialog_text">You are about to use a read-only repository, you will not be able to push to it</string> <string name="forget_username_dialog_text">Did you forget to specify a username?</string> <string name="set_information_dialog_text">You have to set the information about the server before synchronizing with the server</string> <string name="ssh_preferences_dialog_text">Please import or generate your SSH key file in the preferences</string> @@ -58,7 +50,6 @@ <string name="password_dialog_text">Please provide the password for this repository</string> <!-- Clone fragment --> - <string name="clone_fragment_text">Welcome to Password Store\n\n In this screen you can either create a new repository or clone your git repository onto your device.</string> <string name="clone">Clone from server</string> <string name="initialize">Use local directory</string> @@ -86,15 +77,17 @@ <string name="git_user_email" translatable="false">Email</string> <string name="git_user_email_hint" translatable="false">email</string> <string name="invalid_email_dialog_text">Please enter a valid email address</string> + <string name="clone_button">Clone!</string> <!-- PGP Handler --> - <string name="title_activity_pgp_handler">PgpHandler</string> <string name="crypto_name_hint">name</string> <string name="crypto_pass_label">Password</string> <string name="crypto_extra_label">Extra</string> + <string name="crypto_select">Select</string> + <string name="crypto_cancel">Cancel</string> + <string name="crypto_save">Save</string> <!-- DECRYPT Layout --> - <string name="crypto_category">Category</string> <string name="action_search">Search</string> <string name="password">Password:</string> <string name="extra_content">Extra content:</string> @@ -106,12 +99,6 @@ <!-- Preferences --> <string name="pref_git_title">Git</string> - <string name="pref_server_title">Server</string> - <string name="pref_server_hint">server.com</string> - <string name="pref_remote_title">Remote location</string> - <string name="pref_remote_hint">path/to/repository</string> - <string name="pref_git_username_title">Username</string> - <string name="pref_git_username_hint">username</string> <string name="pref_edit_server_info">Edit git server settings</string> <string name="pref_edit_git_config">Edit git config</string> <string name="pref_ssh_title">Import SSH key</string> @@ -119,11 +106,8 @@ <string name="pref_ssh_see_key_title">View generated public SSH key</string> <string name="pref_git_delete_repo">Delete repository</string> <string name="pref_dialog_delete_title">Clear repository</string> - <string name="pref_dialog_delete_msg">Do you want to delete the current password store directory? This will not clear your configuration.</string> <string name="pref_crypto_title">Crypto</string> <string name="pref_provider_title">Select OpenPGP Provider</string> - <string name="pref_provider_account_title">Set your OpenPGP account</string> - <string name="pref_provider_account_hint">mail@somewhere.tld</string> <string name="pref_key_title">Select OpenPGP Key id</string> <string name="pref_general_title">General</string> <string name="pref_password_title">Password Show Time</string> @@ -141,7 +125,6 @@ <string name="pref_autofill_enable_msg2">Once the service is on, a dialog will appear when you click on a password field in an app if a matching password for the app exists.</string> <string name="pref_autofill_enable_msg3">Password Store attempts to match apps with passwords automatically. You can change this default setting and also matching settings per-app.</string> <string name="pref_autofill_apps_title">App and website settings</string> - <string name="pref_autofill_apps_hint">Customize autofill settings for specific apps.</string> <string name="pref_autofill_default_title">Automatically match by default</string> <string name="pref_autofill_default_hint">Default to \'Automatically match\' for apps without custom settings. Otherwise, \'Never match.\'</string> <string name="pref_autofill_always_title">Always show dialog</string> @@ -152,6 +135,12 @@ <string name="pref_external_repository">External repository</string> <string name="pref_external_repository_summary">Use an external password repository</string> <string name="pref_select_external_repository">Select external repository</string> + <string name="prefs_use_default_file_picker">Use default file picker</string> + <string name="prefs_clear_after_copy_title">Automatically clear the clipboard after copy</string> + <string name="prefs_clear_after_copy_summary">After an automatic copy or a manual copy of the password, the clipboard will be automatically cleared.</string> + <string name="prefs_export_passwords_title">Export Passwords</string> + <string name="prefs_export_passwords_summary">Exports the encrypted passwords to an external directory</string> + <string name="prefs_version">Version</string> <!-- pwgen fragment --> <string name="pwgen_generate">Generate</string> @@ -187,13 +176,10 @@ <string name="show_password_pref_summary">Control the visibility of the passwords once decrypted, this does not disable the password copy</string> <string name="show_extra_content_pref_title">Show extra content</string> <string name="show_extra_content_pref_summary">Control the visibility of the extra content once decrypted</string> - <string name="toast_password_copied">Password copied into the clipboard</string> <string name="pwd_generate_button">Generate</string> - <string name="category_string">"Category: "</string> <!-- Autofill --> <string name="autofill_description">Autofills password fields in apps. Only works for Android versions 4.3 and up. Does not rely on the clipboard for Android versions 5.0 and up.</string> - <string name="autofill_fill">Fill</string> <string name="autofill_apps_default">Use default setting</string> <string name="autofill_apps_first">Automatically match</string> <string name="autofill_apps_match_ellipsis">Match with…</string> @@ -203,9 +189,8 @@ <string name="autofill_pick">Pick…</string> <string name="autofill_pick_and_match">Pick and match…</string> <string name="refresh_list">Refresh list</string> - <string name="settings">Settings</string> <string name="no_repo_selected">No external repository selected</string> - <string name="no_repo_selected2">No external repository selected</string> <string name="send_plaintext_password_to">Send password as plaintext using…</string> <string name="show_password">Show password</string> + <string name="repository_uri">Repository URI</string> </resources> |
