aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2020-01-28 01:49:37 +0530
committerGitHub <noreply@github.com>2020-01-28 01:49:37 +0530
commitf295e97de6a9b7005e3fd6425296a5cd9d37af6b (patch)
treeee8dae97a03bf07f0890869429376df1adba8669 /app/src/main/res/values
parentab5aebeda3388ec776c34130cf9039ae4f623562 (diff)
downloadHardenedPass-f295e97de6a9b7005e3fd6425296a5cd9d37af6b.tar.gz
HardenedPass-f295e97de6a9b7005e3fd6425296a5cd9d37af6b.zip
Allow creating folders (#623)
* Introduce EmitExpandableTransformationBehaviour * Implement expand transition * More folder work * Add icons and tweak layout clipping Rishi again with the icon rescue * Theming rework * Dont set tag * Update list and commit after creating folder * Fix theme issues * Add dialog title * Fix hint text color * Remove commit method * Cleanup * Update CHANGELOG Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com> Co-authored-by: Aditya Wasan <adityawasan55@gmail.com>
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/attrs.xml3
-rw-r--r--app/src/main/res/values/colors.xml2
-rw-r--r--app/src/main/res/values/dimens.xml3
-rw-r--r--app/src/main/res/values/strings.xml3
-rw-r--r--app/src/main/res/values/styles.xml21
5 files changed, 14 insertions, 18 deletions
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index aa02723f..913b7a4d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <declare-styleable name="PasswordIconStyle">
- <attr name="passwordIconColor" format="reference|color" />
- </declare-styleable>
<declare-styleable name="Multiselected">
<attr name="state_multiselected" format="boolean"/>
</declare-styleable>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ec75b5b6..48d1a7a3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
<color name="secondary_dark_color">#c63f17</color>
<color name="primary_text_color">#212121</color>
<color name="secondary_text_color">#ffffff</color>
+ <color name="white">#ffffffff</color>
<!-- Theme variables -->
<color name="window_background">#eceff1</color>
@@ -17,4 +18,5 @@
<color name="color_control_normal">@color/primary_text_color</color>
<color name="color_surface">#FFFFFF</color>
<color name="list_multiselect_background">#668eacbb</color>
+ <color name="status_bar_color">@color/primary_dark_color</color>
</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8a517840..15c6287c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,5 +2,6 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
- <dimen name="fab_compat_margin">0dp</dimen>
+ <dimen name="fab_compat_margin">16dp</dimen>
+ <dimen name="fab_margin">8dp</dimen>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7ffa3e9..c1827ac9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
<!-- git commits -->
<string name="git_commit_add_text">Add password for %1$s using android password store.</string>
<string name="git_commit_edit_text">"Edit %1$s using android password store."</string>
+ <string name="git_commit_folder_text">"Folder %1$s created using android password store."</string>
<string name="git_commit_remove_text">"Remove %1$s from store."</string>
<string name="git_commit_move_text">"Rename %1$s to %2$s."</string>
<string name="git_commit_increment_text">"Increment HOTP counter for %1$s."</string>
@@ -278,4 +279,6 @@
<string name="error_generate_ssh_key">Error while trying to generate the ssh-key</string>
<string name="pref_show_hidden_title">Show hidden folders</string>
<string name="pref_show_hidden_summary">Include hidden directories in the password list</string>
+ <string name="title_create_folder">Create folder</string>
+ <string name="button_create">Create</string>
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ad6a61ff..e6312175 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
@@ -7,20 +7,15 @@
<item name="colorPrimaryDark">@color/primary_color</item>
<item name="colorPrimaryVariant">@color/primary_light_color</item>
<item name="colorSecondary">@color/secondary_color</item>
- <item name="colorOnSecondary">@android:color/white</item>
- <item name="colorSurface">@color/color_surface</item>
+ <item name="colorOnSecondary">@color/white</item>
+ <item name="colorSurface">@color/window_background</item>
+ <item name="android:textColor">@color/primary_text_color</item>
<item name="colorOnSurface">@color/color_control_normal</item>
<item name="colorControlNormal">@color/color_control_normal</item>
- <item name="passwordIconColor">@color/password_icon_color</item>
- <item name="android:colorBackground">@color/window_background</item>
- <item name="colorBackgroundFloating">@color/primary_dark_color</item>
+ <item name="android:colorBackgroundFloating">@color/primary_color</item>
+ <item name="android:statusBarColor">@color/status_bar_color</item>
+ <item name="android:windowLightStatusBar">@bool/light_status_bar</item>
<item name="android:windowBackground">@color/window_background</item>
- <item name="android:textColorPrimary">@color/primary_text_color</item>
- <item name="android:textColor">@color/primary_text_color</item>
- <item name="android:statusBarColor">@color/primary_dark_color</item>
- <item name="android:navigationBarColor">@android:color/black</item>
- <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/light_status_bar</item>
- <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/light_navigation_bar</item>
<item name="actionModeStyle">@style/ActionMode</item>
<item name="alertDialogTheme">@style/AppTheme.Dialog</item>
<item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
@@ -38,9 +33,7 @@
</style>
<style name="TextInputLayoutBase" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
- <item name="boxBackgroundColor">?android:attr/windowBackground</item>
<item name="boxStrokeColor">?attr/colorSecondary</item>
<item name="hintTextColor">?attr/colorOnPrimary</item>
</style>
-
</resources>