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

Finish uhabits-core ui conversion

Browse Source
This commit is contained in:
Quentin Hibon
2021-01-19 23:34:48 +01:00
parent 136ec5b49b
commit b21eb3f118
13 changed files with 351 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
View File

@@ -41,7 +41,7 @@ constructor(
preferences: Preferences,
) : ThemeSwitcher(preferences) {
private var currentTheme: Theme = LightTheme()
override var currentTheme: Theme = LightTheme()
override fun getSystemTheme(): Int {
if (SDK_INT < 29) return THEME_LIGHT
@@ -53,9 +53,9 @@ constructor(
}
}
override fun getCurrentTheme(): Theme {
return currentTheme
}
// override fun getCurrentTheme(): Theme {
// return currentTheme
// }
override fun applyDarkTheme() {
currentTheme = DarkTheme()

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
View File

@@ -33,7 +33,7 @@ import org.isoron.uhabits.activities.habits.list.views.HabitCardListAdapter
import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.core.sync.SyncManager
import org.isoron.uhabits.core.tasks.TaskRunner
import org.isoron.uhabits.core.ui.ThemeSwitcher.THEME_DARK
import org.isoron.uhabits.core.ui.ThemeSwitcher.Companion.THEME_DARK
import org.isoron.uhabits.core.utils.MidnightTimer
import org.isoron.uhabits.database.AutoBackup
import org.isoron.uhabits.inject.ActivityContextModule

2
uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
View File

@@ -53,7 +53,7 @@ class AndroidNotificationTray
) : NotificationTray.SystemTray {
private var active = HashSet<Int>()
override fun log(msg: String) {
override fun log(msg: String?) {
Log.d("AndroidNotificationTray", msg)
}

2
uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.kt
View File

@@ -43,7 +43,7 @@ class ReminderController @Inject constructor(
fun onShowReminder(
habit: Habit,
timestamp: Timestamp?,
timestamp: Timestamp,
reminderTime: Long
) {
notificationTray.show(habit, timestamp, reminderTime)