From efe6f005bde5af8d01e16ac4dabce5b09d411263 Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Fri, 24 Apr 2020 13:48:55 +0530 Subject: [PATCH 1/3] Calender icon: Add translation for month names --- .../e/blisslauncher/core/Utilities.java | 30 ++++++++++--------- app/src/main/res/values/strings.xml | 14 +++++++++ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java b/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java index 33dd11d792..2490b2f750 100755 --- a/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java +++ b/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java @@ -26,6 +26,8 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import foundation.e.blisslauncher.R; + public class Utilities { private static final String TAG = "Utilities"; @@ -109,34 +111,34 @@ public class Utilities { return (int) Math.ceil(fm.bottom - fm.top); } - public static String convertMonthToString(int month) { + public static int convertMonthToString(int month) { switch (month) { case Calendar.JANUARY: - return "JAN"; + return R.string.january; case Calendar.FEBRUARY: - return "FEB"; + return R.string.february; case Calendar.MARCH: - return "MAR"; + return R.string.march; case Calendar.APRIL: - return "APR"; + return (R.string.april); case Calendar.MAY: - return "MAY"; + return R.string.may; case Calendar.JUNE: - return "JUN"; + return R.string.june; case Calendar.JULY: - return "JUL"; + return R.string.july; case Calendar.AUGUST: - return "AUG"; + return R.string.august; case Calendar.SEPTEMBER: - return "SEP"; + return R.string.september; case Calendar.OCTOBER: - return "OCT"; + return R.string.october; case Calendar.NOVEMBER: - return "NOV"; + return R.string.november; case Calendar.DECEMBER: - return "DEC"; + return R.string.december; default: - return ""; + return 0; } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0feea703a9..593b8a8151 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -174,5 +174,19 @@ Add Widget Edit Widgets + + + JAN + FEB + MAR + APR + MAY + JUN + JUL + AUG + SEP + OCT + NOV + DEC -- GitLab From a571bf06584f2de4b0a44d7707278fdf782da713 Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Sat, 25 Apr 2020 16:14:31 +0530 Subject: [PATCH 2/3] Add language translation for calendar icon --- .../e/blisslauncher/core/Utilities.java | 34 +++---------------- .../core/customviews/BlissFrameLayout.java | 2 +- .../features/launcher/LauncherActivity.java | 2 +- app/src/main/res/values/strings.xml | 14 -------- 4 files changed, 7 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java b/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java index 2490b2f750..c8aba0a5bc 100755 --- a/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java +++ b/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java @@ -17,6 +17,7 @@ import android.view.ViewGroup; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Method; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.concurrent.Executor; @@ -111,35 +112,10 @@ public class Utilities { return (int) Math.ceil(fm.bottom - fm.top); } - public static int convertMonthToString(int month) { - switch (month) { - case Calendar.JANUARY: - return R.string.january; - case Calendar.FEBRUARY: - return R.string.february; - case Calendar.MARCH: - return R.string.march; - case Calendar.APRIL: - return (R.string.april); - case Calendar.MAY: - return R.string.may; - case Calendar.JUNE: - return R.string.june; - case Calendar.JULY: - return R.string.july; - case Calendar.AUGUST: - return R.string.august; - case Calendar.SEPTEMBER: - return R.string.september; - case Calendar.OCTOBER: - return R.string.october; - case Calendar.NOVEMBER: - return R.string.november; - case Calendar.DECEMBER: - return R.string.december; - default: - return 0; - } + public static String convertMonthToString() { + Calendar cal=Calendar.getInstance(); + SimpleDateFormat month_date = new SimpleDateFormat("MMM"); + return month_date.format(cal.getTime()); } /** diff --git a/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlissFrameLayout.java b/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlissFrameLayout.java index 8f6f8d0d92..75793eb032 100755 --- a/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlissFrameLayout.java +++ b/app/src/main/java/foundation/e/blisslauncher/core/customviews/BlissFrameLayout.java @@ -237,7 +237,7 @@ public class BlissFrameLayout extends FrameLayout { CalendarIcon calendarIcon = new CalendarIcon(monthTextView, dateTextView); calendarIcon.monthTextView.setText( - Utilities.convertMonthToString(Calendar.getInstance().get(Calendar.MONTH))); + Utilities.convertMonthToString()); calendarIcon.dayTextView.setText( String.valueOf(Calendar.getInstance().get(Calendar.DAY_OF_MONTH))); } else { diff --git a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java index 057b6d5b31..2b6eddff82 100755 --- a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java +++ b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java @@ -410,7 +410,7 @@ public class LauncherActivity extends AppCompatActivity implements private void updateCalendarIcon(CalendarIcon calendarIcon, Calendar calendar) { calendarIcon.monthTextView.setText( - Utilities.convertMonthToString(calendar.get(Calendar.MONTH))); + Utilities.convertMonthToString()); calendarIcon.dayTextView.setText( String.valueOf(calendar.get(Calendar.DAY_OF_MONTH))); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 593b8a8151..0feea703a9 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -174,19 +174,5 @@ Add Widget Edit Widgets - - - JAN - FEB - MAR - APR - MAY - JUN - JUL - AUG - SEP - OCT - NOV - DEC -- GitLab From b9e2cf2ca4de69d73edbefedd3ea81b5dad67628 Mon Sep 17 00:00:00 2001 From: Dayona Joseph Date: Sat, 25 Apr 2020 16:23:39 +0530 Subject: [PATCH 3/3] Refractor unwanted imports --- app/src/main/java/foundation/e/blisslauncher/core/Utilities.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java b/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java index c8aba0a5bc..502746241a 100755 --- a/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java +++ b/app/src/main/java/foundation/e/blisslauncher/core/Utilities.java @@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import foundation.e.blisslauncher.R; public class Utilities { -- GitLab