CCCT-567 || Home Screen UI Fixes #2917
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,11 @@ | ||
| package org.commcare.activities; | ||
|
|
||
| import static org.commcare.android.database.connect.models.ConnectJobRecord.STATUS_DELIVERING; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.content.Context; | ||
| import android.view.View; | ||
| import android.view.ViewTreeObserver; | ||
| import android.widget.TextView; | ||
|
|
||
| import androidx.cardview.widget.CardView; | ||
|
|
@@ -35,7 +36,6 @@ | |
| import java.util.Date; | ||
| import java.util.Hashtable; | ||
| import java.util.List; | ||
| import java.util.Vector; | ||
|
|
||
| /** | ||
|
|
@@ -78,8 +78,7 @@ private void updateJobTileDetails() { | |
| boolean show = record != null && !record.getIsLearning(); | ||
|
|
||
| viewJobCard.setVisibility(show ? View.VISIBLE : View.GONE); | ||
| if (show) { | ||
| ConnectBoldTextView tvJobTitle = viewJobCard.findViewById(R.id.tv_job_title); | ||
| ConnectMediumTextView tvViewMore = viewJobCard.findViewById(R.id.tv_view_more); | ||
| ConnectMediumTextView tvJobDiscrepation = viewJobCard.findViewById(R.id.tv_job_discrepation); | ||
|
|
@@ -98,7 +97,7 @@ private void updateJobTileDetails() { | |
| boolean showHours = workingHours != null; | ||
| tv_job_time.setVisibility(showHours ? View.VISIBLE : View.GONE); | ||
| hoursTitle.setVisibility(showHours ? View.VISIBLE : View.GONE); | ||
| if (showHours) { | ||
| tv_job_time.setText(workingHours); | ||
| } | ||
|
|
||
|
|
@@ -111,7 +110,7 @@ private void updateOpportunityMessage() { | |
| String appId = CommCareApplication.instance().getCurrentApp().getUniqueId(); | ||
| ConnectAppRecord record = ConnectManager.getAppRecord(activity, appId); | ||
| boolean show = record != null && !record.getIsLearning(); | ||
| if (show) { | ||
| ConnectJobRecord job = ConnectManager.getActiveJob(); | ||
| if (job.isFinished()) { | ||
| warningText = activity.getString(R.string.connect_progress_warning_ended); | ||
|
|
@@ -147,14 +146,14 @@ private void updateOpportunityMessage() { | |
| } | ||
| } | ||
|
|
||
| if (totalMaxes.size() > 0 || dailyMaxes.size() > 0) { | ||
| warningText = ""; | ||
| if (totalMaxes.size() > 0) { | ||
| String maxes = String.join(", ", totalMaxes); | ||
| warningText = activity.getString(R.string.connect_progress_warning_max_reached_multi, maxes); | ||
| } | ||
|
|
||
| if (dailyMaxes.size() > 0) { | ||
| String maxes = String.join(", ", dailyMaxes); | ||
| warningText += activity.getString(R.string.connect_progress_warning_daily_max_reached_multi, maxes); | ||
| } | ||
|
|
@@ -169,7 +168,7 @@ private void updateOpportunityMessage() { | |
| } | ||
|
|
||
| connectMessageCard.setVisibility(warningText == null ? View.GONE : View.VISIBLE); | ||
| if (warningText != null) { | ||
| TextView tv = connectMessageCard.findViewById(R.id.tvConnectMessage); | ||
| tv.setText(warningText); | ||
| } | ||
|
|
@@ -195,11 +194,15 @@ public void updateConnectProgress() { | |
| RecyclerView recyclerView = viewJobCard.findViewById(R.id.rdDeliveryTypeList); | ||
| ConnectJobRecord job = ConnectManager.getActiveJob(); | ||
|
|
||
| if (job.getStatus() == STATUS_DELIVERING && job.isFinished()) { | ||
| recyclerView.setVisibility(View.GONE); | ||
| } | ||
|
|
||
| updateOpportunityMessage(); | ||
|
|
||
| deliveryPaymentInfoList.clear(); | ||
|
|
||
| if (job != null) { | ||
| //Note: Only showing a single daily progress bar for now | ||
| //Adding more entries to the list would show multiple progress bars | ||
| //(i.e. one for each payment type) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apologies, I should have provided more guidance here. Hiding the button can be accomplished more easily and without having to make additional modifications to this code. Instead, we just need to enhance StandardHomeActivityUIController.getHiddenButtons so it correctly indicates when to hide the Job Status button. The list of button names returned by that function is passed through to HomeButtons so buttons can be shown or hidden as indicated.