wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve date handling

Browse source
This commit is contained in:
ligi 2014-06-23 22:00:20 +02:00
parent d7d12519fd
commit 093a91ca52
3 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/org/ligi/passandroid/helper/PassVisualizer.java
View file

@ -9,6 +9,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import org.joda.time.DateTime;
import org.ligi.passandroid.App;
import org.ligi.passandroid.R;
import org.ligi.passandroid.model.PassField;
@ -21,11 +22,10 @@ import static butterknife.ButterKnife.findById;
public class PassVisualizer {
public static void visualize(final Activity activity, final ReducedPassInformation passbook, View res) {
TextView titleTextView = findById(res, R.id.title);
TextView dateTextView = findById(res, R.id.date);
CategoryIndicatorView categoryIndicator = findById(res, R.id.categoryView);
final TextView titleTextView = findById(res, R.id.title);
final TextView dateTextView = findById(res, R.id.date);
final CategoryIndicatorView categoryIndicator = findById(res, R.id.categoryView);
if (passbook.hasLocation) {
findById(res, R.id.navigateTo).setOnClickListener(new View.OnClickListener() {
@ -38,14 +38,24 @@ public class PassVisualizer {
findById(res, R.id.navigateTo).setVisibility(View.GONE);
}
if (passbook.relevantDate != null) {
final DateTime dateForIntent;
if (passbook.relevantDate.isPresent()) {
dateForIntent = passbook.relevantDate.get();
} else if (passbook.expirationDate.isPresent()) {
dateForIntent = passbook.expirationDate.get();
} else {
dateForIntent = null;
}
if (dateForIntent != null) {
findById(res, R.id.addCalendar).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_EDIT);
intent.setType("vnd.android.cursor.item/event");
intent.putExtra("beginTime", passbook.relevantDate.getMillis());
intent.putExtra("endTime", passbook.relevantDate.getMillis() + 60 * 60 * 1000);
intent.putExtra("beginTime", dateForIntent.getMillis());
intent.putExtra("endTime", dateForIntent.getMillis() + 60 * 60 * 1000);
intent.putExtra("title", passbook.name);
activity.startActivity(intent);
}
@ -54,12 +64,12 @@ public class PassVisualizer {
findById(res, R.id.addCalendar).setVisibility(View.GONE);
}
if (passbook.relevantDate == null && !passbook.hasLocation) {
if (dateForIntent == null && !passbook.hasLocation) {
findById(res, R.id.actionsContainer).setVisibility(View.GONE);
}
int size = (int) res.getResources().getDimension(R.dimen.pass_icon_size);
ImageView icon_img = findById(res, R.id.icon);
final ImageView icon_img = findById(res, R.id.icon);
icon_img.setBackgroundColor(passbook.backgroundColor);
@ -83,9 +93,12 @@ public class PassVisualizer {
titleTextView.setText(passbook.name);
if (passbook.relevantDate != null) {
final CharSequence relativeDateTimeString = DateUtils.getRelativeDateTimeString(res.getContext(), passbook.relevantDate.getMillis(), DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
if (passbook.relevantDate.isPresent()) {
final CharSequence relativeDateTimeString = DateUtils.getRelativeDateTimeString(res.getContext(), passbook.relevantDate.get().getMillis(), DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
dateTextView.setText(relativeDateTimeString);
} else if (passbook.expirationDate.isPresent()) {
final CharSequence relativeDateTimeString = DateUtils.getRelativeDateTimeString(res.getContext(), passbook.expirationDate.get().getMillis(), DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
dateTextView.setText("expires " + relativeDateTimeString);
} else {
dateTextView.setVisibility(View.GONE);
}

6
src/main/java/org/ligi/passandroid/model/AndroidFileSystemPassStore.java
View file

@ -124,13 +124,13 @@ public class AndroidFileSystemPassStore implements PassStore {
return 0;
}
if (lhs.relevantDate == null) {
if (!lhs.relevantDate.isPresent()) {
return 1;
}
if (rhs.relevantDate == null) {
if (!rhs.relevantDate.isPresent()) {
return -1;
}
return rhs.relevantDate.compareTo(lhs.relevantDate);
return rhs.relevantDate.get().compareTo(lhs.relevantDate.get());
}
});
break;

11
src/main/java/org/ligi/passandroid/model/ReducedPassInformation.java
View file

@ -1,5 +1,7 @@
package org.ligi.passandroid.model;
import com.google.common.base.Optional;
import org.joda.time.DateTime;
import java.io.Serializable;
@ -12,15 +14,14 @@ public class ReducedPassInformation implements Serializable {
public int backgroundColor;
public int foregroundColor;
public String iconPath;
public DateTime relevantDate;
public Optional<DateTime> relevantDate;
public Optional<DateTime> expirationDate;
public boolean hasLocation;
public ReducedPassInformation(Passbook pass) {
type = pass.getType();
if (pass.getRelevantDate().isPresent()) {
relevantDate = pass.getRelevantDate().get();
}
relevantDate = pass.getRelevantDate();
expirationDate = pass.getExpirationDate();
backgroundColor = pass.getBackGroundColor();
foregroundColor = pass.getForegroundColor();
name = pass.getDescription();