From 790b7c94d3277e273db1d71fcd15ceebbe2da722 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 23 May 2021 14:04:01 +0530
Subject: Tweak git server config screen UI and remove unused resources (#1419)

* themes: tweak Chip text appearance

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* app: tweak git server settings UI

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* app: remove unused resources

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/src/main/res/values/dimens.xml  | 1 -
 app/src/main/res/values/strings.xml | 7 -------
 app/src/main/res/values/styles.xml  | 6 +-----
 app/src/main/res/values/themes.xml  | 1 +
 4 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8923fc3f..915bd69d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,7 +10,6 @@
   <dimen name="fab_compat_margin">16dp</dimen>
   <dimen name="normal_margin">8dp</dimen>
   <dimen name="bottom_sheet_item_height">56dp</dimen>
-  <dimen name="toggle_group_text_size">14sp</dimen>
   <dimen name="onboarding_icon_margin_top">100dp</dimen>
   <dimen name="onboarding_button_margin_top">140dp</dimen>
   <dimen name="onboarding_desc_margin_top">48dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb736dc8..d608e3c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,7 +53,6 @@
   <string name="clipboard_password_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string>
   <string name="clipboard_password_no_clear_toast_text">Password copied to clipboard</string>
   <string name="clipboard_copied_text">Copied to clipboard</string>
-  <string name="clipboard_otp_copied_text">OTP code copied to clipboard</string>
   <string name="file_toast_text">Please provide a file name</string>
   <string name="path_toast_text">Please provide a file path</string>
   <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
@@ -77,7 +76,6 @@
   <string name="external_repository_dialog_title">Choose where to store the passwords</string>
   <string name="external_repository_dialog_text">You must select a directory where to store your passwords. If you want to store your passwords within the hidden storage of the application, cancel this dialog and disable the \"External Repository\" option.</string>
 
-  <string name="server_name">Server</string>
   <string name="server_url">Repository URL</string>
   <string name="server_branch">Branch</string>
 
@@ -101,13 +99,10 @@
   <!-- DECRYPT Layout -->
   <string name="action_search">Search</string>
   <string name="password">Password</string>
-  <string name="otp">OTP</string>
-  <string name="extra_content">Extra content:</string>
   <string name="username">Username</string>
   <string name="edit_password">Edit password</string>
   <string name="copy_password">Copy password</string>
   <string name="share_as_plaintext">Share as plaintext</string>
-  <string name="last_changed">Last changed %s</string>
 
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repository</string>
@@ -219,8 +214,6 @@
   <string name="git_log">Show commit log</string>
   <string name="show_password_pref_title">Show the password</string>
   <string name="show_password_pref_summary">Control the visibility of the passwords once decrypted. This does not disable copying to clipboard.</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="pwd_generate_button">Generate</string>
   <string name="refresh_list">Refresh list</string>
   <string name="send_plaintext_password_to">Send password as plaintext using…</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d354799b..e9c14449 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,11 +39,7 @@
     <item name="chipSurfaceColor">@color/chip_surface_color</item>
     <item name="android:textColor">@color/chip_text_color</item>
     <item name="shapeAppearanceOverlay">@style/ShapeAppearance.AppTheme.SmallComponent</item>
-    <item name="textAppearanceBody2">@style/TextAppearance.AppTheme.Body2</item>
-  </style>
-
-  <style name="TextAppearance.AppTheme.Body2" parent="TextAppearance.MaterialComponents.Body2">
-    <item name="android:textStyle">bold</item>
+    <item name="android:textAppearance">?attr/textAppearanceButton</item>
   </style>
 
   <style name="ShapeAppearance.AppTheme.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5891d019..3ed910fe 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -28,6 +28,7 @@
     <item name="materialButtonOutlinedStyle">@style/AppTheme.OutlinedButton</item>
     <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
     <item name="textInputStyle">@style/AppTheme.TextInputLayout</item>
+    <item name="chipStyle">@style/AppTheme.Chip.Choice</item>
   </style>
 
   <style name="AppTheme" parent="APSTheme" />
-- 
cgit v1.2.3