X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=1ca52ddd371c7a6e32ad05b664ed781e1afb47f4;hb=684e2ca7c63cc4d5491b2dd0784d232e906e813a;hp=755c6f2b18ef85c4108416904cfa4e3d236d762b;hpb=9f00a4f3aadae187e9e62bac23c2a366fe32892c;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
index 755c6f2b..1ca52ddd 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -72,6 +72,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
      * represents.
      */
     public static final String ARG_ITEM_ID = "item_id";
+    public static final String ARG_HUE = "hue";
     @NonNls
     private static final String HTTPS_URL_START = "https://";
 
@@ -98,7 +99,6 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
     private MobileLedgerProfile.FutureDates futureDates;
     private View futureDatesLayout;
     private TextView apiVersionText;
-    private View apiVersionLayout;
     private SendTransactionTask.API apiVersion;
 
     /**
@@ -164,9 +164,9 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
             throw new AssertionError();
         profiles.set(index, newProfile);
 
-        ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance();
-        if (prva != null)
-            prva.notifyItemChanged(index);
+        ProfilesRecyclerViewAdapter viewAdapter = ProfilesRecyclerViewAdapter.getInstance();
+        if (viewAdapter != null)
+            viewAdapter.notifyItemChanged(index);
 
         if (mProfile.equals(Data.profile.getValue()))
             Data.profile.setValue(newProfile);
@@ -212,6 +212,12 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
                    menu.inflate(R.menu.future_dates);
                    menu.setOnMenuItemClickListener(item -> {
                        switch (item.getItemId()) {
+                           case R.id.menu_future_dates_7:
+                               futureDates = MobileLedgerProfile.FutureDates.OneWeek;
+                               break;
+                           case R.id.menu_future_dates_14:
+                               futureDates = MobileLedgerProfile.FutureDates.TwoWeeks;
+                               break;
                            case R.id.menu_future_dates_30:
                                futureDates = MobileLedgerProfile.FutureDates.OneMonth;
                                break;
@@ -238,32 +244,32 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
                    });
                    menu.show();
                });
-        apiVersionLayout = context.findViewById(R.id.api_version_layout);
         apiVersionText = context.findViewById(R.id.api_version_text);
-        apiVersionLayout.setOnClickListener(v -> {
-            MenuInflater mi = new MenuInflater(context);
-            PopupMenu menu = new PopupMenu(context, v);
-            menu.inflate(R.menu.api_version);
-            menu.setOnMenuItemClickListener(item -> {
-                switch (item.getItemId()) {
-                    case R.id.api_version_menu_html:
-                        apiVersion = SendTransactionTask.API.html;
-                        break;
-                    case R.id.api_version_menu_post_1_14:
-                        apiVersion = SendTransactionTask.API.post_1_14;
-                        break;
-                    case R.id.api_version_menu_pre_1_15:
-                        apiVersion = SendTransactionTask.API.pre_1_15;
-                        break;
-                    case R.id.api_version_menu_auto:
-                    default:
-                        apiVersion = SendTransactionTask.API.auto;
-                }
-                apiVersionText.setText(apiVersion.getDescription(getResources()));
-                return true;
-            });
-            menu.show();
-        });
+        context.findViewById(R.id.api_version_layout)
+               .setOnClickListener(v -> {
+                   MenuInflater mi = new MenuInflater(context);
+                   PopupMenu menu = new PopupMenu(context, v);
+                   menu.inflate(R.menu.api_version);
+                   menu.setOnMenuItemClickListener(item -> {
+                       switch (item.getItemId()) {
+                           case R.id.api_version_menu_html:
+                               apiVersion = SendTransactionTask.API.html;
+                               break;
+                           case R.id.api_version_menu_post_1_14:
+                               apiVersion = SendTransactionTask.API.post_1_14;
+                               break;
+                           case R.id.api_version_menu_pre_1_15:
+                               apiVersion = SendTransactionTask.API.pre_1_15;
+                               break;
+                           case R.id.api_version_menu_auto:
+                           default:
+                               apiVersion = SendTransactionTask.API.auto;
+                       }
+                       apiVersionText.setText(apiVersion.getDescription(getResources()));
+                       return true;
+                   });
+                   menu.show();
+               });
         authParams = context.findViewById(R.id.auth_params);
         useAuthentication = context.findViewById(R.id.enable_http_auth);
         userName = context.findViewById(R.id.auth_user_name);
@@ -294,7 +300,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
         hookClearErrorOnFocusListener(userName, userNameLayout);
         hookClearErrorOnFocusListener(password, passwordLayout);
 
-        int profileThemeId;
+        final int profileThemeId;
         if (mProfile != null) {
             profileName.setText(mProfile.getName());
             postingPermitted.setChecked(mProfile.isPostingPermitted());
@@ -308,7 +314,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
             userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : "");
             password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : "");
             preferredAccountsFilter.setText(mProfile.getPreferredAccountsFilter());
-            profileThemeId = mProfile.getThemeId();
+            profileThemeId = mProfile.getThemeHue();
         }
         else {
             profileName.setText("");
@@ -323,7 +329,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
             userName.setText("");
             password.setText("");
             preferredAccountsFilter.setText(null);
-            profileThemeId = -1;
+            profileThemeId = getArguments().getInt(ARG_HUE, -1);
         }
 
         checkInsecureSchemeWithAuth();
@@ -364,7 +370,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
 
         if (mProfile != null) {
             updateProfileFromUI();
-//                debug("profiles", String.format("Selected item is %d", mProfile.getThemeId()));
+//                debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue()));
             mProfile.storeInDB();
             debug("profiles", "profile stored in DB");
             triggerProfileChange();
@@ -398,7 +404,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
         mProfile.setAuthEnabled(useAuthentication.isChecked());
         mProfile.setAuthUserName(userName.getText());
         mProfile.setAuthPassword(password.getText());
-        mProfile.setThemeId(huePickerView.getTag());
+        mProfile.setThemeHue(huePickerView.getTag());
         mProfile.setFutureDates(futureDates);
         mProfile.setApiVersion(apiVersion);
     }