prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes

Browse Source
This commit is contained in:
Koitharu
2020-12-16 17:48:26 +02:00
parent 113cde2f07
commit 0931e4e0e6
30 changed files with 130 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
View File

@@ -52,8 +52,6 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
MultiSummaryProvider(R.string.gestures_only)
findPreference<MultiSelectListPreference>(AppSettings.KEY_TRACK_SOURCES)?.summaryProvider =
MultiSummaryProvider(R.string.dont_check)
findPreference<Preference>(AppSettings.KEY_GRID_SIZE)?.isEnabled =
settings.listMode == ListMode.GRID
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -93,10 +91,6 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
?: getString(R.string.not_available)
}
}
AppSettings.KEY_LIST_MODE -> {
findPreference<Preference>(AppSettings.KEY_GRID_SIZE)?.isEnabled =
settings.listMode == ListMode.GRID
}
}
}

8
app/src/main/java/org/koitharu/kotatsu/settings/NotificationSettingsLegacyFragment.kt
View File

@@ -17,9 +17,10 @@ class NotificationSettingsLegacyFragment : BasePreferenceFragment(R.string.notif
private val ringtonePickContract = registerForActivityResult(
RingtonePickContract(get<Context>().getString(R.string.notification_sound))
) { uri ->
settings.notificationSound = uri?.toString().orEmpty()
settings.notificationSound = uri?.toString() ?: return@registerForActivityResult
findPreference<Preference>(AppSettings.KEY_NOTIFICATIONS_SOUND)?.run {
summary = RingtoneManager.getRingtone(context, uri).getTitle(context)
summary = RingtoneManager.getRingtone(context, uri)?.getTitle(context)
?: getString(R.string.silent)
}
}
@@ -31,7 +32,8 @@ class NotificationSettingsLegacyFragment : BasePreferenceFragment(R.string.notif
super.onViewCreated(view, savedInstanceState)
findPreference<Preference>(AppSettings.KEY_NOTIFICATIONS_SOUND)?.run {
val uri = settings.notificationSound.toUriOrNull()
summary = RingtoneManager.getRingtone(context, uri).getTitle(context)
summary = RingtoneManager.getRingtone(context, uri)?.getTitle(context)
?: getString(R.string.silent)
}
}