X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=6eb5239d95cbb36ce8a41a63b2323db2a2e64220;hb=bb789332571609eeb1bef6e39b7ad359227d1045;hp=01c0143dcc4171c66ef1eed09d532d9527e54889;hpb=1059279ca52a15efff01c00a67a2a647fef4a1ba;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 01c0143d..6eb5239d 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,11 +41,12 @@ 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;
 import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.async.SendTransactionTask;
+import net.ktnx.mobileledger.json.API;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.CurrencySelectorFragment;
@@ -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)));
@@ -287,19 +287,23 @@ public class ProfileDetailFragment extends Fragment {
         context.findViewById(R.id.api_version_text)
                .setOnClickListener(this::chooseAPIVersion);
 
-        TextView detectedApiVersion = context.findViewById(R.id.detected_version_text);
+        context.findViewById(R.id.server_version_label)
+               .setOnClickListener(v -> model.triggerVersionDetection());
+        TextView detectedServerVersion = context.findViewById(R.id.detected_server_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));
+                detectedServerVersion.setText(context.getResources()
+                                                     .getString(
+                                                             R.string.server_version_unknown_label));
+            else if (ver.isPre_1_20_1())
+                detectedServerVersion.setText(context.getResources()
+                                                     .getString(
+                                                             R.string.detected_server_pre_1_20_1));
             else
-                detectedApiVersion.setText(ver.toString());
+                detectedServerVersion.setText(ver.toString());
         });
-        detectedApiVersion.setOnClickListener(v -> model.triggerVersionDetection());
-        final View detectButton = context.findViewById(R.id.api_version_detect_button);
+        detectedServerVersion.setOnClickListener(v -> model.triggerVersionDetection());
+        final View detectButton = context.findViewById(R.id.server_version_detect_button);
         detectButton.setOnClickListener(v -> model.triggerVersionDetection());
         model.observeDetectingHledgerVersion(viewLifecycleOwner, running -> {
             detectButton.setVisibility(running ? View.VISIBLE : View.INVISIBLE);
@@ -389,20 +393,23 @@ public class ProfileDetailFragment extends Fragment {
         PopupMenu menu = new PopupMenu(context, v);
         menu.inflate(R.menu.api_version);
         menu.setOnMenuItemClickListener(item -> {
-            SendTransactionTask.API apiVer;
+            API apiVer;
             switch (item.getItemId()) {
                 case R.id.api_version_menu_html:
-                    apiVer = SendTransactionTask.API.html;
+                    apiVer = API.html;
                     break;
-                case R.id.api_version_menu_post_1_14:
-                    apiVer = SendTransactionTask.API.post_1_14;
+                case R.id.api_version_menu_1_19_1:
+                    apiVer = API.v1_19_1;
                     break;
-                case R.id.api_version_menu_pre_1_15:
-                    apiVer = SendTransactionTask.API.pre_1_15;
+                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 = SendTransactionTask.API.auto;
+                    apiVer = API.auto;
             }
             model.setApiVersion(apiVer);
             apiVersionText.setText(apiVer.getDescription(getResources()));