Merge pull request #7 from bara96/development

Development

Author: bara96

app/src/main/java/com/example/algorandcarsharing/activities/TripActivity.java

@@ -671,6 +671,7 @@ private void setTripViewMode(TripViewMode viewMode) {
                     else {
                         binding.status.setText(getString(R.string.status_full));
                         binding.status.setTextColor(getColor(R.color.red));
+                        binding.sendBt.setEnabled(false);
                     }
                     break;
                 default:

app/src/main/java/com/example/algorandcarsharing/fragments/trips/CreatedTripsFragment.java

@@ -96,7 +96,7 @@ protected <T> List<TripModel> searchApplications(List<T> applications) {
                     LogHelper.error("searchApplications", e);
                 }
         }
-        validApplications.sort(new TripComparator());
+        validApplications.sort(new TripComparator().reversed());
         return validApplications;
     }
 }

app/src/main/java/com/example/algorandcarsharing/fragments/trips/HomeFragment.java

@@ -116,7 +116,7 @@ protected <T> List<TripModel> searchApplications(List<T> transactions) {
             }
         }
         futureList.forEach(CompletableFuture::join);
-        validApplications.sort(new TripComparator());
+        validApplications.sort(new TripComparator().reversed());
         return validApplications;
     }
 

app/src/main/java/com/example/algorandcarsharing/fragments/trips/JoinedTripsFragment.java

@@ -110,7 +110,7 @@ protected <T> List<TripModel> searchApplications(List<T> applications) {
             }
         }
         futureList.forEach(CompletableFuture::join);
-        validApplications.sort(new TripComparator());
+        validApplications.sort(new TripComparator().reversed());
         return validApplications;
     }
 }

app/src/main/java/com/example/algorandcarsharing/services/ApplicationService.java

@@ -140,7 +140,7 @@ public Supplier<Long> updateApplication(Long appId, Account creator, InsertTripM
     }
 
     /**
-     * Cancel the participation to the trip
+     * Delete the application and close the escrow if needed
      *
      * @param trip
      * @param creator
@@ -326,7 +326,7 @@ public Supplier<Long> cancelParticipation(TripModel trip, AccountModel account)
                     LogHelper.log(this.getClass().getName(), String.format("Opted-in to app-id: %s", appId));
                 }
 
-                // participate to the trip and perform payment to escrow
+                // cancel participation to the trip and perform refund
                 List<byte[]> args  = new ArrayList<>();
                 args.add(ApplicationTripSchema.AppMethod.CancelParticipation.getValue().getBytes());