Skip to content

Commit 436b61d

Browse files
authored
Merge pull request #3 from rMozg/develop
some fixes
2 parents 890ff6b + 6dda405 commit 436b61d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/src/main/java/ru/mozgovoy/oleg/exchangerate/ui/presenter/IRatePresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ public interface IRatePresenter {
1111

1212
void startDownloadNewRates(Context appContext);
1313

14-
void startRecalculate(@NonNull BigDecimal value, @NonNull Currency currencyFrom, @NonNull Currency currencyTo);
14+
void recalculateButtonClicked(@NonNull BigDecimal value, @NonNull Currency currencyFrom, @NonNull Currency currencyTo);
1515
}

app/src/main/java/ru/mozgovoy/oleg/exchangerate/ui/presenter/RatePresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected void onReceiveResult(int resultCode, Bundle resultData) {
8080
}
8181

8282
@Override
83-
public void startRecalculate(@NonNull BigDecimal value, @NonNull Currency currencyFrom, @NonNull Currency currencyTo) {
83+
public void recalculateButtonClicked(@NonNull BigDecimal value, @NonNull Currency currencyFrom, @NonNull Currency currencyTo) {
8484
CurrencyRate currencyRateFrom = currencyRates.get(currencyFrom);
8585
CurrencyRate currencyRateTo = currencyRates.get(currencyTo);
8686
if (currencyRateFrom == null || currencyRateTo == null) {

app/src/main/java/ru/mozgovoy/oleg/exchangerate/ui/view/RateActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void onClick(View view) {
9090
Object curFromObject = spinnerFrom.getSelectedItem();
9191
Object curToObject = spinnerTo.getSelectedItem();
9292
if ((curFromObject instanceof CurrencyView) && (curToObject instanceof CurrencyView)) {
93-
ratePresenter.startRecalculate(
93+
ratePresenter.recalculateButtonClicked(
9494
sumfrom,
9595
((CurrencyView) curFromObject).getCurrency(),
9696
((CurrencyView) curToObject).getCurrency());
@@ -110,7 +110,6 @@ public void onClick(View view) {
110110
@Override
111111
protected void onResume() {
112112
super.onResume();
113-
ratePresenter.startDownloadNewRates(getApplicationContext());
114113
}
115114

116115
@Override
@@ -175,6 +174,7 @@ public void showRecalculatedValue(BigDecimal value) {
175174
public void showError(ErrorType errorType) {
176175
switch (errorType) {
177176
case CALCULATE:
177+
textTo.setText("");
178178
Snackbar.make(screenGroup.getRootView(), getString(R.string.error_calculate), Snackbar.LENGTH_LONG).show();
179179
break;
180180
case DOWNLOAD:

0 commit comments

Comments
 (0)