archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove extraneous braces

Browse Source
pull/493/head
Alex Baker 9 years ago
parent 0072bb1c77
commit ca8b3ca872
2 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File

3
.idea/inspectionProfiles/Project_Default.xml
Unescape Escape View File

@ -1,7 +1,9 @@
<component name="InspectionProjectProfileManager"> <component name="InspectionProjectProfileManager">
<profile version="1.0"> <profile version="1.0">
<option name="myName" value="Project Default" /> <option name="myName" value="Project Default" />
<inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="Convert2streamapi" enabled="false" level="WEAK WARNING" enabled_by_default="false" /> <inspection_tool class="Convert2streamapi" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="DoubleBraceInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="Guava" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="Guava" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false"> <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" /> <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
@ -13,6 +15,7 @@
<option name="processComments" value="true" /> <option name="processComments" value="true" />
</inspection_tool> </inspection_tool>
<inspection_tool class="StaticPseudoFunctionalStyleMethod" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="StaticPseudoFunctionalStyleMethod" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="SuspiciousIndentAfterControlStatement" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="TryFinallyCanBeTryWithResources" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="TryFinallyCanBeTryWithResources" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="TryWithIdenticalCatches" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="TryWithIdenticalCatches" enabled="false" level="WARNING" enabled_by_default="false" />
</profile> </profile>

117
src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -278,18 +278,17 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
Task task = viewHolder.task; Task task = viewHolder.task;
// name // name
final TextView nameView = viewHolder.nameView; { final TextView nameView = viewHolder.nameView;
String nameValue = task.getTitle(); String nameValue = task.getTitle();
long hiddenUntil = task.getHideUntil(); long hiddenUntil = task.getHideUntil();
if(task.getDeletionDate() > 0) { if(task.getDeletionDate() > 0) {
nameValue = resources.getString(R.string.TAd_deletedFormat, nameValue); nameValue = resources.getString(R.string.TAd_deletedFormat, nameValue);
}
if(hiddenUntil > DateUtilities.now()) {
nameValue = resources.getString(R.string.TAd_hiddenFormat, nameValue);
}
nameView.setText(nameValue);
} }
if(hiddenUntil > DateUtilities.now()) {
nameValue = resources.getString(R.string.TAd_hiddenFormat, nameValue);
}
nameView.setText(nameValue);
setupDueDateAndTags(viewHolder, task); setupDueDateAndTags(viewHolder, task);
@ -507,64 +506,62 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
}; };
} }
// Returns due date text width
private void setupDueDateAndTags(ViewHolder viewHolder, Task task) { private void setupDueDateAndTags(ViewHolder viewHolder, Task task) {
// due date / completion date // due date / completion date
final TextView dueDateView = viewHolder.dueDate; { final TextView dueDateView = viewHolder.dueDate;
if(!task.isCompleted() && task.hasDueDate()) { if(!task.isCompleted() && task.hasDueDate()) {
long dueDate = task.getDueDate(); long dueDate = task.getDueDate();
if(task.isOverdue()) { if(task.isOverdue()) {
dueDateView.setTextColor(textColorOverdue); dueDateView.setTextColor(textColorOverdue);
} else {
dueDateView.setTextColor(textColorSecondary);
}
String dateValue = DateUtilities.getRelativeDateStringWithTime(context, dueDate);
dueDateView.setText(dateValue);
dueDateView.setVisibility(View.VISIBLE);
} else if(task.isCompleted()) {
String dateValue = DateUtilities.getRelativeDateStringWithTime(context, task.getCompletionDate());
dueDateView.setText(resources.getString(R.string.TAd_completed, dateValue));
dueDateView.setTextColor(textColorHint);
dueDateView.setVisibility(View.VISIBLE);
} else { } else {
dueDateView.setVisibility(View.GONE); dueDateView.setTextColor(textColorSecondary);
} }
String dateValue = DateUtilities.getRelativeDateStringWithTime(context, dueDate);
dueDateView.setText(dateValue);
dueDateView.setVisibility(View.VISIBLE);
} else if(task.isCompleted()) {
String dateValue = DateUtilities.getRelativeDateStringWithTime(context, task.getCompletionDate());
dueDateView.setText(resources.getString(R.string.TAd_completed, dateValue));
dueDateView.setTextColor(textColorHint);
dueDateView.setVisibility(View.VISIBLE);
} else {
dueDateView.setVisibility(View.GONE);
}
if (task.isCompleted()) { if (task.isCompleted()) {
viewHolder.tagBlock.setVisibility(View.GONE); viewHolder.tagBlock.setVisibility(View.GONE);
} else { } else {
String tags = viewHolder.tagsString; String tags = viewHolder.tagsString;
List<String> tagUuids = tags != null ? newArrayList(tags.split(",")) : Lists.newArrayList(); List<String> tagUuids = tags != null ? newArrayList(tags.split(",")) : Lists.newArrayList();
Iterable<TagData> t = filter(transform(tagUuids, uuidToTag), Predicates.notNull()); Iterable<TagData> t = filter(transform(tagUuids, uuidToTag), Predicates.notNull());
List<TagData> firstFourByName = orderByName.leastOf(t, 4); List<TagData> firstFourByName = orderByName.leastOf(t, 4);
int numTags = firstFourByName.size(); int numTags = firstFourByName.size();
if (numTags > 0) { if (numTags > 0) {
List<TagData> firstFourByNameLength = orderByLength.sortedCopy(firstFourByName); List<TagData> firstFourByNameLength = orderByLength.sortedCopy(firstFourByName);
float maxLength = tagCharacters / numTags; float maxLength = tagCharacters / numTags;
for (int i = 0; i < numTags - 1; i++) { for (int i = 0; i < numTags - 1; i++) {
TagData tagData = firstFourByNameLength.get(i); TagData tagData = firstFourByNameLength.get(i);
String name = tagData.getName(); String name = tagData.getName();
if (name.length() >= maxLength) { if (name.length() >= maxLength) {
break; break;
}
float excess = maxLength - name.length();
int beneficiaries = numTags - i - 1;
float additional = excess / beneficiaries;
maxLength += additional;
} }
List<SpannableString> tagStrings = transform(firstFourByName, tagToString(maxLength)); float excess = maxLength - name.length();
SpannableStringBuilder builder = new SpannableStringBuilder(); int beneficiaries = numTags - i - 1;
for (SpannableString tagString : tagStrings) { float additional = excess / beneficiaries;
if (builder.length() > 0) { maxLength += additional;
builder.append(HAIR_SPACE); }
} List<SpannableString> tagStrings = transform(firstFourByName, tagToString(maxLength));
builder.append(tagString); SpannableStringBuilder builder = new SpannableStringBuilder();
for (SpannableString tagString : tagStrings) {
if (builder.length() > 0) {
builder.append(HAIR_SPACE);
} }
viewHolder.tagBlock.setText(builder); builder.append(tagString);
viewHolder.tagBlock.setVisibility(View.VISIBLE);
} else {
viewHolder.tagBlock.setVisibility(View.GONE);
} }
viewHolder.tagBlock.setText(builder);
viewHolder.tagBlock.setVisibility(View.VISIBLE);
} else {
viewHolder.tagBlock.setVisibility(View.GONE);
} }
} }
} }

Write Preview
Loading…
Cancel
Save