Fix some random inspections

pull/2421/head
Alex Baker 11 months ago
parent 320b399ab3
commit 5308404ed6

@ -15,8 +15,6 @@ open class Field(expression: String) : DBObject(expression) {
fun gt(value: Any?): Criterion = UnaryCriterion.gt(this, value) fun gt(value: Any?): Criterion = UnaryCriterion.gt(this, value)
fun gte(value: Any?): Criterion = UnaryCriterion.gte(this, value)
fun lt(value: Any?): Criterion = UnaryCriterion.lt(this, value) fun lt(value: Any?): Criterion = UnaryCriterion.lt(this, value)
fun lte(value: Any?): Criterion = UnaryCriterion.lte(this, value) fun lte(value: Any?): Criterion = UnaryCriterion.lte(this, value)

@ -23,7 +23,7 @@ public class CaldavFilter extends Filter {
/** Parcelable Creator Object */ /** Parcelable Creator Object */
public static final Parcelable.Creator<CaldavFilter> CREATOR = public static final Parcelable.Creator<CaldavFilter> CREATOR =
new Parcelable.Creator<CaldavFilter>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -2,15 +2,18 @@ package com.todoroo.astrid.api;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import java.util.Objects;
import org.tasks.R; import org.tasks.R;
import java.util.Objects;
public class CustomFilter extends Filter { public class CustomFilter extends Filter {
/** Parcelable Creator Object */ /** Parcelable Creator Object */
public static final Parcelable.Creator<CustomFilter> CREATOR = public static final Parcelable.Creator<CustomFilter> CREATOR =
new Parcelable.Creator<CustomFilter>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -28,7 +28,7 @@ public class Filter extends FilterListItem {
/** Parcelable Creator Object */ /** Parcelable Creator Object */
public static final Parcelable.Creator<Filter> CREATOR = public static final Parcelable.Creator<Filter> CREATOR =
new Parcelable.Creator<Filter>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -24,7 +24,7 @@ public class GtasksFilter extends Filter {
/** Parcelable Creator Object */ /** Parcelable Creator Object */
public static final Parcelable.Creator<GtasksFilter> CREATOR = public static final Parcelable.Creator<GtasksFilter> CREATOR =
new Parcelable.Creator<GtasksFilter>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -2,23 +2,27 @@ package com.todoroo.astrid.api;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Join;
import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.util.HashMap;
import java.util.Map;
import org.tasks.R; import org.tasks.R;
import org.tasks.data.Tag; import org.tasks.data.Tag;
import org.tasks.data.TagData; import org.tasks.data.TagData;
import org.tasks.data.TaskDao; import org.tasks.data.TaskDao;
import java.util.HashMap;
import java.util.Map;
public class TagFilter extends Filter { public class TagFilter extends Filter {
/** Parcelable Creator Object */ /** Parcelable Creator Object */
public static final Parcelable.Creator<TagFilter> CREATOR = public static final Parcelable.Creator<TagFilter> CREATOR =
new Parcelable.Creator<TagFilter>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -18,7 +18,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
/** Parcelable Creator Object */ /** Parcelable Creator Object */
public static final Parcelable.Creator<TextInputCriterion> CREATOR = public static final Parcelable.Creator<TextInputCriterion> CREATOR =
new Parcelable.Creator<TextInputCriterion>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -2,7 +2,11 @@ package com.todoroo.astrid.data
import android.os.Parcelable import android.os.Parcelable
import androidx.annotation.IntDef import androidx.annotation.IntDef
import androidx.room.* import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.Ignore
import androidx.room.Index
import androidx.room.PrimaryKey
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.todoroo.andlib.data.Table import com.todoroo.andlib.data.Table
import com.todoroo.andlib.sql.Field import com.todoroo.andlib.sql.Field
@ -243,9 +247,6 @@ data class Task(
&& order == original.order && order == original.order
} }
val isSaved: Boolean
get() = id != NO_ID
@Synchronized @Synchronized
fun suppressSync() { fun suppressSync() {
putTransitory(SyncFlags.SUPPRESS_SYNC, true) putTransitory(SyncFlags.SUPPRESS_SYNC, true)

@ -9,7 +9,6 @@ import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import org.tasks.LocalBroadcastManager import org.tasks.LocalBroadcastManager
import org.tasks.data.GoogleTaskDao
import org.tasks.jobs.WorkManager import org.tasks.jobs.WorkManager
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
import timber.log.Timber import timber.log.Timber
@ -18,7 +17,6 @@ import javax.inject.Inject
class TaskCompleter @Inject internal constructor( class TaskCompleter @Inject internal constructor(
@ApplicationContext private val context: Context, @ApplicationContext private val context: Context,
private val taskDao: TaskDao, private val taskDao: TaskDao,
private val googleTaskDao: GoogleTaskDao,
private val preferences: Preferences, private val preferences: Preferences,
private val notificationManager: NotificationManager, private val notificationManager: NotificationManager,
private val localBroadcastManager: LocalBroadcastManager, private val localBroadcastManager: LocalBroadcastManager,

@ -7,7 +7,6 @@ import org.tasks.caldav.VtodoCache
import org.tasks.data.CaldavAccount import org.tasks.data.CaldavAccount
import org.tasks.data.CaldavCalendar import org.tasks.data.CaldavCalendar
import org.tasks.data.DeletionDao import org.tasks.data.DeletionDao
import org.tasks.data.GoogleTaskDao
import org.tasks.data.TaskContainer import org.tasks.data.TaskContainer
import org.tasks.data.TaskDao import org.tasks.data.TaskDao
import org.tasks.db.QueryUtils import org.tasks.db.QueryUtils
@ -22,7 +21,6 @@ class TaskDeleter @Inject constructor(
private val workManager: WorkManager, private val workManager: WorkManager,
private val taskDao: TaskDao, private val taskDao: TaskDao,
private val localBroadcastManager: LocalBroadcastManager, private val localBroadcastManager: LocalBroadcastManager,
private val googleTaskDao: GoogleTaskDao,
private val preferences: Preferences, private val preferences: Preferences,
private val syncAdapters: SyncAdapters, private val syncAdapters: SyncAdapters,
private val vtodoCache: VtodoCache, private val vtodoCache: VtodoCache,

@ -76,14 +76,7 @@ class PagerState(
var selectionState by mutableStateOf(SelectionState.Selected) var selectionState by mutableStateOf(SelectionState.Selected)
suspend inline fun <R> selectPage(block: PagerState.() -> R): R = try { private suspend fun selectPage() {
selectionState = SelectionState.Undecided
block()
} finally {
selectPage()
}
suspend fun selectPage() {
currentPage -= currentPageOffset.roundToInt() currentPage -= currentPageOffset.roundToInt()
snapToOffset(0f) snapToOffset(0f)
selectionState = SelectionState.Selected selectionState = SelectionState.Selected
@ -137,7 +130,7 @@ fun Pager(
for (page in minPage..maxPage) { for (page in minPage..maxPage) {
val pageData = PageData(page) val pageData = PageData(page)
val scope = PagerScope(state, page) val scope = PagerScope(page)
key(pageData) { key(pageData) {
Box(contentAlignment = Alignment.Center, modifier = pageData) { Box(contentAlignment = Alignment.Center, modifier = pageData) {
scope.pageContent() scope.pageContent()
@ -204,24 +197,5 @@ fun Pager(
* Scope for [Pager] content. * Scope for [Pager] content.
*/ */
class PagerScope( class PagerScope(
private val state: PagerState,
val page: Int val page: Int
) { )
/**
* Returns the current selected page
*/
val currentPage: Int
get() = state.currentPage
/**
* Returns the current selected page offset
*/
val currentPageOffset: Float
get() = state.currentPageOffset
/**
* Returns the current selection state
*/
val selectionState: PagerState.SelectionState
get() = state.selectionState
}

@ -4,7 +4,6 @@ import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity
import androidx.room.ForeignKey import androidx.room.ForeignKey
import androidx.room.Ignore import androidx.room.Ignore
import androidx.room.Index
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
import com.todoroo.andlib.data.Table import com.todoroo.andlib.data.Table
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task

@ -63,13 +63,6 @@ class AlertDialogBuilder internal constructor(private val context: Context) {
return this return this
} }
fun setAdapter(
adapter: ListAdapter?, onClickListener: DialogInterface.OnClickListener?
): AlertDialogBuilder {
builder.setAdapter(adapter, onClickListener)
return this
}
fun setView(dialogView: View?): AlertDialogBuilder { fun setView(dialogView: View?): AlertDialogBuilder {
builder.setView(dialogView) builder.setView(dialogView)
return this return this
@ -127,13 +120,6 @@ class AlertDialogBuilder internal constructor(private val context: Context) {
return this return this
} }
fun setOnDismissListener(
onDismissListener: DialogInterface.OnDismissListener?
): AlertDialogBuilder {
builder.setOnDismissListener(onDismissListener)
return this
}
fun setCancelable(cancelable: Boolean): AlertDialogBuilder { fun setCancelable(cancelable: Boolean): AlertDialogBuilder {
builder.setCancelable(cancelable) builder.setCancelable(cancelable)
return this return this

@ -1,13 +0,0 @@
package org.tasks.extensions
import android.view.View
object View {
fun View.lightStatusBar(isDark: Boolean) {
systemUiVisibility = if (isDark) {
systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
} else {
systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
}
}
}

@ -10,7 +10,7 @@ public class NavigationDrawerAction extends FilterListItem {
/** Parcelable Creator Object */ /** Parcelable Creator Object */
public static final Parcelable.Creator<NavigationDrawerAction> CREATOR = public static final Parcelable.Creator<NavigationDrawerAction> CREATOR =
new Parcelable.Creator<NavigationDrawerAction>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -8,7 +8,7 @@ import com.todoroo.astrid.api.FilterListItem;
public class NavigationDrawerSeparator extends FilterListItem { public class NavigationDrawerSeparator extends FilterListItem {
public static final Parcelable.Creator<NavigationDrawerSeparator> CREATOR = public static final Parcelable.Creator<NavigationDrawerSeparator> CREATOR =
new Parcelable.Creator<NavigationDrawerSeparator>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -11,7 +11,7 @@ import com.todoroo.astrid.api.FilterListItem;
public class NavigationDrawerSubheader extends FilterListItem { public class NavigationDrawerSubheader extends FilterListItem {
public static final Parcelable.Creator<NavigationDrawerSubheader> CREATOR = public static final Parcelable.Creator<NavigationDrawerSubheader> CREATOR =
new Parcelable.Creator<NavigationDrawerSubheader>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -27,7 +27,7 @@ import java.util.Map;
public class PlaceFilter extends Filter { public class PlaceFilter extends Filter {
public static final Parcelable.Creator<PlaceFilter> CREATOR = public static final Parcelable.Creator<PlaceFilter> CREATOR =
new Parcelable.Creator<PlaceFilter>() { new Parcelable.Creator<>() {
@Override @Override
public PlaceFilter createFromParcel(Parcel source) { public PlaceFilter createFromParcel(Parcel source) {

@ -12,7 +12,7 @@ import org.tasks.time.DateTime;
public class RecentlyModifiedFilter extends Filter { public class RecentlyModifiedFilter extends Filter {
public static final Parcelable.Creator<RecentlyModifiedFilter> CREATOR = public static final Parcelable.Creator<RecentlyModifiedFilter> CREATOR =
new Parcelable.Creator<RecentlyModifiedFilter>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -15,7 +15,7 @@ import org.tasks.data.Alarm;
public class SnoozedFilter extends Filter { public class SnoozedFilter extends Filter {
public static final Creator<SnoozedFilter> CREATOR = public static final Creator<SnoozedFilter> CREATOR =
new Creator<SnoozedFilter>() { new Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -9,7 +9,7 @@ import java.util.Map;
public class SortableFilter extends Filter { public class SortableFilter extends Filter {
public static final Parcelable.Creator<SortableFilter> CREATOR = public static final Parcelable.Creator<SortableFilter> CREATOR =
new Parcelable.Creator<SortableFilter>() { new Parcelable.Creator<>() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override

@ -11,7 +11,7 @@ import timber.log.Timber;
public final class FireReceiver extends BroadcastReceiver { public final class FireReceiver extends BroadcastReceiver {
@Override @Override
public final void onReceive(final Context context, final Intent intent) { public void onReceive(final Context context, final Intent intent) {
Timber.d("Received %s", intent); // $NON-NLS-1$ Timber.d("Received %s", intent); // $NON-NLS-1$
/* /*

@ -131,7 +131,7 @@ public class CheckBoxTriStates extends AppCompatCheckBox {
static class SavedState extends BaseSavedState { static class SavedState extends BaseSavedState {
public static final Parcelable.Creator<SavedState> CREATOR = public static final Parcelable.Creator<SavedState> CREATOR =
new Parcelable.Creator<SavedState>() { new Parcelable.Creator<>() {
@Override @Override
public SavedState createFromParcel(Parcel in) { public SavedState createFromParcel(Parcel in) {
return new SavedState(in); return new SavedState(in);

@ -1,10 +0,0 @@
package org.tasks.tasklist
import androidx.recyclerview.widget.DiffUtil
import org.tasks.data.TaskContainer
internal class ItemCallback : DiffUtil.ItemCallback<TaskContainer>() {
override fun areItemsTheSame(old: TaskContainer, new: TaskContainer) = old.id == new.id
override fun areContentsTheSame(old: TaskContainer, new: TaskContainer) = old == new
}

@ -53,7 +53,7 @@ public class ThemeAccent implements Pickable {
}; };
public static final Parcelable.Creator<ThemeAccent> CREATOR = public static final Parcelable.Creator<ThemeAccent> CREATOR =
new Parcelable.Creator<ThemeAccent>() { new Parcelable.Creator<>() {
@Override @Override
public ThemeAccent createFromParcel(Parcel source) { public ThemeAccent createFromParcel(Parcel source) {
return new ThemeAccent(source); return new ThemeAccent(source);
@ -95,14 +95,10 @@ public class ThemeAccent implements Pickable {
@Override @Override
public boolean isFree() { public boolean isFree() {
if (style == R.style.BlueGreyAccent || return style == R.style.BlueGreyAccent ||
style == R.style.RedAccent || style == R.style.RedAccent ||
style == R.style.BlueGreyAccentDesaturated || style == R.style.BlueGreyAccentDesaturated ||
style == R.style.RedAccentDesaturated style == R.style.RedAccentDesaturated;
) {
return true;
}
return false;
} }
@Deprecated @Deprecated

@ -18,7 +18,7 @@ public class ThemeBase implements Parcelable {
public static final String EXTRA_THEME_OVERRIDE = "extra_theme_override"; public static final String EXTRA_THEME_OVERRIDE = "extra_theme_override";
public static final int DEFAULT_BASE_THEME = 5; public static final int DEFAULT_BASE_THEME = 5;
public static final Parcelable.Creator<ThemeBase> CREATOR = public static final Parcelable.Creator<ThemeBase> CREATOR =
new Parcelable.Creator<ThemeBase>() { new Parcelable.Creator<>() {
@Override @Override
public ThemeBase createFromParcel(Parcel source) { public ThemeBase createFromParcel(Parcel source) {
return new ThemeBase(source); return new ThemeBase(source);

@ -143,7 +143,7 @@ public class ThemeColor implements Pickable {
}; };
public static final Parcelable.Creator<ThemeColor> CREATOR = public static final Parcelable.Creator<ThemeColor> CREATOR =
new Parcelable.Creator<ThemeColor>() { new Parcelable.Creator<>() {
@Override @Override
public ThemeColor createFromParcel(Parcel source) { public ThemeColor createFromParcel(Parcel source) {
return new ThemeColor(source); return new ThemeColor(source);

@ -1,12 +0,0 @@
package org.tasks.ui
import android.view.View
import android.widget.AdapterView
abstract class OnItemSelected : AdapterView.OnItemSelectedListener {
final override fun onNothingSelected(parent: AdapterView<*>?) {}
final override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) =
onItemSelected(position)
abstract fun onItemSelected(position: Int)
}

@ -1,13 +0,0 @@
package org.tasks.ui
import android.text.Editable
import android.text.TextWatcher
abstract class OnTextChanged : TextWatcher {
final override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
final override fun afterTextChanged(s: Editable?) {}
final override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) =
onTextChanged(s)
abstract fun onTextChanged(text: CharSequence?)
}

@ -6,7 +6,6 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import org.tasks.R import org.tasks.R
import org.tasks.widget.TasksWidget
import javax.inject.Inject import javax.inject.Inject
class AppWidgetManager @Inject constructor( class AppWidgetManager @Inject constructor(

@ -691,6 +691,6 @@
<string name="snackbar_task_completed">Tugas selesai</string> <string name="snackbar_task_completed">Tugas selesai</string>
<string name="custom_notification">Notifikasi kustom</string> <string name="custom_notification">Notifikasi kustom</string>
<string name="hint_customize_edit_body">Kamu dapat mengubah bagian ini dengan mengurutkan atau menghapus kolom</string> <string name="hint_customize_edit_body">Kamu dapat mengubah bagian ini dengan mengurutkan atau menghapus kolom</string>
<string name="alarm_before_start">Detik sebelum mulai</string> <string name="alarm_before_start">%s sebelum mulai</string>
<string name="alarm_after_start">Detik setelah mulai</string> <string name="alarm_after_start">%s setelah mulai</string>
</resources> </resources>
Loading…
Cancel
Save