archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set formatting to kotlin style guide

Browse Source
pull/935/head
Alex Baker 6 years ago
parent 940785ceec
commit fe611468e3
20 changed files with 681 additions and 538 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle.kts
Unescape Escape View File

@ -56,7 +56,7 @@ android {
val tasksKeyPassword: String? by project
keyAlias = tasksKeyAlias
storeFile = file(tasksStoreFile?: "none")
storeFile = file(tasksStoreFile ?: "none")
storePassword = tasksStorePassword
keyPassword = tasksKeyPassword
}

5
app/src/debug/java/org/tasks/preferences/fragments/Debug.kt
Unescape Escape View File

@ -26,11 +26,14 @@ class Debug : InjectingPreferenceFragment() {
R.string.p_leakcanary,
R.string.p_flipper,
R.string.p_strict_mode_vm,
R.string.p_strict_mode_thread)) findPreference(pref)
R.string.p_strict_mode_thread
)) {
findPreference(pref)
.setOnPreferenceChangeListener { _: Preference?, _: Any? ->
showRestartDialog()
true
}
}
findPreference(R.string.debug_reset_ssl).setOnPreferenceClickListener {
resetCertificates(context!!)

8
app/src/main/java/org/tasks/locale/ui/activity/AbstractFragmentPluginPreference.kt
Unescape Escape View File

@ -21,7 +21,8 @@ abstract class AbstractFragmentPluginPreference : BasePreferences() {
if (isLocalePluginIntent(intent)) {
Timber.d(
"Creating Activity with Intent=%s, savedInstanceState=%s, EXTRA_BUNDLE=%s",
intent, savedInstanceState, getPreviousBundle())
intent, savedInstanceState, getPreviousBundle()
)
}
}
@ -32,7 +33,10 @@ abstract class AbstractFragmentPluginPreference : BasePreferences() {
if (null != resultBundle) {
val blurb = getResultBlurb(resultBundle)
val result = Bundle()
result.putBundle(com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE, resultBundle)
result.putBundle(
com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE,
resultBundle
)
result.putString(com.twofortyfouram.locale.api.Intent.EXTRA_STRING_BLURB, blurb)
setResult(RESULT_OK, Intent().putExtras(result))
}

3
app/src/main/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.kt
Unescape Escape View File

@ -36,5 +36,6 @@ class TaskerSettingsActivity : AbstractFragmentPluginPreference() {
override fun inject(component: ActivityComponent) = component.inject(this)
private fun getFragment() = supportFragmentManager.findFragmentById(R.id.settings) as TaskerListNotification
private fun getFragment() =
supportFragmentManager.findFragmentById(R.id.settings) as TaskerListNotification
}

3
app/src/main/java/org/tasks/preferences/BasePreferences.kt
Unescape Escape View File

@ -36,7 +36,8 @@ abstract class BasePreferences : ThemedInjectingAppCompatActivity(),
toolbar.title = getString(getRootTitle())
}
}
toolbar.navigationIcon = ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px);
toolbar.navigationIcon =
ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px);
toolbar.setNavigationOnClickListener { onBackPressed() }
setupMenu()
MenuColorizer.colorToolbar(this, toolbar)

2
app/src/main/java/org/tasks/preferences/ManageSpaceActivity.kt
Unescape Escape View File

@ -3,8 +3,6 @@ package org.tasks.preferences
import org.tasks.R
import org.tasks.injection.ActivityComponent
import org.tasks.preferences.fragments.Advanced
import org.tasks.preferences.fragments.HelpAndFeedback
import org.tasks.preferences.fragments.Notifications
class ManageSpaceActivity : BasePreferences() {

1
app/src/main/java/org/tasks/preferences/NotificationPreferences.kt
Unescape Escape View File

@ -2,7 +2,6 @@ package org.tasks.preferences
import org.tasks.R
import org.tasks.injection.ActivityComponent
import org.tasks.preferences.fragments.HelpAndFeedback
import org.tasks.preferences.fragments.Notifications
class NotificationPreferences : BasePreferences() {

24
app/src/main/java/org/tasks/preferences/fragments/Advanced.kt
Unescape Escape View File

@ -81,12 +81,17 @@ class Advanced : InjectingPreferenceFragment() {
findPreference(R.string.p_attachment_dir)
.setOnPreferenceClickListener {
FileHelper.newDirectoryPicker(this, REQUEST_CODE_FILES_DIR, preferences.attachmentsDirectory)
FileHelper.newDirectoryPicker(
this,
REQUEST_CODE_FILES_DIR,
preferences.attachmentsDirectory
)
false
}
updateAttachmentDirectory()
calendarReminderPreference = findPreference(R.string.p_calendar_reminders) as SwitchPreferenceCompat
calendarReminderPreference =
findPreference(R.string.p_calendar_reminders) as SwitchPreferenceCompat
initializeCalendarReminderPreference()
}
@ -98,7 +103,8 @@ class Advanced : InjectingPreferenceFragment() {
context!!.contentResolver
.takePersistableUriPermission(
uri,
Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
)
}
preferences.setUri(R.string.p_attachment_dir, uri)
updateAttachmentDirectory()
@ -109,7 +115,8 @@ class Advanced : InjectingPreferenceFragment() {
}
override fun onRequestPermissionsResult(
requestCode: Int, permissions: Array<String?>, grantResults: IntArray) {
requestCode: Int, permissions: Array<String?>, grantResults: IntArray
) {
if (requestCode == PermissionRequestor.REQUEST_CALENDAR) {
if (PermissionUtil.verifyPermissions(grantResults)) {
calendarReminderPreference.isChecked = true
@ -132,7 +139,8 @@ class Advanced : InjectingPreferenceFragment() {
}
private fun initializeCalendarReminderPreference() {
calendarReminderPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
calendarReminderPreference.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { _, newValue ->
if (newValue == null) {
false
} else if (!(newValue as Boolean)) {
@ -144,7 +152,8 @@ class Advanced : InjectingPreferenceFragment() {
false
}
}
calendarReminderPreference.isChecked = calendarReminderPreference.isChecked && permissionChecker.canAccessCalendars()
calendarReminderPreference.isChecked =
calendarReminderPreference.isChecked && permissionChecker.canAccessCalendars()
}
private fun updateAttachmentDirectory() {
@ -158,7 +167,8 @@ class Advanced : InjectingPreferenceFragment() {
.setMessage(R.string.EPr_manage_purge_deleted_message)
.setPositiveButton(android.R.string.ok) { _, _ ->
performAction(
R.string.EPr_manage_purge_deleted_status, Callable { taskDeleter.purgeDeleted() })
R.string.EPr_manage_purge_deleted_status,
Callable { taskDeleter.purgeDeleted() })
}
.setNegativeButton(android.R.string.cancel, null)
.show()

47
app/src/main/java/org/tasks/preferences/fragments/Backups.kt
Unescape Escape View File

@ -44,7 +44,8 @@ class Backups : InjectingPreferenceFragment() {
.setOnPreferenceClickListener {
startActivityForResult(
FileHelper.newFilePickerIntent(activity, preferences.backupDirectory),
REQUEST_PICKER)
REQUEST_PICKER
)
false
}
@ -55,8 +56,10 @@ class Backups : InjectingPreferenceFragment() {
false
}
val googleDriveBackup = findPreference(R.string.p_google_drive_backup) as SwitchPreferenceCompat
googleDriveBackup.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference: Preference, newValue: Any? ->
val googleDriveBackup =
findPreference(R.string.p_google_drive_backup) as SwitchPreferenceCompat
googleDriveBackup.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { preference: Preference, newValue: Any? ->
when {
newValue == null -> {
false
@ -78,10 +81,12 @@ class Backups : InjectingPreferenceFragment() {
override fun onResume() {
super.onResume()
val googleDriveBackup = findPreference(R.string.p_google_drive_backup) as SwitchPreferenceCompat
val googleDriveBackup =
findPreference(R.string.p_google_drive_backup) as SwitchPreferenceCompat
val account = preferences.getStringValue(R.string.p_google_drive_backup_account)
if (preferences.getBoolean(R.string.p_google_drive_backup, false)
&& googleAccountManager.canAccessAccount(account)) {
&& googleAccountManager.canAccessAccount(account)
) {
googleDriveBackup.isChecked = true
googleDriveBackup.summary = account
} else {
@ -90,7 +95,11 @@ class Backups : InjectingPreferenceFragment() {
}
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<out String>,
grantResults: IntArray
) {
if (requestCode == PermissionRequestor.REQUEST_GOOGLE_ACCOUNTS) {
if (PermissionUtil.verifyPermissions(grantResults)) {
requestGoogleDriveLogin()
@ -108,7 +117,8 @@ class Backups : InjectingPreferenceFragment() {
context?.contentResolver
?.takePersistableUriPermission(
uri,
Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
)
}
preferences.setUri(R.string.p_backup_dir, uri)
updateBackupDirectory()
@ -117,15 +127,21 @@ class Backups : InjectingPreferenceFragment() {
if (resultCode == RESULT_OK) {
val uri = data!!.data
val extension = FileHelper.getExtension(activity, uri)
if (!("json".equals(extension, ignoreCase = true) || "xml".equals(extension, ignoreCase = true))) {
if (!("json".equals(extension, ignoreCase = true) || "xml".equals(
extension,
ignoreCase = true
))
) {
toaster.longToast(R.string.invalid_backup_file)
} else {
ImportTasksDialog.newImportTasksDialog(uri, extension).show(fragmentManager!!, FRAG_TAG_IMPORT_TASKS)
ImportTasksDialog.newImportTasksDialog(uri, extension)
.show(fragmentManager!!, FRAG_TAG_IMPORT_TASKS)
}
}
} else if (requestCode == REQUEST_DRIVE_BACKUP) {
val success = resultCode == RESULT_OK
(findPreference(R.string.p_google_drive_backup) as SwitchPreferenceCompat).isChecked = success
(findPreference(R.string.p_google_drive_backup) as SwitchPreferenceCompat).isChecked =
success
if (!success && data != null) {
toaster.longToast(data.getStringExtra(GtasksLoginActivity.EXTRA_ERROR))
}
@ -136,21 +152,26 @@ class Backups : InjectingPreferenceFragment() {
}
private fun requestGoogleDriveLogin() {
startActivityForResult(Intent(context, DriveLoginActivity::class.java), REQUEST_DRIVE_BACKUP)
startActivityForResult(
Intent(context, DriveLoginActivity::class.java),
REQUEST_DRIVE_BACKUP
)
}
private fun initializeBackupDirectory() {
findPreference(R.string.p_backup_dir)
.setOnPreferenceClickListener {
FileHelper.newDirectoryPicker(
this, REQUEST_CODE_BACKUP_DIR, preferences.backupDirectory)
this, REQUEST_CODE_BACKUP_DIR, preferences.backupDirectory
)
false
}
updateBackupDirectory()
}
private fun updateBackupDirectory() {
findPreference(R.string.p_backup_dir).summary = FileHelper.uri2String(preferences.backupDirectory)
findPreference(R.string.p_backup_dir).summary =
FileHelper.uri2String(preferences.backupDirectory)
}
override fun inject(component: FragmentComponent) {

11
app/src/main/java/org/tasks/preferences/fragments/DashClock.kt
Unescape Escape View File

@ -30,7 +30,8 @@ class DashClock : InjectingPreferenceFragment() {
.setOnPreferenceClickListener {
val intent = Intent(context, FilterSelectionActivity::class.java)
intent.putExtra(
FilterSelectionActivity.EXTRA_FILTER, defaultFilterProvider.dashclockFilter)
FilterSelectionActivity.EXTRA_FILTER, defaultFilterProvider.dashclockFilter
)
intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true)
startActivityForResult(intent, REQUEST_SELECT_FILTER)
false
@ -39,14 +40,18 @@ class DashClock : InjectingPreferenceFragment() {
refreshPreferences()
if (!inventory.purchasedDashclock()) {
startActivityForResult(Intent(context, PurchaseActivity::class.java), REQUEST_SUBSCRIPTION)
startActivityForResult(
Intent(context, PurchaseActivity::class.java),
REQUEST_SUBSCRIPTION
)
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_SELECT_FILTER) {
if (resultCode == Activity.RESULT_OK) {
val filter: Filter = data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
val filter: Filter =
data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
defaultFilterProvider.dashclockFilter = filter
refreshPreferences()
localBroadcastManager.broadcastRefresh()

15
app/src/main/java/org/tasks/preferences/fragments/HelpAndFeedback.kt
Unescape Escape View File

@ -19,11 +19,16 @@ class HelpAndFeedback : InjectingPreferenceFragment() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.help_and_feedback, rootKey)
findPreference(R.string.changelog).summary = getString(R.string.version_string, BuildConfig.VERSION_NAME)
findPreference(R.string.changelog).summary =
getString(R.string.version_string, BuildConfig.VERSION_NAME)
findPreference(R.string.contact_developer)
.setOnPreferenceClickListener {
val uri = Uri.fromParts("mailto", "Alex <" + getString(R.string.support_email) + ">", null)
val uri = Uri.fromParts(
"mailto",
"Alex <" + getString(R.string.support_email) + ">",
null
)
val intent = Intent(Intent.ACTION_SENDTO, uri)
.putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback")
.putExtra(Intent.EXTRA_TEXT, device.debugInfo)
@ -51,10 +56,12 @@ class HelpAndFeedback : InjectingPreferenceFragment() {
@Suppress("ConstantConditionIf")
if (BuildConfig.FLAVOR == "generic") {
remove(R.string.p_collect_statistics,
remove(
R.string.p_collect_statistics,
R.string.rate_tasks,
R.string.upgrade_to_pro,
R.string.refresh_purchases)
R.string.refresh_purchases
)
}
}

54
app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
Unescape Escape View File

@ -73,7 +73,12 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
setupColorPreference(R.string.p_theme, themeBase.name, THEMES, REQUEST_THEME_PICKER)
setupColorPreference(R.string.p_theme_color, themeColor.name, COLORS, REQUEST_COLOR_PICKER)
setupColorPreference(R.string.p_theme_accent, themeAccent.name, ACCENTS, REQUEST_ACCENT_PICKER)
setupColorPreference(
R.string.p_theme_accent,
themeAccent.name,
ACCENTS,
REQUEST_ACCENT_PICKER
)
updateLauncherPreference()
findPreference(R.string.p_show_subtasks)
@ -87,7 +92,10 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
defaultList.summary = filter.listingTitle
defaultList.onPreferenceClickListener = Preference.OnPreferenceClickListener {
val intent = Intent(context, FilterSelectionActivity::class.java)
intent.putExtra(FilterSelectionActivity.EXTRA_FILTER, defaultFilterProvider.defaultFilter)
intent.putExtra(
FilterSelectionActivity.EXTRA_FILTER,
defaultFilterProvider.defaultFilter
)
intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true)
startActivityForResult(intent, REQUEST_DEFAULT_LIST)
true
@ -137,10 +145,12 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
R.string.p_theme_launcher,
themeCache.getThemeColor(preferences.getInt(R.string.p_theme_launcher, 7)).name,
LAUNCHER,
REQUEST_LAUNCHER_PICKER)
REQUEST_LAUNCHER_PICKER
)
private fun setupLocationPickers() {
val choices = listOf(getString(R.string.map_provider_mapbox), getString(R.string.map_provider_google))
val choices =
listOf(getString(R.string.map_provider_mapbox), getString(R.string.map_provider_google))
val singleCheckedArrayAdapter = SingleCheckedArrayAdapter(context!!, choices, themeAccent)
val mapProviderPreference = findPreference(R.string.p_map_provider)
mapProviderPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
@ -166,7 +176,8 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
false
}
val mapProvider: Int = getMapProvider()
mapProviderPreference.summary = if (mapProvider == -1) getString(R.string.none) else choices[mapProvider]
mapProviderPreference.summary =
if (mapProvider == -1) getString(R.string.none) else choices[mapProvider]
val placeProviderPreference = findPreference(R.string.p_place_provider)
placeProviderPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
@ -201,11 +212,17 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
}
private fun getPlaceProvider(): Int {
return if (playServices.isPlayServicesAvailable && inventory.hasPro()) preferences.getInt(R.string.p_place_provider, 0) else 0
return if (playServices.isPlayServicesAvailable && inventory.hasPro()) preferences.getInt(
R.string.p_place_provider,
0
) else 0
}
private fun getMapProvider(): Int {
return if (playServices.isPlayServicesAvailable) preferences.getInt(R.string.p_map_provider, 0) else 0
return if (playServices.isPlayServicesAvailable) preferences.getInt(
R.string.p_map_provider,
0
) else 0
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@ -239,14 +256,16 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
}
} else if (requestCode == REQUEST_DEFAULT_LIST) {
if (resultCode == RESULT_OK) {
val filter: Filter = data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
val filter: Filter =
data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
defaultFilterProvider.defaultFilter = filter
findPreference(R.string.p_default_list).summary = filter.listingTitle
localBroadcastManager.broadcastRefresh()
}
} else if (requestCode == REQUEST_LOCALE) {
if (resultCode == RESULT_OK) {
val newValue: Locale = data!!.getSerializableExtra(LocalePickerDialog.EXTRA_LOCALE) as Locale
val newValue: Locale =
data!!.getSerializableExtra(LocalePickerDialog.EXTRA_LOCALE) as Locale
val override: String? = newValue.languageOverride
if (Strings.isNullOrEmpty(override)) {
preferences.remove(R.string.p_language)
@ -288,11 +307,15 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
private fun setLauncherIcon(index: Int) {
val packageManager: PackageManager? = context?.packageManager
for (i in ThemeColor.LAUNCHERS.indices) {
val componentName = ComponentName(context!!, "com.todoroo.astrid.activity.TaskListActivity" + ThemeColor.LAUNCHERS[i])
val componentName = ComponentName(
context!!,
"com.todoroo.astrid.activity.TaskListActivity" + ThemeColor.LAUNCHERS[i]
)
packageManager?.setComponentEnabledSetting(
componentName,
if (index == i) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP)
PackageManager.DONT_KILL_APP
)
}
}
@ -300,7 +323,11 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
component.inject(this)
}
private fun setupColorPreference(@StringRes prefId: Int, summary: String, palette: ColorPickerActivity.ColorPalette, requestCode: Int) {
private fun setupColorPreference(
@StringRes prefId: Int, summary: String,
palette: ColorPickerActivity.ColorPalette,
requestCode: Int
) {
val themePref: Preference = findPreference(prefId)
themePref.summary = summary
themePref.setOnPreferenceClickListener {
@ -370,7 +397,8 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
Toast.makeText(
context,
getString(errorResId, getString(settingResId), getString(relativeResId)),
Toast.LENGTH_SHORT)
Toast.LENGTH_SHORT
)
.show()
}

44
app/src/main/java/org/tasks/preferences/fragments/Notifications.kt
Unescape Escape View File

@ -50,7 +50,8 @@ class Notifications : InjectingPreferenceFragment() {
R.string.p_rmd_enable_quiet,
R.string.p_rmd_quietStart,
R.string.p_rmd_quietEnd,
R.string.p_rmd_persistent)
R.string.p_rmd_persistent
)
initializeRingtonePreference()
initializeTimePreference(getDefaultRemindTimePreference()!!, REQUEST_DEFAULT_REMIND)
@ -88,7 +89,8 @@ class Notifications : InjectingPreferenceFragment() {
badgePreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
val intent = Intent(context, FilterSelectionActivity::class.java)
intent.putExtra(
FilterSelectionActivity.EXTRA_FILTER, defaultFilterProvider.badgeFilter)
FilterSelectionActivity.EXTRA_FILTER, defaultFilterProvider.badgeFilter
)
intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true)
startActivityForResult(intent, REQUEST_BADGE_LIST)
true
@ -116,7 +118,11 @@ class Notifications : InjectingPreferenceFragment() {
requires(AndroidUtilities.atLeastOreo(), R.string.notification_channel_settings)
requires(AndroidUtilities.atLeastMarshmallow(), R.string.battery_optimization_settings)
requires(
AndroidUtilities.preOreo(), R.string.p_rmd_ringtone, R.string.p_rmd_vibrate, R.string.p_led_notification)
AndroidUtilities.preOreo(),
R.string.p_rmd_ringtone,
R.string.p_rmd_vibrate,
R.string.p_led_notification
)
}
override fun onDestroy() {
@ -145,16 +151,25 @@ class Notifications : InjectingPreferenceFragment() {
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, Settings.System.DEFAULT_NOTIFICATION_URI)
intent.putExtra(
RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI,
Settings.System.DEFAULT_NOTIFICATION_URI
)
val existingValue: String? = preferences.getStringValue(R.string.p_rmd_ringtone)
if (existingValue != null) {
if (existingValue.isEmpty()) {
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, null as Uri?)
} else {
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, Uri.parse(existingValue))
intent.putExtra(
RingtoneManager.EXTRA_RINGTONE_EXISTING_URI,
Uri.parse(existingValue)
)
}
} else {
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, Settings.System.DEFAULT_NOTIFICATION_URI)
intent.putExtra(
RingtoneManager.EXTRA_RINGTONE_EXISTING_URI,
Settings.System.DEFAULT_NOTIFICATION_URI
)
}
startActivityForResult(intent, REQUEST_CODE_ALERT_RINGTONE)
true
@ -190,13 +205,17 @@ class Notifications : InjectingPreferenceFragment() {
}
private fun initializeRingtonePreference() {
val ringtoneChangedListener = Preference.OnPreferenceChangeListener { preference: Preference, value: Any? ->
val ringtoneChangedListener =
Preference.OnPreferenceChangeListener { preference: Preference, value: Any? ->
if ("" == value) {
preference.setSummary(R.string.silent)
} else {
val ringtone = RingtoneManager.getRingtone(
context,
if (value == null) Settings.System.DEFAULT_NOTIFICATION_URI else Uri.parse(value as String?))
if (value == null) Settings.System.DEFAULT_NOTIFICATION_URI else Uri.parse(
value as String?
)
)
preference.summary = if (ringtone == null) "" else ringtone.getTitle(context)
}
true
@ -206,7 +225,8 @@ class Notifications : InjectingPreferenceFragment() {
ringtonePreference.onPreferenceChangeListener = ringtoneChangedListener
ringtoneChangedListener.onPreferenceChange(
ringtonePreference,
preferences.getStringValue(ringtoneKey))
preferences.getStringValue(ringtoneKey)
)
}
@TargetApi(Build.VERSION_CODES.O)
@ -228,7 +248,8 @@ class Notifications : InjectingPreferenceFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_CODE_ALERT_RINGTONE) {
if (resultCode == RESULT_OK && data != null) {
val ringtone: Uri? = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
val ringtone: Uri? =
data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
if (ringtone != null) {
preferences.setString(R.string.p_rmd_ringtone, ringtone.toString())
} else {
@ -250,7 +271,8 @@ class Notifications : InjectingPreferenceFragment() {
}
} else if (requestCode == REQUEST_BADGE_LIST) {
if (resultCode == RESULT_OK) {
val filter: Filter = data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
val filter: Filter =
data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
defaultFilterProvider.badgeFilter = filter
findPreference(R.string.p_badge_list).summary = filter.listingTitle
localBroadcastManager.broadcastRefresh()

26
app/src/main/java/org/tasks/preferences/fragments/ScrollableWidget.kt
Unescape Escape View File

@ -79,9 +79,11 @@ class ScrollableWidget : InjectingPreferenceFragment() {
val intent = Intent(context, ColorPickerActivity::class.java)
intent.putExtra(
ColorPickerActivity.EXTRA_PALETTE,
ColorPickerActivity.ColorPalette.WIDGET_BACKGROUND)
ColorPickerActivity.ColorPalette.WIDGET_BACKGROUND
)
intent.putExtra(
ColorPickerActivity.EXTRA_THEME_INDEX, widgetPreferences.themeIndex)
ColorPickerActivity.EXTRA_THEME_INDEX, widgetPreferences.themeIndex
)
startActivityForResult(intent, REQUEST_THEME_SELECTION)
false
}
@ -91,7 +93,8 @@ class ScrollableWidget : InjectingPreferenceFragment() {
colorPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
val intent = Intent(context, ColorPickerActivity::class.java)
intent.putExtra(
ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.COLORS)
ColorPickerActivity.EXTRA_PALETTE, ColorPickerActivity.ColorPalette.COLORS
)
intent.putExtra(ColorPickerActivity.EXTRA_THEME_INDEX, widgetPreferences.colorIndex)
startActivityForResult(intent, REQUEST_COLOR_SELECTION)
false
@ -105,18 +108,29 @@ class ScrollableWidget : InjectingPreferenceFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_FILTER) {
if (resultCode == Activity.RESULT_OK) {
val filter: Filter = data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
val filter: Filter =
data!!.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER)!!
widgetPreferences.setFilter(defaultFilterProvider.getFilterPreferenceValue(filter))
updateFilter()
}
} else if (requestCode == REQUEST_THEME_SELECTION) {
if (resultCode == Activity.RESULT_OK) {
widgetPreferences.setTheme(data!!.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 0))
widgetPreferences.setTheme(
data!!.getIntExtra(
ColorPickerActivity.EXTRA_THEME_INDEX,
0
)
)
updateTheme()
}
} else if (requestCode == REQUEST_COLOR_SELECTION) {
if (resultCode == Activity.RESULT_OK) {
widgetPreferences.setColor(data!!.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 0))
widgetPreferences.setColor(
data!!.getIntExtra(
ColorPickerActivity.EXTRA_THEME_INDEX,
0
)
)
updateColor()
}
} else {

29
app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt
Unescape Escape View File

@ -51,14 +51,18 @@ class Synchronization : InjectingPreferenceFragment() {
true
}
val positionHack = findPreference(R.string.google_tasks_position_hack) as SwitchPreferenceCompat
val positionHack =
findPreference(R.string.google_tasks_position_hack) as SwitchPreferenceCompat
positionHack.isChecked = preferences.isPositionHackEnabled
positionHack.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _: Preference?, newValue: Any? ->
positionHack.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { _: Preference?, newValue: Any? ->
if (newValue == null) {
false
} else {
preferences.setLong(
R.string.p_google_tasks_position_hack, if (newValue as Boolean) DateUtilities.now() else 0)
R.string.p_google_tasks_position_hack,
if (newValue as Boolean) DateUtilities.now() else 0
)
true
}
}
@ -107,11 +111,17 @@ class Synchronization : InjectingPreferenceFragment() {
preference.setOnPreferenceClickListener {
dialogBuilder
.newDialog(account)
.setItems(listOf(getString(R.string.reinitialize_account), getString(R.string.logout))) { _, which ->
.setItems(
listOf(
getString(R.string.reinitialize_account),
getString(R.string.logout)
)
) { _, which ->
if (which == 0) {
startActivityForResult(
Intent(context, GtasksLoginActivity::class.java),
REQUEST_GOOGLE_TASKS)
REQUEST_GOOGLE_TASKS
)
} else {
logoutConfirmation(googleTaskAccount)
}
@ -132,7 +142,8 @@ class Synchronization : InjectingPreferenceFragment() {
val error = account.error
if (Strings.isNullOrEmpty(error)) {
preference.setSummary(
if (account.isCaldavAccount) R.string.caldav else R.string.etesync)
if (account.isCaldavAccount) R.string.caldav else R.string.etesync
)
} else {
preference.summary = error
}
@ -140,7 +151,8 @@ class Synchronization : InjectingPreferenceFragment() {
val intent = Intent(
context,
if (account.isCaldavAccount) CaldavAccountSettingsActivity::class.java
else EteSyncAccountSettingsActivity::class.java)
else EteSyncAccountSettingsActivity::class.java
)
intent.putExtra(CaldavAccountSettingsActivity.EXTRA_CALDAV_DATA, account)
startActivityForResult(intent, REQUEST_CALDAV_SETTINGS)
false
@ -174,7 +186,8 @@ class Synchronization : InjectingPreferenceFragment() {
val hasCaldavAccounts = addCaldavAccounts(synchronizationPreferences)
findPreference(R.string.gtasks_GPr_header).isVisible = hasGoogleAccounts
findPreference(R.string.accounts).isVisible = hasGoogleAccounts || hasCaldavAccounts
findPreference(R.string.sync_SPr_interval_title).isVisible = hasGoogleAccounts || hasCaldavAccounts
findPreference(R.string.sync_SPr_interval_title).isVisible =
hasGoogleAccounts || hasCaldavAccounts
}
override fun inject(component: FragmentComponent) {

18
app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt
Unescape Escape View File

@ -49,7 +49,11 @@ class TaskDefaults : InjectingPreferenceFragment() {
findPreference(R.string.p_default_remote_list)
.setOnPreferenceClickListener {
RemoteListPicker.newRemoteListSupportPicker(defaultFilterProvider.defaultRemoteList, this, REQUEST_REMOTE_LIST)
RemoteListPicker.newRemoteListSupportPicker(
defaultFilterProvider.defaultRemoteList,
this,
REQUEST_REMOTE_LIST
)
.show(fragmentManager!!, FRAG_TAG_REMOTE_LIST_SELECTION)
false
}
@ -58,7 +62,11 @@ class TaskDefaults : InjectingPreferenceFragment() {
requires(device.supportsGeofences(), R.string.p_default_location_reminder_key)
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<out String>,
grantResults: IntArray
) {
if (requestCode == PermissionRequestor.REQUEST_CALENDAR) {
if (PermissionUtil.verifyPermissions(grantResults)) {
startCalendarSelectionActivity()
@ -83,8 +91,10 @@ class TaskDefaults : InjectingPreferenceFragment() {
if (resultCode == RESULT_OK) {
preferences.setString(
R.string.gcal_p_default,
data!!.getStringExtra(CalendarSelectionActivity.EXTRA_CALENDAR_ID))
defaultCalendarPref.summary = data.getStringExtra(CalendarSelectionActivity.EXTRA_CALENDAR_NAME)
data!!.getStringExtra(CalendarSelectionActivity.EXTRA_CALENDAR_ID)
)
defaultCalendarPref.summary =
data.getStringExtra(CalendarSelectionActivity.EXTRA_CALENDAR_NAME)
}
} else {
super.onActivityResult(requestCode, resultCode, data)

8
app/src/main/java/org/tasks/preferences/fragments/TaskerListNotification.kt
Unescape Escape View File

@ -56,7 +56,10 @@ class TaskerListNotification : InjectingPreferenceFragment() {
}
if (!inventory.purchasedTasker()) {
startActivityForResult(Intent(context, PurchaseActivity::class.java), REQUEST_SUBSCRIPTION)
startActivityForResult(
Intent(context, PurchaseActivity::class.java),
REQUEST_SUBSCRIPTION
)
}
}
@ -92,7 +95,8 @@ class TaskerListNotification : InjectingPreferenceFragment() {
fun getBundle(): Bundle {
return ListNotificationBundle.generateBundle(
defaultFilterProvider.getFilterPreferenceValue(filter))
defaultFilterProvider.getFilterPreferenceValue(filter)
)
}
override fun inject(component: FragmentComponent) = component.inject(this)

5
app/src/main/java/org/tasks/widget/WidgetConfigActivity.kt
Unescape Escape View File

@ -13,7 +13,10 @@ class WidgetConfigActivity : BasePreferences() {
private var appWidgetId: Int = 0
override fun onCreate(savedInstanceState: Bundle?) {
appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
appWidgetId = intent.getIntExtra(
AppWidgetManager.EXTRA_APPWIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID
)
super.onCreate(savedInstanceState)

Write Preview
Loading…
Cancel
Save