diff options
| author | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
|---|---|---|
| committer | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
| commit | ba1ef7a38e1d923d1e0e31f0e16528649df41af8 (patch) | |
| tree | b4501c25bb06b084f324f525a6ab2dfe5037aa78 /app/src/main/res | |
| parent | a782c3f83e6f40ad24f6ffbb3fa5b0d5b4f409f5 (diff) | |
| parent | 893e0ce89daaa39f1157298c6a8dd10b7e98eceb (diff) | |
Merge branch 'upstream' into webview
Conflicts:
app/build.gradle
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values-cs/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 17 |
3 files changed, 19 insertions, 2 deletions
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e17f3f17..e668f5d1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -9,7 +9,7 @@ <string name="action_settings">Nastavení</string> <string name="hello_world">Hello world!</string> <string name="dialog_delete_title">Adresář již existuje</string> - <string name="dialog_delete_msg">Cílový adresář již existuje. Aktuální verze podporuje pouze jedno úložiště. Opravdu smazat aktuální adresář úložiště hesel?</string> + <string name="dialog_delete_msg">Cílový adresář již existuje. Aktuální verze podporuje pouze jedno úložiště. Opravdu smazat aktuální adresář úložiště hesel:</string> <string name="dialog_delete">Smazat adresář</string> <string name="dialog_do_not_delete">Zrušit</string> <string name="title_activity_git_clone">Informace repozitáře</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d19d545b..ba134174 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,7 +9,7 @@ <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_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> <string name="dialog_do_not_delete">Cancel</string> <string name="title_activity_git_clone">Repository information</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3fffef42..fc592058 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -13,4 +13,21 @@ <style name="ActionMode" parent="@style/Widget.AppCompat.ActionMode"> <item name="background">@color/blue_grey_700</item> </style> + + <!-- You can also inherit from NNF_BaseTheme.Light --> + <style name="FilePickerTheme" parent="NNF_BaseTheme"> + <!-- Set these to match your theme --> + <item name="colorPrimary">@color/blue_grey_500</item> + <item name="colorPrimaryDark">@color/blue_grey_700</item> + <item name="colorAccent">@color/teal_A700</item> + + <!-- Need to set this also to style create folder dialog --> + <item name="alertDialogTheme">@style/FilePickerAlertDialogTheme</item> + </style> + + <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert"> + <item name="colorPrimary">@color/blue_grey_500</item> + <item name="colorPrimaryDark">@color/blue_grey_700</item> + <item name="colorAccent">@color/teal_A700</item> + </style> </resources> |