X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=13a8b55a030e1a3d863e84b5506614f6ef774741;hb=d0c7376f092d1778ec8bab43cd2017eab723d521;hp=1efdb965408c3bd278883767000f1a4a517ac381;hpb=4db312e69578236dbfca979b840222b751da2f8c;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 1efdb965..13a8b55a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2021 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -52,7 +52,6 @@ import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.CurrencySelectorFragment;
 import net.ktnx.mobileledger.ui.HueRingDialog;
-import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity;
 import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.Misc;
 
@@ -206,7 +205,7 @@ public class ProfileDetailFragment extends Fragment {
                 resetDefaultCommodity();
         });
 
-        FloatingActionButton fab = context.findViewById(R.id.fab);
+        FloatingActionButton fab = context.findViewById(R.id.fabAdd);
         fab.setOnClickListener(v -> onSaveFabClicked());
 
         hookTextChangeSyncRoutine(binding.profileName, model::setProfileName);
@@ -360,22 +359,21 @@ public class ProfileDetailFragment extends Fragment {
         menu.inflate(R.menu.api_version);
         menu.setOnMenuItemClickListener(item -> {
             API apiVer;
-            switch (item.getItemId()) {
-                case R.id.api_version_menu_html:
-                    apiVer = API.html;
-                    break;
-                case R.id.api_version_menu_1_19_1:
-                    apiVer = API.v1_19_1;
-                    break;
-                case R.id.api_version_menu_1_15:
-                    apiVer = API.v1_15;
-                    break;
-                case R.id.api_version_menu_1_14:
-                    apiVer = API.v1_14;
-                    break;
-                case R.id.api_version_menu_auto:
-                default:
-                    apiVer = API.auto;
+            int itemId = item.getItemId();
+            if (itemId == R.id.api_version_menu_html) {
+                apiVer = API.html;
+            }
+            else if (itemId == R.id.api_version_menu_1_19_1) {
+                apiVer = API.v1_19_1;
+            }
+            else if (itemId == R.id.api_version_menu_1_15) {
+                apiVer = API.v1_15;
+            }
+            else if (itemId == R.id.api_version_menu_1_14) {
+                apiVer = API.v1_14;
+            }
+            else {
+                apiVer = API.auto;
             }
             model.setApiVersion(apiVer);
             binding.apiVersionText.setText(apiVer.getDescription(getResources()));
@@ -384,26 +382,31 @@ public class ProfileDetailFragment extends Fragment {
         menu.show();
     }
     private MobileLedgerProfile.FutureDates futureDatesSettingFromMenuItemId(int itemId) {
-        switch (itemId) {
-            case R.id.menu_future_dates_7:
-                return MobileLedgerProfile.FutureDates.OneWeek;
-            case R.id.menu_future_dates_14:
-                return MobileLedgerProfile.FutureDates.TwoWeeks;
-            case R.id.menu_future_dates_30:
-                return MobileLedgerProfile.FutureDates.OneMonth;
-            case R.id.menu_future_dates_60:
-                return MobileLedgerProfile.FutureDates.TwoMonths;
-            case R.id.menu_future_dates_90:
-                return MobileLedgerProfile.FutureDates.ThreeMonths;
-            case R.id.menu_future_dates_180:
-                return MobileLedgerProfile.FutureDates.SixMonths;
-            case R.id.menu_future_dates_365:
-                return MobileLedgerProfile.FutureDates.OneYear;
-            case R.id.menu_future_dates_all:
-                return MobileLedgerProfile.FutureDates.All;
-            default:
-                return MobileLedgerProfile.FutureDates.None;
+        if (itemId == R.id.menu_future_dates_7) {
+            return MobileLedgerProfile.FutureDates.OneWeek;
+        }
+        else if (itemId == R.id.menu_future_dates_14) {
+            return MobileLedgerProfile.FutureDates.TwoWeeks;
+        }
+        else if (itemId == R.id.menu_future_dates_30) {
+            return MobileLedgerProfile.FutureDates.OneMonth;
+        }
+        else if (itemId == R.id.menu_future_dates_60) {
+            return MobileLedgerProfile.FutureDates.TwoMonths;
+        }
+        else if (itemId == R.id.menu_future_dates_90) {
+            return MobileLedgerProfile.FutureDates.ThreeMonths;
+        }
+        else if (itemId == R.id.menu_future_dates_180) {
+            return MobileLedgerProfile.FutureDates.SixMonths;
+        }
+        else if (itemId == R.id.menu_future_dates_365) {
+            return MobileLedgerProfile.FutureDates.OneYear;
+        }
+        else if (itemId == R.id.menu_future_dates_all) {
+            return MobileLedgerProfile.FutureDates.All;
         }
+        return MobileLedgerProfile.FutureDates.None;
     }
     @NotNull
     private ProfileDetailModel getModel() {
@@ -493,7 +496,8 @@ public class ProfileDetailFragment extends Fragment {
 
         if (model.getUseAuthentication()) {
             String urlText = model.getUrl();
-            if (urlText.startsWith("http") && !urlText.startsWith("https"))
+            if (urlText.startsWith("http://") ||
+                urlText.length() >= 8 && !urlText.startsWith("https://"))
                 showWarning = true;
         }