X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=672acf0ec4a58cb37d7ba0a897c8065b9433feae;hp=72c4ed4cdab47fb56448a70ec3f2dc1a1262895f;hb=b296570e4c84379133927f7f35e1220b9b1d6862;hpb=0e0c810ed03582f75647fb8910c637ec136ef4a1

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 72c4ed4c..672acf0e 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
@@ -29,7 +29,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -42,6 +41,7 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.google.android.material.textfield.TextInputLayout;
 
 import net.ktnx.mobileledger.BuildConfig;
@@ -86,7 +86,7 @@ public class ProfileDetailFragment extends Fragment {
     private boolean defaultCommoditySet;
     private TextInputLayout urlLayout;
     private LinearLayout authParams;
-    private Switch useAuthentication;
+    private SwitchMaterial useAuthentication;
     private TextView userName;
     private TextInputLayout userNameLayout;
     private TextView password;
@@ -178,8 +178,8 @@ public class ProfileDetailFragment extends Fragment {
         });
     }
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
         Activity context = getActivity();
         if (context == null)
             return;
@@ -242,14 +242,14 @@ public class ProfileDetailFragment extends Fragment {
                    cpf.show(activity.getSupportFragmentManager(), "currency-selector");
                });
 
-        Switch showCommodityByDefault = context.findViewById(R.id.profile_show_commodity);
+        SwitchMaterial showCommodityByDefault = context.findViewById(R.id.profile_show_commodity);
         showCommodityByDefault.setOnCheckedChangeListener(
                 (buttonView, isChecked) -> model.setShowCommodityByDefault(isChecked));
         model.observeShowCommodityByDefault(viewLifecycleOwner, showCommodityByDefault::setChecked);
 
         View postingSubItems = context.findViewById(R.id.posting_sub_items);
 
-        Switch postingPermitted = context.findViewById(R.id.profile_permit_posting);
+        SwitchMaterial postingPermitted = context.findViewById(R.id.profile_permit_posting);
         model.observePostingPermitted(viewLifecycleOwner, isChecked -> {
             postingPermitted.setChecked(isChecked);
             postingSubItems.setVisibility(isChecked ? View.VISIBLE : View.GONE);
@@ -257,7 +257,7 @@ public class ProfileDetailFragment extends Fragment {
         postingPermitted.setOnCheckedChangeListener(
                 ((buttonView, isChecked) -> model.setPostingPermitted(isChecked)));
 
-        Switch showCommentsByDefault = context.findViewById(R.id.profile_show_comments);
+        SwitchMaterial showCommentsByDefault = context.findViewById(R.id.profile_show_comments);
         model.observeShowCommentsByDefault(viewLifecycleOwner, showCommentsByDefault::setChecked);
         showCommentsByDefault.setOnCheckedChangeListener(
                 ((buttonView, isChecked) -> model.setShowCommentsByDefault(isChecked)));
@@ -282,33 +282,29 @@ public class ProfileDetailFragment extends Fragment {
         apiVersionText = context.findViewById(R.id.api_version_text);
         model.observeApiVersion(viewLifecycleOwner,
                 apiVer -> apiVersionText.setText(apiVer.getDescription(getResources())));
-        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 -> {
-                       SendTransactionTask.API apiVer;
-                       switch (item.getItemId()) {
-                           case R.id.api_version_menu_html:
-                               apiVer = SendTransactionTask.API.html;
-                               break;
-                           case R.id.api_version_menu_post_1_14:
-                               apiVer = SendTransactionTask.API.post_1_14;
-                               break;
-                           case R.id.api_version_menu_pre_1_15:
-                               apiVer = SendTransactionTask.API.pre_1_15;
-                               break;
-                           case R.id.api_version_menu_auto:
-                           default:
-                               apiVer = SendTransactionTask.API.auto;
-                       }
-                       model.setApiVersion(apiVer);
-                       apiVersionText.setText(apiVer.getDescription(getResources()));
-                       return true;
-                   });
-                   menu.show();
-               });
+        context.findViewById(R.id.api_version_label)
+               .setOnClickListener(this::chooseAPIVersion);
+        context.findViewById(R.id.api_version_text)
+               .setOnClickListener(this::chooseAPIVersion);
+
+        TextView detectedApiVersion = context.findViewById(R.id.detected_version_text);
+        model.observeDetectedVersion(viewLifecycleOwner, ver -> {
+            if (ver == null)
+                detectedApiVersion.setText(context.getResources()
+                                                  .getString(R.string.api_version_unknown_label));
+            else if (ver.isPre_1_20())
+                detectedApiVersion.setText(context.getResources()
+                                                  .getString(R.string.api_pre_1_19));
+            else
+                detectedApiVersion.setText(ver.toString());
+        });
+        detectedApiVersion.setOnClickListener(v -> model.triggerVersionDetection());
+        final View detectButton = context.findViewById(R.id.api_version_detect_button);
+        detectButton.setOnClickListener(v -> model.triggerVersionDetection());
+        model.observeDetectingHledgerVersion(viewLifecycleOwner, running -> {
+            detectButton.setVisibility(running ? View.VISIBLE : View.INVISIBLE);
+        });
+
         authParams = context.findViewById(R.id.auth_params);
 
         useAuthentication = context.findViewById(R.id.enable_http_auth);
@@ -386,6 +382,34 @@ public class ProfileDetailFragment extends Fragment {
 
         profileName.requestFocus();
     }
+    private void chooseAPIVersion(View v) {
+        Activity context = getActivity();
+        ProfileDetailModel model = getModel();
+        MenuInflater mi = new MenuInflater(context);
+        PopupMenu menu = new PopupMenu(context, v);
+        menu.inflate(R.menu.api_version);
+        menu.setOnMenuItemClickListener(item -> {
+            SendTransactionTask.API apiVer;
+            switch (item.getItemId()) {
+                case R.id.api_version_menu_html:
+                    apiVer = SendTransactionTask.API.html;
+                    break;
+                case R.id.api_version_menu_post_1_14:
+                    apiVer = SendTransactionTask.API.post_1_14;
+                    break;
+                case R.id.api_version_menu_pre_1_15:
+                    apiVer = SendTransactionTask.API.pre_1_15;
+                    break;
+                case R.id.api_version_menu_auto:
+                default:
+                    apiVer = SendTransactionTask.API.auto;
+            }
+            model.setApiVersion(apiVer);
+            apiVersionText.setText(apiVer.getDescription(getResources()));
+            return true;
+        });
+        menu.show();
+    }
     private MobileLedgerProfile.FutureDates futureDatesSettingFromMenuItemId(int itemId) {
         switch (itemId) {
             case R.id.menu_future_dates_7: