add missing state handling for amount input

give more space to currency spinner for original amount

myExpenses/src/main/java/org/totschnig/myexpenses/ui/AmountInput.java

@@ -4,10 +4,13 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
+import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -96,6 +99,7 @@ private void init(@Nullable AttributeSet attrs) {
  @Override
  public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
  View view = super.getView(position, convertView, parent);
+ view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), 0, view.getPaddingBottom());
  ((TextView) view).setText(getItem(position).code());
  return view;
  }
@@ -244,9 +248,9 @@ protected Host getHost() {
  Context context = getContext();
  while (context instanceof android.content.ContextWrapper) {
  if (context instanceof Host) {
- return (Host)context;
+ return (Host) context;
  }
- context = ((ContextWrapper)context).getBaseContext();
+ context = ((ContextWrapper) context).getBaseContext();
  }
  throw new IllegalStateException("Host context does not implement interface");
  }
@@ -263,4 +267,81 @@ public void setOnFocusChangeListener(OnFocusChangeListener l) {
  currencySpinner.setOnFocusChangeListener(l);
  calculator.setOnFocusChangeListener(l);
  }
+
+ @Override
+ protected Parcelable onSaveInstanceState() {
+ Parcelable superState = super.onSaveInstanceState();
+ return new SavedState(superState, typeButton.onSaveInstanceState(), amountEditText.onSaveInstanceState(), currencySpinner.onSaveInstanceState());
+ }
+
+ @Override
+ protected void onRestoreInstanceState(Parcelable state) {
+ SavedState savedState = (SavedState) state;
+ super.onRestoreInstanceState(savedState.getSuperState());
+ typeButton.onRestoreInstanceState(savedState.getTypeButtonState());
+ amountEditText.onRestoreInstanceState(savedState.getAmountEditTextState());
+ currencySpinner.onRestoreInstanceState(savedState.getCurrencySpinnerState());
+ }
+
+ @Override
+ protected void dispatchSaveInstanceState(SparseArray<Parcelable> container) {
+ super.dispatchFreezeSelfOnly(container);
+ }
+
+ @Override
+ protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
+ super.dispatchThawSelfOnly(container);
+ }
+
+ static class SavedState extends BaseSavedState {
+ private Parcelable typeButtonState;
+ private Parcelable amountEditTextState;
+ private Parcelable currencySpinnerState;
+
+ private SavedState(Parcel in) {
+ super(in);
+ final ClassLoader classLoader = getClass().getClassLoader();
+ this.typeButtonState = in.readParcelable(classLoader);
+ this.amountEditTextState = in.readParcelable(classLoader);
+ this.currencySpinnerState = in.readParcelable(classLoader);
+ }
+
+ SavedState(Parcelable superState, Parcelable typeButtonState, Parcelable amountEditTextState, Parcelable currencySpinnerState) {
+ super(superState);
+ this.typeButtonState = typeButtonState;
+ this.amountEditTextState = amountEditTextState;
+ this.currencySpinnerState = currencySpinnerState;
+ }
+
+ @Override
+ public void writeToParcel(Parcel destination, int flags) {
+ super.writeToParcel(destination, flags);
+ destination.writeParcelable(typeButtonState, flags);
+ destination.writeParcelable(amountEditTextState, flags);
+ destination.writeParcelable(currencySpinnerState, flags);
+ }
+
+ public static final Parcelable.Creator<SavedState> CREATOR = new Creator<SavedState>() {
+
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
+
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
+
+ Parcelable getTypeButtonState() {
+ return typeButtonState;
+ }
+
+ Parcelable getAmountEditTextState() {
+ return amountEditTextState;
+ }
+
+ Parcelable getCurrencySpinnerState() {
+ return currencySpinnerState;
+ }
+ }
 }

myExpenses/src/main/res/layout/amount_input.xml

@@ -21,19 +21,17 @@
 
  <Spinner
  android:id="@+id/AmountCurrency"
- style="@style/FormField"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_gravity="center_vertical"
- android:layout_weight="1"
  android:prompt="@string/currency"/>
 
  <org.totschnig.myexpenses.ui.AmountEditText
  android:id="@+id/AmountEditText"
  android:layout_width="0dp"
  android:layout_height="wrap_content"
  android:layout_gravity="center_vertical"
- android:layout_weight="2"/>
+ android:layout_weight="1"/>
 
- <include layout="@layout/calc_icon" />
+ <include layout="@layout/calc_icon"/>
 </merge>