Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
val launcherDefault = MutableLiveData<Boolean>()

val showDate = MutableLiveData(prefs.showDate)
val showDayOfYear = MutableLiveData(prefs.showDayOfYear)
val showClock = MutableLiveData(prefs.showClock)
val showAlarm = MutableLiveData(prefs.showAlarm)
val showDailyWord = MutableLiveData(prefs.showDailyWord)
Expand Down Expand Up @@ -186,6 +187,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
showDate.value = visibility
}

fun setShowDayOfYear(visibility: Boolean) {
showDayOfYear.value = visibility
}

fun setShowClock(visibility: Boolean) {
showClock.value = visibility
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ class Prefs(val context: Context) {
var showDate: Boolean
get() = getSetting(SHOW_DATE, true)
set(value) = prefsNormal.edit { putBoolean(SHOW_DATE, value) }

var showDayOfYear: Boolean
get() = getSetting(SHOW_DAY_OF_YEAR, false)
set(value) = prefsNormal.edit { putBoolean(SHOW_DAY_OF_YEAR, value) }

var showClock: Boolean
get() = getSetting(SHOW_CLOCK, true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ internal const val SHOW_WEATHER = "SHOW_WEATHER"
internal const val GPS_LOCATION = "GPS_LOCATION"
internal const val SHOW_AZSIDEBAR = "SHOW_AZSIDEBAR"
internal const val SHOW_DATE = "SHOW_DATE"
internal const val SHOW_DAY_OF_YEAR = "SHOW_DAY_OF_YEAR"
internal const val HOME_LOCKED = "HOME_LOCKED"
internal const val SETTINGS_LOCKED = "SETTINGS_LOCKED"
internal const val HIDE_SEARCH_VIEW = "HIDE_SEARCH_VIEW"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ import com.github.codeworkscreativehub.mlauncher.ui.components.DialogManager
import com.github.codeworkscreativehub.mlauncher.ui.widgets.WidgetActivity
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import java.util.Calendar

class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListener {

Expand All @@ -109,6 +110,13 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
private var _binding: FragmentHomeBinding? = null
private val binding get() = _binding!!

private fun getDayOfYearText(): String {
val cal = Calendar.getInstance()
val day = cal.get(Calendar.DAY_OF_YEAR)
val max = cal.getActualMaximum(Calendar.DAY_OF_YEAR)
return "[$day/$max]"
}

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
Expand Down Expand Up @@ -310,9 +318,21 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
clock.format24Hour = timePattern

// Date format
val datePattern = DateFormat.getBestDateTimePattern(locale, "EEEddMMM")
date.format12Hour = datePattern
date.format24Hour = datePattern
// val datePattern = DateFormat.getBestDateTimePattern(locale, "EEEddMMM")
// date.format12Hour = datePattern
// date.format24Hour = datePattern

val basePattern = DateFormat.getBestDateTimePattern(locale, "EEEddMMM")

val finalPattern = if (prefs.showDayOfYear) {
"$basePattern ${getDayOfYearText()}"
} else {
basePattern
}

date.format12Hour = finalPattern
date.format24Hour = finalPattern


alarm.text = getNextAlarm(requireContext(), prefs)
dailyWord.text = wordOfTheDay(prefs)
Expand Down Expand Up @@ -492,6 +512,9 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
showDate.observe(viewLifecycleOwner) {
binding.date.isVisible = it
}
showDayOfYear.observe(viewLifecycleOwner) {
updateTimeAndInfo()
}
showClock.observe(viewLifecycleOwner) {
binding.clock.isVisible = it
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ class SettingsFragment : BaseFragment() {
var toggledHomePager by remember { mutableStateOf(prefs.homePager) }

var toggledShowDate by remember { mutableStateOf(prefs.showDate) }
var toggledShowDayOfYear by remember { mutableStateOf(prefs.showDayOfYear) }
var toggledShowClock by remember { mutableStateOf(prefs.showClock) }
var toggledShowClockFormat by remember { mutableStateOf(prefs.showClockFormat) }
var toggledShowAlarm by remember { mutableStateOf(prefs.showAlarm) }
Expand Down Expand Up @@ -1012,6 +1013,17 @@ class SettingsFragment : BaseFragment() {
}
)

SettingsSwitch(
text = getLocalizedString(R.string.show_day_of_year),
fontSize = titleFontSize,
defaultState = toggledShowDayOfYear,
onCheckedChange = {
toggledShowDayOfYear = !prefs.showDayOfYear
prefs.showDayOfYear = toggledShowDayOfYear
viewModel.setShowDayOfYear(prefs.showDayOfYear)
}
)

SettingsSwitch(
text = getLocalizedString(R.string.show_clock),
fontSize = titleFontSize,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
<string name="show_clock">Show Clock</string>
<string name="show_clock_format">Show Format (AM/PM)</string>
<string name="show_date">Show Date</string>
<string name="show_day_of_year">Show Day Of Year</string>
<string name="show_alarm">Show Alarm</string>
<string name="show_daily_word">Show Daily Word</string>
<string name="show_battery">Show Battery</string>
Expand Down
Loading