Skip to content

Commit eda96fe

Browse files
yev-kanivets#189. Fix bug connected to cutsom date in spinner MainActivity.
1 parent 4e92662 commit eda96fe

File tree

5 files changed

+15
-1
lines changed

5 files changed

+15
-1
lines changed

app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/PeriodSpinner.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.view.View;
77
import android.widget.AdapterView;
88
import android.widget.ArrayAdapter;
9+
import android.widget.Toast;
910

1011
import com.blogspot.e_kanivets.moneytracker.MtApp;
1112
import com.blogspot.e_kanivets.moneytracker.R;
@@ -184,7 +185,11 @@ public void OnDataChanged(Date toDate) {
184185
cal.set(Calendar.SECOND, 59);
185186
cal.set(Calendar.MILLISECOND, 999);
186187

187-
updatePeriod(new Period(fromDate, cal.getTime(), Period.TYPE_CUSTOM));
188+
if (cal.getTime().getTime() < fromDate.getTime()) {
189+
Toast.makeText(context, R.string.start_earlier_end, Toast.LENGTH_SHORT).show();
190+
} else {
191+
updatePeriod(new Period(fromDate, cal.getTime(), Period.TYPE_CUSTOM));
192+
}
188193
}
189194
});
190195
dialog.show();

app/src/main/res/values-ru/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,7 @@
129129
<string name="graph">График</string>
130130
<string name="information">Информация</string>
131131
<string name="operations">Операции</string>
132+
133+
<string name="start_earlier_end">Конечная дата не может быть раньше началной</string>
134+
132135
</resources>

app/src/main/res/values-uk/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,6 @@
129129
<string name="graph">Графік</string>
130130
<string name="information">Інформація</string>
131131
<string name="operations">Операції</string>
132+
133+
<string name="start_earlier_end">Дата початку не може бути раніше за дату кінця</string>
132134
</resources>

app/src/main/res/values-zh/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,7 @@
118118
<string name="graph">圖形</string>
119119
<string name="information">信息</string>
120120
<string name="operations">操作</string>
121+
122+
<string name="start_earlier_end">开始日期不能早于结束日期</string>
123+
121124
</resources>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,5 @@
145145
<string name="delete_backup_message">Are you sure about deleting this backup file %1$s? It can\'t be restored after.</string>
146146

147147
<string name="title_summary_record" translatable="false">%1$s (%2$d)</string>
148+
<string name="start_earlier_end">End date can\'t be earlier start date</string>
148149
</resources>

0 commit comments

Comments
 (0)