Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
B
BlissLauncher
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Merge Requests
5
Merge Requests
5
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
e
apps
BlissLauncher
Commits
b593a636
Commit
b593a636
authored
May 20, 2020
by
Romain Hunault
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-811' into 'master'
Calender icon: Add translation for month names See merge request
!38
parents
bdb78530
c4aa9f0e
Pipeline
#55104
canceled with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
31 deletions
+8
-31
app/src/main/java/foundation/e/blisslauncher/core/Utilities.java
.../main/java/foundation/e/blisslauncher/core/Utilities.java
+6
-29
app/src/main/java/foundation/e/blisslauncher/core/customviews/BlissFrameLayout.java
...on/e/blisslauncher/core/customviews/BlissFrameLayout.java
+1
-1
app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
...n/e/blisslauncher/features/launcher/LauncherActivity.java
+1
-1
No files found.
app/src/main/java/foundation/e/blisslauncher/core/Utilities.java
View file @
b593a636
...
...
@@ -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
;
...
...
@@ -26,6 +27,7 @@ import java.util.concurrent.TimeUnit;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
public
class
Utilities
{
private
static
final
String
TAG
=
"Utilities"
;
...
...
@@ -109,35 +111,10 @@ public class Utilities {
return
(
int
)
Math
.
ceil
(
fm
.
bottom
-
fm
.
top
);
}
public
static
String
convertMonthToString
(
int
month
)
{
switch
(
month
)
{
case
Calendar
.
JANUARY
:
return
"JAN"
;
case
Calendar
.
FEBRUARY
:
return
"FEB"
;
case
Calendar
.
MARCH
:
return
"MAR"
;
case
Calendar
.
APRIL
:
return
"APR"
;
case
Calendar
.
MAY
:
return
"MAY"
;
case
Calendar
.
JUNE
:
return
"JUN"
;
case
Calendar
.
JULY
:
return
"JUL"
;
case
Calendar
.
AUGUST
:
return
"AUG"
;
case
Calendar
.
SEPTEMBER
:
return
"SEP"
;
case
Calendar
.
OCTOBER
:
return
"OCT"
;
case
Calendar
.
NOVEMBER
:
return
"NOV"
;
case
Calendar
.
DECEMBER
:
return
"DEC"
;
default
:
return
""
;
}
public
static
String
convertMonthToString
()
{
Calendar
cal
=
Calendar
.
getInstance
();
SimpleDateFormat
month_date
=
new
SimpleDateFormat
(
"MMM"
);
return
month_date
.
format
(
cal
.
getTime
());
}
/**
...
...
app/src/main/java/foundation/e/blisslauncher/core/customviews/BlissFrameLayout.java
View file @
b593a636
...
...
@@ -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
{
...
...
app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
View file @
b593a636
...
...
@@ -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
)));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment