diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt
index 3f488bf7efebdf6b67aba8ab60651e6f54b24caf..4217d52816e1da65c8f16869702cc411c72c0dde 100644
--- a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt
+++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt
@@ -46,7 +46,7 @@ class EeloAuthenticatorFragment : Fragment() {
v.lifecycleOwner = this
v.model = model
- v.root.urlpwd_other_account_title_panel.setOnClickListener() { expandCollapse() }
+ v.root.server_toggle_button.setOnClickListener() { expandCollapse() }
v.root.urlpwd_user_name.setOnFocusChangeListener() { v, hasFocus ->
if (!hasFocus) {
@@ -60,7 +60,7 @@ class EeloAuthenticatorFragment : Fragment() {
}
}
- v.login.setOnClickListener { login() }
+ v.root.sign_in.setOnClickListener { login() }
// code below is to draw toggle button in its correct state and show or hide server url input field
//add by Vincent, 18/02/2019
@@ -69,15 +69,15 @@ class EeloAuthenticatorFragment : Fragment() {
}
//This allow the button to be redraw in the correct state if user turn screen
- if (toggleButtonState == true) {
- v.root.expand_collapse_button.setChecked(toggleButtonState)
+ if (toggleButtonState) {
+ v.root.server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_less), null)
v.root.urlpwd_server_uri_layout.setVisibility(View.VISIBLE)
v.root.urlpwd_server_uri.setEnabled(true)
} else {
+ v.root.server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_more), null)
v.root.urlpwd_server_uri_layout.setVisibility(View.GONE)
v.root.urlpwd_server_uri.setEnabled(false)
}
-
return v.root
}
@@ -154,18 +154,17 @@ class EeloAuthenticatorFragment : Fragment() {
* Show/Hide panel containing server's uri input field.
*/
private fun expandCollapse() {
- //inverse state of Toggle button
- expand_collapse_button.setChecked(!expand_collapse_button.isChecked())
-
- if (expand_collapse_button.isChecked) {
- urlpwd_server_uri_layout.setVisibility(View.VISIBLE)
- urlpwd_server_uri.setEnabled(true)
- toggleButtonState = true;
- } else {
- urlpwd_server_uri_layout.setVisibility(View.GONE)
- urlpwd_server_uri.setEnabled(false)
- toggleButtonState = false;
- }
+ if (!toggleButtonState) {
+ server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_less), null)
+ urlpwd_server_uri_layout.setVisibility(View.VISIBLE)
+ urlpwd_server_uri.setEnabled(true)
+ toggleButtonState = true
+ } else {
+ server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_more), null)
+ urlpwd_server_uri_layout.setVisibility(View.GONE)
+ urlpwd_server_uri.setEnabled(false)
+ toggleButtonState = false
+ }
}
}
diff --git a/app/src/main/res/color/edittext.xml b/app/src/main/res/color/edittext.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3bccb0b2ef8f5afd635baa303e89887a84c6e33e
--- /dev/null
+++ b/app/src/main/res/color/edittext.xml
@@ -0,0 +1,13 @@
+
+
+
+
+