Beta 2.59 47700

app/res/menu/menu_connect.xml

@@ -10,6 +10,7 @@
         android:id="@+id/action_credential"
         android:icon="@drawable/ic_credential"
         android:title="@string/credential"
+        android:visible="false"
         app:showAsAction="always" />
     <item
         android:id="@+id/action_sync"

app/src/org/commcare/fragments/connect/ConnectDeliveryListFragment.java

@@ -3,6 +3,9 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -14,12 +17,16 @@
 import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.MenuHost;
+import androidx.core.view.MenuProvider;
+import androidx.lifecycle.Lifecycle;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.commcare.android.database.connect.models.ConnectJobDeliveryFlagRecord;
 import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord;
 import org.commcare.connect.ConnectDateUtils;
+import org.commcare.connect.ConnectJobHelper;
 import org.commcare.dalvik.R;
 import org.commcare.dalvik.databinding.FragmentConnectDeliveryListBinding;
 
@@ -49,9 +56,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         binding = FragmentConnectDeliveryListBinding.inflate(inflater, container, false);
         unitName = ConnectDeliveryListFragmentArgs.fromBundle(getArguments()).getUnitId();
         requireActivity().setTitle(getString(R.string.connect_visit_type_title, unitName));
-
         setupRecyclerView();
         setupFilterControls();
+        setupMenuProvider();
         return binding.getRoot();
     }
 
@@ -95,6 +102,32 @@ private int getFilterCardId(String filter) {
         };
     }
 
+    private void setupMenuProvider() {
+        MenuHost host = requireActivity();
+        host.addMenuProvider(new MenuProvider() {
+            @Override
+            public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+            }
+
+            @Override
+            public boolean onMenuItemSelected(@NonNull MenuItem item) {
+                if (item.getItemId() == R.id.action_sync) {
+                    refreshData();
+                    return true;
+                }
+                return false;
+            }
+        }, getViewLifecycleOwner(), Lifecycle.State.RESUMED);
+    }
+
+    private void refreshData() {
+        ConnectJobHelper.INSTANCE.updateDeliveryProgress(getContext(), job, success -> {
+            if (success) {
+                adapter.updateDeliveries(getFilteredDeliveries());
+            }
+        });
+    }
+
     private void setFilterHighlight(CardView card, TextView label, boolean selected) {
         int bgColor = getResources().getColor(selected ? R.color.connect_blue_color : R.color.connect_blue_color_10);
         int textColor = getResources().getColor(selected ? android.R.color.white : R.color.connect_blue_color);

app/src/org/commcare/fragments/connect/ConnectDeliveryProgressDeliveryFragment.java

@@ -146,4 +146,16 @@ private HashMap<String, HashMap<String, Integer>> getStatusMap(ConnectJobRecord
         return statusMap;
     }
 
+
+    /**
+     * This was added to re-calculate the correct height of a fragment in ViewPager2. This is required as ViewPager2
+     * has bug currently due to which it's not calculating the height of it's different fragment correctly.
+     * When found some other solution for this ViewPager2 bug, we can remove this but make sure to QA
+     * by pressing sync button while in different fragments.
+     */
+    @Override
+    public void onResume() {
+        super.onResume();
+        binding.getRoot().requestLayout();
+    }
 }

app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java

@@ -140,10 +140,11 @@ private void setupRefreshAndConfirmationActions() {
         });
 
         binding.connectPaymentConfirmYesButton.setOnClickListener(v -> {
-            updatePaymentConfirmationTile(true);
             if (paymentToConfirm != null) {
                 FirebaseAnalyticsUtil.reportCccPaymentConfirmationInteraction(true);
-                ConnectJobHelper.INSTANCE.updatePaymentConfirmed(getContext(), paymentToConfirm, true, success -> {});
+                ConnectJobHelper.INSTANCE.updatePaymentConfirmed(getContext(), paymentToConfirm, true, success -> {
+                    updatePaymentConfirmationTile(true);
+                });
             }
         });
     }

app/src/org/commcare/fragments/connect/ConnectDownloadingFragment.java

@@ -107,7 +107,6 @@ public void onSuccessfulVerification() {
         setBackButtonAndActionBarState(true);
         View view = getView();
         if (view != null) {
-            Navigation.findNavController(view).popBackStack();
 
             //Launch the learn/deliver app
             ConnectAppRecord appToLaunch = getLearnApp ? job.getLearnAppInfo() : job.getDeliveryAppInfo();

app/src/org/commcare/fragments/connect/ConnectLearningProgressFragment.java

@@ -113,6 +113,7 @@ private void updateProgressViews(int percent, boolean hideProgress) {
         viewBinding.connectLearningProgressBar.setVisibility(visibility);
         viewBinding.connectLearningProgressText.setVisibility(visibility);
         viewBinding.connectLearnProgressBarTextContainer.setVisibility(visibility);
+        viewBinding.learningCard.setVisibility(visibility);
 
         if (!hideProgress) {
             viewBinding.connectLearningProgressBar.setProgress(percent);
@@ -244,9 +245,15 @@ private void populateJobCard(ConnectJobRecord job) {
         boolean showHours = hours != null;
         jobCard.tvJobTime.setVisibility(showHours ? View.VISIBLE : View.GONE);
         jobCard.tvDailyVisitTitle.setVisibility(showHours ? View.VISIBLE : View.GONE);
+        jobCard.tvViewMore.setOnClickListener(this::navigateToJobDetailBottomSheet);
 
         if (showHours) {
             jobCard.tvJobTime.setText(hours);
         }
     }
+
+    private void navigateToJobDetailBottomSheet(View view) {
+        Navigation.findNavController(view).navigate(
+                ConnectLearningProgressFragmentDirections.actionConnectJobLearningProgressFragmentToConnectJobDetailBottomSheetDialogFragment());
+    }
 }