Fixed that AddAccountDialog's AutoCompleteTextView's ListView covers keyboard so that banks get accidently selected; Also made Dialogs scrollable so that parts out of screen can be scrolled into view when keyboard is displayed
This commit is contained in:
dankl
parent
1c885a852e
commit
b7de25c4c6
|
|
@ -42,7 +42,7 @@ open class AddAccountDialog : DialogFragment() {
|
||||||
// presenter.preloadBanksAsync()
|
// presenter.preloadBanksAsync()
|
||||||
this.adapter = BankListAdapter(presenter)
|
this.adapter = BankListAdapter(presenter)
|
||||||
|
|
||||||
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.Dialog
|
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.FloatingDialog
|
||||||
setStyle(STYLE_NORMAL, style)
|
setStyle(STYLE_NORMAL, style)
|
||||||
|
|
||||||
show(activity.supportFragmentManager, DialogTag)
|
show(activity.supportFragmentManager, DialogTag)
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ open class EnterAtcDialog : DialogFragment() {
|
||||||
this.tanMedium = tanMedium
|
this.tanMedium = tanMedium
|
||||||
this.atcEnteredCallback = atcEnteredCallback
|
this.atcEnteredCallback = atcEnteredCallback
|
||||||
|
|
||||||
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.Dialog
|
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.FloatingDialog
|
||||||
setStyle(STYLE_NORMAL, style)
|
setStyle(STYLE_NORMAL, style)
|
||||||
|
|
||||||
show(activity.supportFragmentManager, DialogTag)
|
show(activity.supportFragmentManager, DialogTag)
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ open class EnterTanDialog : DialogFragment() {
|
||||||
this.presenter = presenter
|
this.presenter = presenter
|
||||||
this.tanEnteredCallback = tanEnteredCallback
|
this.tanEnteredCallback = tanEnteredCallback
|
||||||
|
|
||||||
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.Dialog
|
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.FloatingDialog
|
||||||
setStyle(STYLE_NORMAL, style)
|
setStyle(STYLE_NORMAL, style)
|
||||||
|
|
||||||
show(activity.supportFragmentManager, DialogTag)
|
show(activity.supportFragmentManager, DialogTag)
|
||||||
|
|
@ -116,7 +116,7 @@ open class EnterTanDialog : DialogFragment() {
|
||||||
// TODO: find a way to update account.tanMedia afterwards
|
// TODO: find a way to update account.tanMedia afterwards
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: what to do if newActiveTanMedium.originalObject is not of type TanGeneratorTanMedium?
|
// TODO: ensure that only TanGeneratorTanMedium instances get added to spinner?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ open class TransferMoneyDialog : DialogFragment() {
|
||||||
this.preselectedBankAccount = preselectedBankAccount
|
this.preselectedBankAccount = preselectedBankAccount
|
||||||
this.preselectedValues = preselectedValues
|
this.preselectedValues = preselectedValues
|
||||||
|
|
||||||
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.Dialog
|
val style = if(fullscreen) R.style.FullscreenDialogWithStatusBar else R.style.FloatingDialog
|
||||||
setStyle(STYLE_NORMAL, style)
|
setStyle(STYLE_NORMAL, style)
|
||||||
|
|
||||||
show(activity.supportFragmentManager, DialogTag)
|
show(activity.supportFragmentManager, DialogTag)
|
||||||
|
|
|
||||||
|
|
@ -1,98 +1,106 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:padding="@dimen/dialog_enter_atc_padding"
|
|
||||||
>
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtAtcExplanationToShowToUser"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_enter_atc_enter_value_field_height"
|
|
||||||
android:layout_marginBottom="@dimen/dialog_enter_atc_enter_value_field_margin_bottom"
|
|
||||||
>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:text="@string/dialog_enter_atc_tan_label"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/edtxtEnteredTan"
|
|
||||||
android:layout_width="@dimen/dialog_enter_atc_enter_value_field_value_width"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_marginLeft="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
|
||||||
android:layout_marginStart="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
|
||||||
android:inputType="number"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="@dimen/dialog_enter_atc_enter_value_field_height"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginBottom="@dimen/dialog_enter_atc_enter_value_field_margin_bottom"
|
android:padding="@dimen/dialog_enter_atc_padding"
|
||||||
|
android:isScrollContainer="true"
|
||||||
|
>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:id="@+id/txtAtcExplanationToShowToUser"
|
||||||
android:layout_height="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:text="@string/dialog_enter_atc_atc_label"
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<EditText
|
<LinearLayout
|
||||||
android:id="@+id/edtxtEnteredAtc"
|
android:orientation="horizontal"
|
||||||
android:layout_width="@dimen/dialog_enter_atc_enter_value_field_value_width"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="@dimen/dialog_enter_atc_enter_value_field_height"
|
||||||
android:layout_marginLeft="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
android:layout_marginBottom="@dimen/dialog_enter_atc_enter_value_field_margin_bottom"
|
||||||
android:layout_marginStart="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
>
|
||||||
android:inputType="number"
|
|
||||||
/>
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:text="@string/dialog_enter_atc_tan_label"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/edtxtEnteredTan"
|
||||||
|
android:layout_width="@dimen/dialog_enter_atc_enter_value_field_value_width"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginLeft="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
||||||
|
android:layout_marginStart="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
||||||
|
android:inputType="number"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_enter_atc_enter_value_field_height"
|
||||||
|
android:layout_marginBottom="@dimen/dialog_enter_atc_enter_value_field_margin_bottom"
|
||||||
|
>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:text="@string/dialog_enter_atc_atc_label"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/edtxtEnteredAtc"
|
||||||
|
android:layout_width="@dimen/dialog_enter_atc_enter_value_field_value_width"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginLeft="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
||||||
|
android:layout_marginStart="@dimen/dialog_enter_atc_enter_value_field_value_margin_left"
|
||||||
|
android:inputType="number"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/lytButtonBar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnEnteringAtcDone"
|
||||||
|
android:layout_width="@dimen/dialog_enter_atc_buttons_width"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
style="?android:attr/buttonBarButtonStyle"
|
||||||
|
android:text="@android:string/ok"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnCancel"
|
||||||
|
android:layout_width="@dimen/dialog_enter_atc_buttons_width"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_toLeftOf="@+id/btnEnteringAtcDone"
|
||||||
|
android:layout_toStartOf="@+id/btnEnteringAtcDone"
|
||||||
|
style="?android:attr/buttonBarButtonStyle"
|
||||||
|
android:text="@string/cancel"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/lytButtonBar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnEnteringAtcDone"
|
|
||||||
android:layout_width="@dimen/dialog_enter_atc_buttons_width"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
style="?android:attr/buttonBarButtonStyle"
|
|
||||||
android:text="@android:string/ok"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnCancel"
|
|
||||||
android:layout_width="@dimen/dialog_enter_atc_buttons_width"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_toLeftOf="@+id/btnEnteringAtcDone"
|
|
||||||
android:layout_toStartOf="@+id/btnEnteringAtcDone"
|
|
||||||
style="?android:attr/buttonBarButtonStyle"
|
|
||||||
android:text="@string/cancel"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
@ -1,144 +1,152 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:orientation="vertical"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:padding="@dimen/dialog_enter_tan_padding"
|
||||||
android:padding="@dimen/dialog_enter_tan_padding"
|
android:isScrollContainer="true"
|
||||||
>
|
>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="@dimen/dialog_enter_tan_tan_procedure_height"
|
android:layout_height="match_parent"
|
||||||
android:gravity="center_vertical"
|
|
||||||
>
|
>
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:orientation="horizontal"
|
||||||
android:layout_height="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:text="@string/dialog_enter_tan_select_tan_procedure"
|
android:layout_height="@dimen/dialog_enter_tan_tan_procedure_height"
|
||||||
android:layout_marginRight="@dimen/dialog_enter_tan_tan_procedure_label_right_margin"
|
|
||||||
android:layout_marginEnd="@dimen/dialog_enter_tan_tan_procedure_label_right_margin"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:textSize="@dimen/dialog_enter_tan_tan_procedure_text_size"
|
>
|
||||||
/>
|
|
||||||
|
|
||||||
<Spinner
|
<TextView
|
||||||
android:id="@+id/spnTanProcedures"
|
android:layout_width="wrap_content"
|
||||||
android:layout_width="0dp"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:text="@string/dialog_enter_tan_select_tan_procedure"
|
||||||
android:layout_weight="1"
|
android:layout_marginRight="@dimen/dialog_enter_tan_tan_procedure_label_right_margin"
|
||||||
android:gravity="center_vertical"
|
android:layout_marginEnd="@dimen/dialog_enter_tan_tan_procedure_label_right_margin"
|
||||||
/>
|
android:gravity="center_vertical"
|
||||||
|
android:textSize="@dimen/dialog_enter_tan_tan_procedure_text_size"
|
||||||
|
/>
|
||||||
|
|
||||||
</LinearLayout>
|
<Spinner
|
||||||
|
android:id="@+id/spnTanProcedures"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
/>
|
||||||
|
|
||||||
<LinearLayout
|
</LinearLayout>
|
||||||
android:id="@+id/lytTanMedium"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_enter_tan_tan_medium_height"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:visibility="gone"
|
|
||||||
>
|
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:id="@+id/lytTanMedium"
|
||||||
android:layout_height="match_parent"
|
android:orientation="horizontal"
|
||||||
android:text="@string/dialog_enter_tan_select_tan_medium"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginRight="@dimen/dialog_enter_tan_tan_medium_label_right_margin"
|
android:layout_height="@dimen/dialog_enter_tan_tan_medium_height"
|
||||||
android:layout_marginEnd="@dimen/dialog_enter_tan_tan_medium_label_right_margin"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:textSize="@dimen/dialog_enter_tan_tan_medium_text_size"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Spinner
|
|
||||||
android:id="@+id/spnTanMedium"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
/>
|
android:visibility="gone"
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeView
|
|
||||||
android:id="@+id/flickerCodeView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:visibility="gone"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<net.dankito.banking.fints4java.android.ui.views.TanImageView
|
|
||||||
android:id="@+id/tanImageView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:visibility="gone"
|
|
||||||
/>
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtTanDescriptionToShowToUser"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:maxLines="6"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_enter_tan_enter_tan_height"
|
|
||||||
android:layout_marginBottom="@dimen/dialog_enter_tan_enter_tan_margin_bottom"
|
|
||||||
>
|
>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="@string/dialog_enter_tan_select_tan_medium"
|
||||||
|
android:layout_marginRight="@dimen/dialog_enter_tan_tan_medium_label_right_margin"
|
||||||
|
android:layout_marginEnd="@dimen/dialog_enter_tan_tan_medium_label_right_margin"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:textSize="@dimen/dialog_enter_tan_tan_medium_text_size"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spnTanMedium"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeView
|
||||||
|
android:id="@+id/flickerCodeView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:visibility="gone"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<net.dankito.banking.fints4java.android.ui.views.TanImageView
|
||||||
|
android:id="@+id/tanImageView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:visibility="gone"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:id="@+id/txtTanDescriptionToShowToUser"
|
||||||
android:layout_height="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_vertical"
|
android:maxLines="6"
|
||||||
android:text="@string/dialog_enter_tan_enter_tan"
|
/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_enter_tan_enter_tan_height"
|
||||||
|
android:layout_marginBottom="@dimen/dialog_enter_tan_enter_tan_margin_bottom"
|
||||||
|
>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:text="@string/dialog_enter_tan_enter_tan"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/edtxtEnteredTan"
|
android:id="@+id/edtxtEnteredTan"
|
||||||
android:layout_width="@dimen/dialog_enter_tan_enter_tan_width"
|
android:layout_width="@dimen/dialog_enter_tan_enter_tan_width"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginLeft="@dimen/dialog_enter_tan_enter_tan_margin_left"
|
android:layout_marginLeft="@dimen/dialog_enter_tan_enter_tan_margin_left"
|
||||||
android:layout_marginStart="@dimen/dialog_enter_tan_enter_tan_margin_left"
|
android:layout_marginStart="@dimen/dialog_enter_tan_enter_tan_margin_left"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/lytButtonBar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnEnteringTanDone"
|
||||||
|
android:layout_width="@dimen/dialog_enter_tan_buttons_width"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
style="?android:attr/buttonBarButtonStyle"
|
||||||
|
android:text="@android:string/ok"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnCancel"
|
||||||
|
android:layout_width="@dimen/dialog_enter_tan_buttons_width"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_toLeftOf="@+id/btnEnteringTanDone"
|
||||||
|
android:layout_toStartOf="@+id/btnEnteringTanDone"
|
||||||
|
style="?android:attr/buttonBarButtonStyle"
|
||||||
|
android:text="@string/cancel"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/lytButtonBar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnEnteringTanDone"
|
|
||||||
android:layout_width="@dimen/dialog_enter_tan_buttons_width"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
style="?android:attr/buttonBarButtonStyle"
|
|
||||||
android:text="@android:string/ok"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnCancel"
|
|
||||||
android:layout_width="@dimen/dialog_enter_tan_buttons_width"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_toLeftOf="@+id/btnEnteringTanDone"
|
|
||||||
android:layout_toStartOf="@+id/btnEnteringTanDone"
|
|
||||||
style="?android:attr/buttonBarButtonStyle"
|
|
||||||
android:text="@string/cancel"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
@ -1,168 +1,176 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:orientation="vertical"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:padding="@dimen/dialog_transfer_money_padding"
|
||||||
android:padding="@dimen/dialog_transfer_money_padding"
|
android:isScrollContainer="true"
|
||||||
>
|
>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/lytSelectBankAccount"
|
android:orientation="vertical"
|
||||||
android:orientation="horizontal"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
|
||||||
android:layout_marginBottom="@dimen/dialog_transfer_money_bank_accounts_margin_bottom"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:visibility="gone"
|
|
||||||
>
|
>
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:id="@+id/lytSelectBankAccount"
|
||||||
android:layout_height="match_parent"
|
android:orientation="horizontal"
|
||||||
android:text="@string/dialog_transfer_money_account"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginRight="@dimen/dialog_transfer_money_label_margin_right"
|
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
||||||
android:layout_marginEnd="@dimen/dialog_transfer_money_label_margin_right"
|
android:layout_marginBottom="@dimen/dialog_transfer_money_bank_accounts_margin_bottom"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
/>
|
android:visibility="gone"
|
||||||
|
>
|
||||||
|
|
||||||
<Spinner
|
<TextView
|
||||||
android:id="@+id/spnBankAccounts"
|
android:layout_width="wrap_content"
|
||||||
android:layout_width="0dp"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:text="@string/dialog_transfer_money_account"
|
||||||
android:layout_weight="1"
|
android:layout_marginRight="@dimen/dialog_transfer_money_label_margin_right"
|
||||||
android:gravity="center_vertical"
|
android:layout_marginEnd="@dimen/dialog_transfer_money_label_margin_right"
|
||||||
/>
|
android:gravity="center_vertical"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spnBankAccounts"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/dialog_transfer_money_remittee_name"
|
||||||
|
>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputEditText
|
||||||
|
android:id="@+id/edtxtRemitteeName"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
||||||
|
android:inputType="textPersonName"
|
||||||
|
>
|
||||||
|
|
||||||
|
<requestFocus />
|
||||||
|
</android.support.design.widget.TextInputEditText>
|
||||||
|
|
||||||
|
</android.support.design.widget.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/dialog_transfer_money_remittee_iban"
|
||||||
|
>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputEditText
|
||||||
|
android:id="@+id/edtxtRemitteeIban"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_transfer_money_autocomplete_fields_height"
|
||||||
|
android:inputType="text"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</android.support.design.widget.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/dialog_transfer_money_remittee_bank"
|
||||||
|
>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputEditText
|
||||||
|
android:id="@+id/edtxtRemitteeBank"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
||||||
|
android:inputType="text"
|
||||||
|
android:enabled="false"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</android.support.design.widget.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/dialog_transfer_money_remittee_bic"
|
||||||
|
>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputEditText
|
||||||
|
android:id="@+id/edtxtRemitteeBic"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
||||||
|
android:inputType="text"
|
||||||
|
android:enabled="false"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</android.support.design.widget.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/dialog_transfer_money_amount"
|
||||||
|
>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputEditText
|
||||||
|
android:id="@+id/edtxtAmount"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
||||||
|
android:inputType="numberDecimal"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</android.support.design.widget.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/dialog_transfer_money_usage"
|
||||||
|
>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputEditText
|
||||||
|
android:id="@+id/edtxtUsage"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
||||||
|
android:inputType="text"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</android.support.design.widget.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/lytButtonBar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnTransferMoney"
|
||||||
|
android:layout_width="@dimen/dialog_transfer_money_buttons_width"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
style="?android:attr/buttonBarButtonStyle"
|
||||||
|
android:text="@string/dialog_transfer_money_transfer"
|
||||||
|
android:enabled="false"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/btnCancel"
|
||||||
|
android:layout_width="@dimen/dialog_transfer_money_buttons_width"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_toLeftOf="@+id/btnTransferMoney"
|
||||||
|
android:layout_toStartOf="@+id/btnTransferMoney"
|
||||||
|
style="?android:attr/buttonBarButtonStyle"
|
||||||
|
android:text="@string/cancel"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
</ScrollView>
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:hint="@string/dialog_transfer_money_remittee_name"
|
|
||||||
>
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputEditText
|
|
||||||
android:id="@+id/edtxtRemitteeName"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
|
||||||
android:inputType="textPersonName"
|
|
||||||
>
|
|
||||||
|
|
||||||
<requestFocus />
|
|
||||||
</android.support.design.widget.TextInputEditText>
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:hint="@string/dialog_transfer_money_remittee_iban"
|
|
||||||
>
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputEditText
|
|
||||||
android:id="@+id/edtxtRemitteeIban"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_transfer_money_autocomplete_fields_height"
|
|
||||||
android:inputType="text"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:hint="@string/dialog_transfer_money_remittee_bank"
|
|
||||||
>
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputEditText
|
|
||||||
android:id="@+id/edtxtRemitteeBank"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
|
||||||
android:inputType="text"
|
|
||||||
android:enabled="false"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:hint="@string/dialog_transfer_money_remittee_bic"
|
|
||||||
>
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputEditText
|
|
||||||
android:id="@+id/edtxtRemitteeBic"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
|
||||||
android:inputType="text"
|
|
||||||
android:enabled="false"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:hint="@string/dialog_transfer_money_amount"
|
|
||||||
>
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputEditText
|
|
||||||
android:id="@+id/edtxtAmount"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
|
||||||
android:inputType="numberDecimal"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:hint="@string/dialog_transfer_money_usage"
|
|
||||||
>
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputEditText
|
|
||||||
android:id="@+id/edtxtUsage"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
|
|
||||||
android:inputType="text"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/lytButtonBar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnTransferMoney"
|
|
||||||
android:layout_width="@dimen/dialog_transfer_money_buttons_width"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
style="?android:attr/buttonBarButtonStyle"
|
|
||||||
android:text="@string/dialog_transfer_money_transfer"
|
|
||||||
android:enabled="false"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/btnCancel"
|
|
||||||
android:layout_width="@dimen/dialog_transfer_money_buttons_width"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_toLeftOf="@+id/btnTransferMoney"
|
|
||||||
android:layout_toStartOf="@+id/btnTransferMoney"
|
|
||||||
style="?android:attr/buttonBarButtonStyle"
|
|
||||||
android:text="@string/cancel"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
@ -30,6 +30,12 @@
|
||||||
<item name="itemIconPadding">@dimen/navigation_menu_icon_title_space</item>
|
<item name="itemIconPadding">@dimen/navigation_menu_icon_title_space</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<!-- TODO: simply use Dialog as soon as AndroidUtils 2.0.0 is out -->
|
||||||
|
<style name="FloatingDialog" parent="Dialog">
|
||||||
|
<!-- to prevent that keyboard covers dialog -->
|
||||||
|
<item name="android:windowSoftInputMode">adjustResize|stateHidden</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<!-- Floating Action Button -->
|
<!-- Floating Action Button -->
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue