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

Account goal. #158

Merged
yev-kanivets merged 2 commits into from
Sep 16, 2018
Merged

Account goal. #158

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24fbc63
#134. Add account goal to EditAccountFragment.
Sep 16, 2018
ea19a2c
#134. Formatting.
Sep 16, 2018
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
#134. Formatting.
  • Loading branch information
Evgenii Kanivets committed Sep 16, 2018
commit ea19a2cb1cbce0911db3931a5fe102046f845c52
3 changes: 3 additions & 0 deletions ...om/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/EditAccountFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.blogspot.e_kanivets.moneytracker.activity.base.BaseFragment
import com.blogspot.e_kanivets.moneytracker.controller.FormatController
import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
import com.blogspot.e_kanivets.moneytracker.entity.data.Account
import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy
import com.blogspot.e_kanivets.moneytracker.util.validator.EditAccountValidator
import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator
import kotlinx.android.synthetic.main.fragment_edit_account.*
Expand Down Expand Up @@ -45,6 +46,7 @@ class EditAccountFragment : BaseFragment() {
}

private fun done() {
AnswersProxy.get().logButton("Edit Account")
if (accountValidator.validate()) {
val title = etTitle.text.toString().trim { it <= ' ' }
val goal = etGoal.text.toString().toDouble()
Expand All @@ -55,6 +57,7 @@ class EditAccountFragment : BaseFragment() {
)
val updated = accountController.update(newAccount) != null
if (updated) {
AnswersProxy.get().logEvent("Edit Account")
activity?.setResult(Activity.RESULT_OK)
activity?.finish()
}
Expand Down
18 changes: 6 additions & 12 deletions ...c/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/EditAccountValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,20 @@

public class EditAccountValidator implements IValidator<Account> {

@NonNull
private final Context context;
@NonNull private final Context context;

@BindView(R.id.tilTitle)
TextInputLayout tilTitle;
@BindView(R.id.etTitle)
EditText etTitle;
@BindView(R.id.tilGoal)
TextInputLayout tilGoal;
@BindView(R.id.etGoal)
EditText etGoal;
@BindView(R.id.tilTitle) TextInputLayout tilTitle;
@BindView(R.id.etTitle) EditText etTitle;
@BindView(R.id.tilGoal) TextInputLayout tilGoal;
@BindView(R.id.etGoal) EditText etGoal;

public EditAccountValidator(@NonNull Context context, @NonNull View view) {
this.context = context;
ButterKnife.bind(this, view);
initTextWatchers();
}

@Override
public boolean validate() {
@Override public boolean validate() {
String title = etTitle.getText().toString().trim();
double goal = Double.MAX_VALUE;

Expand Down