X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FGlobals.java;h=4103992bec5903735e3a566fd5ff76132a3affec;hb=986d32fbddf477e6f5a33bc3a7c51ea807c00425;hp=87730ca3e8ea7c2a6f52f32b63cdee98b99308ce;hpb=ea17ca9e3b03ca0090be03fdc0abbbbfd954be89;p=mobile-ledger.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java b/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java
index 87730ca3..4103992b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java
@@ -1,49 +1,53 @@
/*
- * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2020 Damyan Ivanov.
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.utils;
import android.app.Activity;
import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.util.Log;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public final class Globals {
- @ColorInt
- public static int tableRowLightBG;
- @ColorInt
- public static int tableRowDarkBG;
- @ColorInt
- public static int primaryDark, defaultTextColor;
+ private static final ThreadLocal dateFormatter =
+ new ThreadLocal() {
+ @Override
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat("yyyy/MM/dd", Locale.US);
+ }
+ };
+ private static final ThreadLocal isoDateFormatter =
+ new ThreadLocal() {
+ @Override
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat("yyyy-MM-dd", Locale.US);
+ }
+ };
public static String[] monthNames;
- private static SimpleDateFormat ledgerDateFormatter =
- new SimpleDateFormat("yyyy/MM/dd", Locale.US);
- private static Pattern reLedgerDate =
- Pattern.compile("^(?:(\\d+)/)??(?:(\\d\\d?)/)?(\\d\\d?)$");
+ public static final String developerEmail = "dam+mole-crash@ktnx.net";
+ private static final Pattern reLedgerDate =
+ Pattern.compile("^(?:(?:(\\d+)/)??(\\d\\d?)/)?(\\d\\d?)$");
public static void hideSoftKeyboard(Activity act) {
// hide the keyboard
View v = act.getCurrentFocus();
@@ -53,30 +57,48 @@ public final class Globals {
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
}
}
- public static Date parseLedgerDate(String dateString) throws ParseException {
+ public static SimpleDate parseLedgerDate(String dateString) throws ParseException {
Matcher m = reLedgerDate.matcher(dateString);
- if (!m.matches()) throw new ParseException(dateString, 0);
+ if (!m.matches()) throw new ParseException(
+ String.format("'%s' does not match expected pattern '%s'", dateString,
+ reLedgerDate.toString()), 0);
- String year = m.group(1);
- String month = m.group(2);
- String day = m.group(3);
+ String yearStr = m.group(1);
+ String monthStr = m.group(2);
+ String dayStr = m.group(3);
+
+ int year, month, day;
String toParse;
- if (year == null) {
- Calendar now = Calendar.getInstance();
- int thisYear = now.get(Calendar.YEAR);
- if (month == null) {
- int thisMonth = now.get(Calendar.MONTH) + 1;
- toParse = String.format(Locale.US, "%04d/%02d/%s", thisYear, thisMonth, dateString);
+ if (yearStr == null) {
+ SimpleDate today = SimpleDate.today();
+ year = today.year;
+ if (monthStr == null) {
+ month = today.month;
}
- else toParse = String.format(Locale.US, "%04d/%s", thisYear, dateString);
+ else month = Integer.parseInt(monthStr);
+ }
+ else {
+ year = Integer.parseInt(yearStr);
+ assert monthStr != null;
+ month = Integer.parseInt(monthStr);
}
- else toParse = dateString;
- Log.d("globals", String.format("Parsing date '%s'", toParse));
- return ledgerDateFormatter.parse(toParse);
+ assert dayStr != null;
+ day = Integer.parseInt(dayStr);
+
+ return new SimpleDate(year, month, day);
+ }
+ public static Calendar parseLedgerDateAsCalendar(String dateString) throws ParseException {
+ return parseLedgerDate(dateString).toCalendar();
+ }
+ public static SimpleDate parseIsoDate(String dateString) throws ParseException {
+ return SimpleDate.fromDate(isoDateFormatter.get().parse(dateString));
+ }
+ public static String formatLedgerDate(SimpleDate date) {
+ return dateFormatter.get().format(date.toDate());
}
- public static String formatLedgerDate(Date date) {
- return ledgerDateFormatter.format(date);
+ public static String formatIsoDate(SimpleDate date) {
+ return isoDateFormatter.get().format(date.toDate());
}
}
\ No newline at end of file