isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove AndroidDateFormats

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-21 20:29:41 -06:00
parent b94a887534
commit 52b25fbc72
5 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
View File

@@ -459,9 +459,9 @@ public class BarChart extends ScrollableChart
return;
}
dfYear = AndroidDateFormats.fromSkeleton("yyyy");
dfMonth = AndroidDateFormats.fromSkeleton("MMM");
dfDay = AndroidDateFormats.fromSkeleton("d");
dfYear = DateExtensionsKt.toSimpleDataFormat("yyyy");
dfMonth = DateExtensionsKt.toSimpleDataFormat("MMM");
dfDay = DateExtensionsKt.toSimpleDataFormat("d");
}
private void initPaints()

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
View File

@@ -316,8 +316,8 @@ public class FrequencyChart extends ScrollableChart
}
else
{
dfMonth = AndroidDateFormats.fromSkeleton("MMM");
dfYear = AndroidDateFormats.fromSkeleton("yyyy");
dfMonth = DateExtensionsKt.toSimpleDataFormat("MMM");
dfYear = DateExtensionsKt.toSimpleDataFormat("yyyy");
}
}

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
View File

@@ -509,8 +509,8 @@ public class HistoryChart extends ScrollableChart
}
else
{
dfMonth = AndroidDateFormats.fromSkeleton("MMM");
dfYear = AndroidDateFormats.fromSkeleton("yyyy");
dfMonth = DateExtensionsKt.toSimpleDataFormat("MMM");
dfYear = DateExtensionsKt.toSimpleDataFormat("yyyy");
}
}

6
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
View File

@@ -421,9 +421,9 @@ public class ScoreChart extends ScrollableChart
}
else
{
dfMonth = AndroidDateFormats.fromSkeleton("MMM");
dfYear = AndroidDateFormats.fromSkeleton("yyyy");
dfDay = AndroidDateFormats.fromSkeleton("d");
dfMonth = DateExtensionsKt.toSimpleDataFormat("MMM");
dfYear = DateExtensionsKt.toSimpleDataFormat("yyyy");
dfDay = DateExtensionsKt.toSimpleDataFormat("d");
}
}

27
android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AndroidDateFormats.java → android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
* Copyright (C) 2016-2020 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
@@ -16,24 +16,15 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.utils;
import androidx.annotation.NonNull;
package org.isoron.uhabits.utils
import org.isoron.uhabits.core.utils.*;
import android.text.format.DateFormat
import org.isoron.uhabits.core.utils.*
import java.text.*
import java.util.*
import java.text.*;
import java.util.*;
import static android.text.format.DateFormat.getBestDateTimePattern;
public class AndroidDateFormats
{
@NonNull
public static SimpleDateFormat fromSkeleton(@NonNull String skeleton)
{
Locale locale = Locale.getDefault();
skeleton = getBestDateTimePattern(locale, skeleton);
return DateFormats.fromSkeleton(skeleton, locale);
}
fun String.toSimpleDataFormat(): SimpleDateFormat {
val locale = Locale.getDefault()
return DateFormats.fromSkeleton(DateFormat.getBestDateTimePattern(locale, this), locale)
}