Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

[9h]. Ripple effect. Record date and time. #106

Merged
yev-kanivets merged 8 commits into from
Jul 20, 2016
Merged

[9h]. Ripple effect. Record date and time. #106

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9330fb2
#101[1h]. Change all icons to vector.
Jul 18, 2016
cd32529
#19[1h]. Display record date and time on AddRecord screen.
Jul 19, 2016
622ce30
#19[4h]. Add date and time pickers.
Jul 19, 2016
dc0adc1
#19. Fix wrong timestamp when editing record.
Jul 19, 2016
f722a27
#19[30m]. Fix wrong record time after editing.
Jul 19, 2016
200193b
Merge pull request #104 from evgenii-kanivets/feature-date_and_time
Jul 20, 2016
60e64c8
Add missed translations.
Jul 20, 2016
339eaab
#102[3h]. Add ripple effect to buttons and list items.
Jul 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#19[30m]. Fix wrong record time after editing.
  • Loading branch information
Evgenii Kanivets committed Jul 19, 2016
commit f722a27e88532a78cf383b24839001b69ca4c60e
7 changes: 4 additions & 3 deletions ...src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ record = getIntent().getParcelableExtra(KEY_RECORD);
mode = (Mode) getIntent().getSerializableExtra(KEY_MODE);
type = getIntent().getIntExtra(KEY_TYPE, -1);
accountList = accountController.readAll();
timestamp = new Date().getTime();

if (mode == Mode.MODE_EDIT) timestamp = record.getTime();
else timestamp = new Date().getTime();

return mode != null && type != -1 && (!mode.equals(Mode.MODE_EDIT) || record != null);
}
Expand All @@ -122,7 +124,6 @@ protected void initViews() {
etTitle.setText(record.getTitle());
if (record.getCategory() != null) etCategory.setText(record.getCategory().getName());
etPrice.setText(formatController.formatPrecisionNone(record.getFullPrice()));
timestamp = record.getTime();
}

presentSpinnerAccount();
Expand Down Expand Up @@ -365,7 +366,7 @@ private boolean doRecord(long timestamp, String title, String category, double p
return false;
}
} else if (mode == Mode.MODE_EDIT) {
Record updatedRecord = new Record(record.getId(), record.getTime(), record.getType(),
Record updatedRecord = new Record(record.getId(), timestamp, record.getType(),
title, new Category(category), price, account, account.getCurrency());
recordController.update(updatedRecord);

Expand Down