Skip to content

style change in home screen #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marco-la-rosa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

style change in home screen #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions app/src/main/java/app/olauncher/ui/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ import app.olauncher.helper.setPlainWallpaperByTheme
import app.olauncher.helper.showToast
import app.olauncher.listener.OnSwipeTouchListener
import app.olauncher.listener.ViewSwipeTouchListener
import android.graphics.Typeface
import androidx.core.content.res.ResourcesCompat
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Date
import java.util.Locale

Expand Down Expand Up @@ -249,22 +252,44 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
binding.homeApp8.gravity = horizontalGravity
}

private fun getOrdinalSuffix(day: Int): String {
return when {
day in 11..13 -> "th"
day % 10 == 1 -> "st"
day % 10 == 2 -> "nd"
day % 10 == 3 -> "rd"
else -> "th"
}
}

private fun populateDateTime() {
binding.dateTimeLayout.isVisible = prefs.dateTimeVisibility != Constants.DateTime.OFF
binding.clock.isVisible = Constants.DateTime.isTimeVisible(prefs.dateTimeVisibility)
binding.date.isVisible = Constants.DateTime.isDateVisible(prefs.dateTimeVisibility)

// var dateText = SimpleDateFormat("EEE, d MMM", Locale.getDefault()).format(Date())
val dateFormat = SimpleDateFormat("EEE, d MMM", Locale.getDefault())
var dateText = dateFormat.format(Date())
// Apply Poppins Regular font to date
try {
val poppinsTypeface = ResourcesCompat.getFont(requireContext(), R.font.poppins)
binding.date.typeface = poppinsTypeface
} catch (e: Exception) {
e.printStackTrace()
}

val calendar = Calendar.getInstance()
val dayOfWeek = SimpleDateFormat("EEEE", Locale.ENGLISH).format(calendar.time).lowercase()
val dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH)
val month = SimpleDateFormat("MMMM", Locale.ENGLISH).format(calendar.time).lowercase()
val ordinal = getOrdinalSuffix(dayOfMonth)

var dateText = "today it's $dayOfWeek ${dayOfMonth}${ordinal} of $month"

if (!prefs.showStatusBar) {
val battery = (requireContext().getSystemService(Context.BATTERY_SERVICE) as BatteryManager)
.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
if (battery > 0)
dateText = getString(R.string.day_battery, dateText, battery)
}
binding.date.text = dateText.replace(".,", ",")
binding.date.text = dateText
}

@RequiresApi(Build.VERSION_CODES.Q)
Expand Down
Binary file added app/src/main/res/font/poppins.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/poppins_bold.ttf
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion app/src/main/res/layout-land/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
style="@style/TextDefault"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:fontFamily="@font/poppins_bold"
android:textStyle="bold"
android:format12Hour="h:mm"
android:textSize="@dimen/time_size"
tools:text="02:34" />
Expand All @@ -49,6 +50,7 @@
style="@style/TextDefault"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins"
android:format12Hour="EEE, dd MMM"
android:format24Hour="EEE, dd MMM"
android:paddingHorizontal="3dp"
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
style="@style/TextDefault"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:fontFamily="@font/poppins_bold"
android:textStyle="bold"
android:format12Hour="h:mm"
android:textSize="@dimen/time_size"
tools:text="02:34" />
Expand All @@ -48,6 +49,7 @@
style="@style/TextDefault"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins"
android:format12Hour="EEE, dd MMM"
android:format24Hour="EEE, dd MMM"
android:paddingHorizontal="3dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hdpi/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dimen name="text_large">26sp</dimen>
<dimen name="text_small">14sp</dimen>
<dimen name="app_padding_vertical">10dp</dimen>
<dimen name="home_app_padding_vertical">8dp</dimen>
<dimen name="home_app_padding_vertical">3dp</dimen>

<dimen name="time_size">50sp</dimen>
<dimen name="date_size">14sp</dimen>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ldpi/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dimen name="text_large">26sp</dimen>
<dimen name="text_small">14sp</dimen>
<dimen name="app_padding_vertical">8dp</dimen>
<dimen name="home_app_padding_vertical">6dp</dimen>
<dimen name="home_app_padding_vertical">2dp</dimen>

<dimen name="time_size">50sp</dimen>
<dimen name="date_size">14sp</dimen>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-mdpi/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dimen name="text_large">26sp</dimen>
<dimen name="text_small">14sp</dimen>
<dimen name="app_padding_vertical">8dp</dimen>
<dimen name="home_app_padding_vertical">6dp</dimen>
<dimen name="home_app_padding_vertical">2dp</dimen>

<dimen name="time_size">50sp</dimen>
<dimen name="date_size">14sp</dimen>
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-night/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
</style>

<style name="TextLarge" parent="TextDefault">
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:fontFamily">@font/poppins_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">@dimen/text_large</item>
</style>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-xhdpi/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dimen name="text_large">28sp</dimen>
<dimen name="text_small">16sp</dimen>
<dimen name="app_padding_vertical">12dp</dimen>
<dimen name="home_app_padding_vertical">10dp</dimen>
<dimen name="home_app_padding_vertical">4dp</dimen>

<dimen name="time_size">60sp</dimen>
<dimen name="date_size">16sp</dimen>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-xxhdpi/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dimen name="text_large">30sp</dimen>
<dimen name="text_small">18sp</dimen>
<dimen name="app_padding_vertical">12dp</dimen>
<dimen name="home_app_padding_vertical">10dp</dimen>
<dimen name="home_app_padding_vertical">4dp</dimen>

<dimen name="time_size">66sp</dimen>
<dimen name="date_size">18sp</dimen>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-xxxhdpi/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dimen name="text_large">32sp</dimen>
<dimen name="text_small">18sp</dimen>
<dimen name="app_padding_vertical">16dp</dimen>
<dimen name="home_app_padding_vertical">14dp</dimen>
<dimen name="home_app_padding_vertical">5dp</dimen>

<dimen name="time_size">66sp</dimen>
<dimen name="date_size">18sp</dimen>
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
</style>

<style name="TextLarge" parent="TextDefault">
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:fontFamily">@font/poppins_bold</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">@dimen/text_large</item>
</style>

Expand Down