diff --git a/app/build.gradle b/app/build.gradle index 60b983a..d6134f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,21 +34,22 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.compose.ui:ui-tooling-preview:+' implementation 'androidx.constraintlayout:constraintlayout:2.1.1' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.navigation:navigation-fragment:2.3.5' implementation 'androidx.navigation:navigation-ui:2.3.5' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'androidx.compose.ui:ui-tooling-preview:+' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - + implementation 'com.google.android.material:material:1.4.0' + implementation 'nl.dionsegijn:konfetti:1.3.2' + implementation fileTree(dir: 'libs', include: ['*.jar']) implementation files('libs/activation.jar') implementation files('libs/additionnal.jar') implementation files('libs/mail.jar') + + testImplementation 'junit:junit:4.+' } diff --git a/app/src/main/java/com/example/tenantcore/ui/shared/RequestListBottomSheet.java b/app/src/main/java/com/example/tenantcore/ui/shared/RequestListBottomSheet.java index f2311cf..3465812 100644 --- a/app/src/main/java/com/example/tenantcore/ui/shared/RequestListBottomSheet.java +++ b/app/src/main/java/com/example/tenantcore/ui/shared/RequestListBottomSheet.java @@ -6,8 +6,8 @@ import android.provider.CalendarContract; import android.view.View; import androidx.annotation.NonNull; +import com.example.tenantcore.R; import androidx.core.content.ContextCompat; - import com.example.tenantcore.databinding.BottomSheetRequestInfoBinding; import com.example.tenantcore.db.DatabaseException; import com.example.tenantcore.model.Priority; @@ -21,6 +21,10 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; +import nl.dionsegijn.konfetti.KonfettiView; +import nl.dionsegijn.konfetti.models.Shape; +import nl.dionsegijn.konfetti.models.Size; import java.util.GregorianCalendar; import java.util.Locale; /** @@ -37,6 +41,9 @@ public class RequestListBottomSheet extends BottomSheetDialog { /** * Creates a Bottom Sheet Dialog for the given request + * + * @param activity the activity where this bottom sheet will be displayed + * @param request the request to show details about * @param activity the activity where this bottom sheet will be displayed * @param request the request to show details about * @param showLandlordView whether the landlord functionality should be enabled @@ -132,6 +139,20 @@ protected void onCreate(Bundle savedInstanceState) { // Change the request status request.setStatus(Status.DONE); + // Play the confetti animation + final KonfettiView konfettiView = activity.findViewById(R.id.viewKonfetti); + konfettiView.build() + .addColors(Color.YELLOW, Color.GREEN, Color.MAGENTA) + .setDirection(0.0, 359.0) + .setSpeed(1f, 5f) + .setFadeOutEnabled(true) + .setTimeToLive(2000L) + .addShapes(Shape.Square.INSTANCE, Shape.Circle.INSTANCE) + .addSizes(new Size(12, 5f)) + .setPosition(-50f, konfettiView.getWidth() + 50f, -50f, -50f) + .streamFor(300, 5000L); + + // Update status onStatusUpdate(); }); } @@ -139,8 +160,8 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(binding.getRoot()); } - private void addRequestToCalendar(){ - if(request.getDueDate() == null) + private void addRequestToCalendar() { + if (request.getDueDate() == null) return; Tenant tenant = viewModel.getTenant(); @@ -165,13 +186,12 @@ private void addRequestToCalendar(){ * Updates the request status in the db & dismisses the bottom sheet. * Also updates the the status info in the bottom sheet */ - private void onStatusUpdate(){ + private void onStatusUpdate() { setStatusInfo(); try { - if(!request.getStatus().equals(Status.DONE)) { + if (!request.getStatus().equals(Status.DONE)) { viewModel.updateTenantRequest(request); - } - else { + } else { viewModel.remoteTenantRequest(request); dismiss(); } @@ -185,7 +205,7 @@ private void onStatusUpdate(){ /** * Updates the status info in the bottom sheet */ - private void setStatusInfo(){ + private void setStatusInfo() { binding.requestSheetStatusTextView.setText(request.getStatus().name()); binding.requestSheetStatusTextView.setTextColor(Color.parseColor(getStatusTextColor(request.getStatus()))); binding.markDoneButton.setVisibility(showLandlordView && request.getStatus().equals(Status.ACCEPTED) ? View.VISIBLE : View.GONE); @@ -194,14 +214,18 @@ private void setStatusInfo(){ /** * Gets the Hex color code to be used for the given Priority. * The Hex color code indicates the text color of the priority. + * * @param priority The priority for which to get the Hex text color code * @return String containing the Hex color code indicating the given priority's text color */ - private String getPriorityColor(Priority priority){ - switch (priority){ - case LOW: return Request.Color.TEXT_LOW_PRIORITY_REQUEST; - case MEDIUM: return Request.Color.MEDIUM_PRIORITY_REQUEST; - default: return Request.Color.HIGH_PRIORITY_REQUEST; + private String getPriorityColor(Priority priority) { + switch (priority) { + case LOW: + return Request.Color.TEXT_LOW_PRIORITY_REQUEST; + case MEDIUM: + return Request.Color.MEDIUM_PRIORITY_REQUEST; + default: + return Request.Color.HIGH_PRIORITY_REQUEST; } } @@ -212,11 +236,14 @@ private String getPriorityColor(Priority priority){ * @param status Status for which to get the Hex color code * @return String containing the Hex color code indicating the given status' text color */ - private String getStatusTextColor(Status status){ - switch (status){ - case REFUSED: return Request.Color.REFUSED_REQUEST; - case PENDING: return Request.Color.PENDING_REQUEST; - default: return Request.Color.APPROVED_REQUEST; + private String getStatusTextColor(Status status) { + switch (status) { + case REFUSED: + return Request.Color.REFUSED_REQUEST; + case PENDING: + return Request.Color.PENDING_REQUEST; + default: + return Request.Color.APPROVED_REQUEST; } } diff --git a/app/src/main/java/com/example/tenantcore/ui/shared/RequestListRecyclerViewAdapter.java b/app/src/main/java/com/example/tenantcore/ui/shared/RequestListRecyclerViewAdapter.java index 929fa3a..bbd5748 100644 --- a/app/src/main/java/com/example/tenantcore/ui/shared/RequestListRecyclerViewAdapter.java +++ b/app/src/main/java/com/example/tenantcore/ui/shared/RequestListRecyclerViewAdapter.java @@ -12,9 +12,7 @@ import com.example.tenantcore.model.Status; import com.example.tenantcore.model.Tenant; import com.example.tenantcore.ui.TenantCoreActivity; -import com.example.tenantcore.viewmodel.ObservableModel; import com.example.tenantcore.viewmodel.TenantCoreViewModel; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.List; @@ -112,18 +110,14 @@ public ViewHolder(ListItemRequestBinding binding) { if (isLandlord) { requestInfoDialog.setOnDismissListener(dialogInterface -> { viewModel.notifyChange(); - if(getItemCount() < numOfRequests){ + if (getItemCount() < numOfRequests) { notifyItemRemoved(layoutPosition); - } - else { + } else { notifyItemChanged(layoutPosition); } - }); } }); - - } public void bind(Request request) { diff --git a/app/src/main/res/layout/fragment_request_list.xml b/app/src/main/res/layout/fragment_request_list.xml index 637955f..73e009d 100644 --- a/app/src/main/res/layout/fragment_request_list.xml +++ b/app/src/main/res/layout/fragment_request_list.xml @@ -17,4 +17,9 @@ app:layout_constraintTop_toTopOf="parent" tools:itemCount="12" tools:listitem="@layout/list_item_request" /> + +