From b0415a528927aa95a047b9b330c3e0fdd758aba8 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Fri, 1 May 2020 20:13:21 +0200 Subject: [PATCH] Auto-format using Ktlint --- .../newpipe/database/AppDatabaseTest.kt | 2 +- .../newpipe/database/feed/dao/FeedDAO.kt | 2 +- .../newpipe/database/feed/model/FeedEntity.kt | 10 ++-- .../database/feed/model/FeedGroupEntity.kt | 20 +++---- .../feed/model/FeedGroupSubscriptionEntity.kt | 10 ++-- .../feed/model/FeedLastUpdatedEntity.kt | 12 ++-- .../history/model/StreamHistoryEntry.kt | 18 +++--- .../database/playlist/PlaylistStreamEntry.kt | 12 ++-- .../database/stream/StreamStatisticsEntry.kt | 18 +++--- .../newpipe/database/stream/dao/StreamDAO.kt | 28 +++++----- .../database/stream/model/StreamEntity.kt | 56 +++++++++---------- .../newpipe/local/feed/FeedDatabaseManager.kt | 16 +++--- .../schabi/newpipe/local/feed/FeedFragment.kt | 15 +++-- .../schabi/newpipe/local/feed/FeedState.kt | 18 +++--- .../newpipe/local/feed/FeedViewModel.kt | 6 +- .../local/feed/service/FeedEventManager.kt | 3 +- .../local/feed/service/FeedLoadService.kt | 36 ++++++------ .../local/subscription/FeedGroupIcon.kt | 18 +++--- .../subscription/SubscriptionFragment.kt | 42 +++++++------- .../subscription/SubscriptionViewModel.kt | 2 +- .../decoration/FeedGroupCarouselDecoration.kt | 2 +- .../subscription/dialog/FeedGroupDialog.kt | 14 ++--- .../dialog/FeedGroupDialogViewModel.kt | 3 +- .../dialog/FeedGroupReorderDialog.kt | 9 ++- .../dialog/FeedGroupReorderDialogViewModel.kt | 2 +- .../local/subscription/item/ChannelItem.kt | 9 ++- .../subscription/item/EmptyPlaceholderItem.kt | 2 +- .../subscription/item/FeedGroupAddItem.kt | 2 +- .../subscription/item/FeedGroupCardItem.kt | 6 +- .../subscription/item/FeedGroupReorderItem.kt | 12 ++-- .../subscription/item/FeedImportExportItem.kt | 9 ++- .../subscription/item/HeaderWithMenuItem.kt | 10 ++-- .../settings/custom/DurationListPreference.kt | 2 +- .../org/schabi/newpipe/util/ExceptionUtils.kt | 2 +- .../newpipe/util/urlfinder/UrlFinder.kt | 2 +- .../local/subscription/FeedGroupIconTest.kt | 2 +- .../schabi/newpipe/util/ExceptionUtilsTest.kt | 10 ++-- .../newpipe/util/urlfinder/UrlFinderTest.kt | 2 +- 38 files changed, 220 insertions(+), 224 deletions(-) diff --git a/app/src/androidTest/java/org/schabi/newpipe/database/AppDatabaseTest.kt b/app/src/androidTest/java/org/schabi/newpipe/database/AppDatabaseTest.kt index 917a83bf2..e37eb5db9 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/database/AppDatabaseTest.kt +++ b/app/src/androidTest/java/org/schabi/newpipe/database/AppDatabaseTest.kt @@ -116,4 +116,4 @@ class AppDatabaseTest { testHelper.closeWhenFinished(database) return database } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt b/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt index c104c83f7..74f5b369e 100644 --- a/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt +++ b/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt @@ -7,11 +7,11 @@ import androidx.room.Query import androidx.room.Transaction import androidx.room.Update import io.reactivex.Flowable +import java.util.Date import org.schabi.newpipe.database.feed.model.FeedEntity import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity import org.schabi.newpipe.database.stream.model.StreamEntity import org.schabi.newpipe.database.subscription.SubscriptionEntity -import java.util.Date @Dao abstract class FeedDAO { diff --git a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedEntity.kt b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedEntity.kt index e73af7fcf..8a1eb65d4 100644 --- a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedEntity.kt +++ b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedEntity.kt @@ -27,11 +27,11 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity ] ) data class FeedEntity( - @ColumnInfo(name = STREAM_ID) - var streamId: Long, + @ColumnInfo(name = STREAM_ID) + var streamId: Long, - @ColumnInfo(name = SUBSCRIPTION_ID) - var subscriptionId: Long + @ColumnInfo(name = SUBSCRIPTION_ID) + var subscriptionId: Long ) { companion object { @@ -40,4 +40,4 @@ data class FeedEntity( const val STREAM_ID = "stream_id" const val SUBSCRIPTION_ID = "subscription_id" } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupEntity.kt b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupEntity.kt index a84568dd6..e772168fd 100644 --- a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupEntity.kt +++ b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupEntity.kt @@ -13,18 +13,18 @@ import org.schabi.newpipe.local.subscription.FeedGroupIcon indices = [Index(SORT_ORDER)] ) data class FeedGroupEntity( - @PrimaryKey(autoGenerate = true) - @ColumnInfo(name = ID) - val uid: Long, + @PrimaryKey(autoGenerate = true) + @ColumnInfo(name = ID) + val uid: Long, - @ColumnInfo(name = NAME) - var name: String, + @ColumnInfo(name = NAME) + var name: String, - @ColumnInfo(name = ICON) - var icon: FeedGroupIcon, + @ColumnInfo(name = ICON) + var icon: FeedGroupIcon, - @ColumnInfo(name = SORT_ORDER) - var sortOrder: Long = -1 + @ColumnInfo(name = SORT_ORDER) + var sortOrder: Long = -1 ) { companion object { const val FEED_GROUP_TABLE = "feed_group" @@ -36,4 +36,4 @@ data class FeedGroupEntity( const val GROUP_ALL_ID = -1L } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt index 55fe5d4df..eac6bddee 100644 --- a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt +++ b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt @@ -29,11 +29,11 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity ] ) data class FeedGroupSubscriptionEntity( - @ColumnInfo(name = GROUP_ID) - var feedGroupId: Long, + @ColumnInfo(name = GROUP_ID) + var feedGroupId: Long, - @ColumnInfo(name = SUBSCRIPTION_ID) - var subscriptionId: Long + @ColumnInfo(name = SUBSCRIPTION_ID) + var subscriptionId: Long ) { companion object { @@ -42,4 +42,4 @@ data class FeedGroupSubscriptionEntity( const val GROUP_ID = "group_id" const val SUBSCRIPTION_ID = "subscription_id" } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedLastUpdatedEntity.kt b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedLastUpdatedEntity.kt index 0ac2e2bf1..78b2550a5 100644 --- a/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedLastUpdatedEntity.kt +++ b/app/src/main/java/org/schabi/newpipe/database/feed/model/FeedLastUpdatedEntity.kt @@ -4,10 +4,10 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.PrimaryKey +import java.util.Date import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.FEED_LAST_UPDATED_TABLE import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.SUBSCRIPTION_ID import org.schabi.newpipe.database.subscription.SubscriptionEntity -import java.util.Date @Entity( tableName = FEED_LAST_UPDATED_TABLE, @@ -20,12 +20,12 @@ import java.util.Date ] ) data class FeedLastUpdatedEntity( - @PrimaryKey - @ColumnInfo(name = SUBSCRIPTION_ID) - var subscriptionId: Long, + @PrimaryKey + @ColumnInfo(name = SUBSCRIPTION_ID) + var subscriptionId: Long, - @ColumnInfo(name = LAST_UPDATED) - var lastUpdated: Date? = null + @ColumnInfo(name = LAST_UPDATED) + var lastUpdated: Date? = null ) { companion object { diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt index 970550a94..c653e6c6f 100644 --- a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt +++ b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt @@ -2,21 +2,21 @@ package org.schabi.newpipe.database.history.model import androidx.room.ColumnInfo import androidx.room.Embedded -import org.schabi.newpipe.database.stream.model.StreamEntity import java.util.Date +import org.schabi.newpipe.database.stream.model.StreamEntity data class StreamHistoryEntry( - @Embedded - val streamEntity: StreamEntity, + @Embedded + val streamEntity: StreamEntity, - @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID) - val streamId: Long, + @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID) + val streamId: Long, - @ColumnInfo(name = StreamHistoryEntity.STREAM_ACCESS_DATE) - val accessDate: Date, + @ColumnInfo(name = StreamHistoryEntity.STREAM_ACCESS_DATE) + val accessDate: Date, - @ColumnInfo(name = StreamHistoryEntity.STREAM_REPEAT_COUNT) - val repeatCount: Long + @ColumnInfo(name = StreamHistoryEntity.STREAM_REPEAT_COUNT) + val repeatCount: Long ) { fun toStreamHistoryEntity(): StreamHistoryEntity { diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt index afaf599b9..c349a3761 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt @@ -8,14 +8,14 @@ import org.schabi.newpipe.database.stream.model.StreamEntity import org.schabi.newpipe.extractor.stream.StreamInfoItem class PlaylistStreamEntry( - @Embedded - val streamEntity: StreamEntity, + @Embedded + val streamEntity: StreamEntity, - @ColumnInfo(name = PlaylistStreamEntity.JOIN_STREAM_ID) - val streamId: Long, + @ColumnInfo(name = PlaylistStreamEntity.JOIN_STREAM_ID) + val streamId: Long, - @ColumnInfo(name = PlaylistStreamEntity.JOIN_INDEX) - val joinIndex: Int + @ColumnInfo(name = PlaylistStreamEntity.JOIN_INDEX) + val joinIndex: Int ) : LocalItem { @Throws(IllegalArgumentException::class) diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt b/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt index e6a15baee..dde1f0392 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt +++ b/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt @@ -2,24 +2,24 @@ package org.schabi.newpipe.database.stream import androidx.room.ColumnInfo import androidx.room.Embedded +import java.util.Date import org.schabi.newpipe.database.LocalItem import org.schabi.newpipe.database.history.model.StreamHistoryEntity import org.schabi.newpipe.database.stream.model.StreamEntity import org.schabi.newpipe.extractor.stream.StreamInfoItem -import java.util.Date class StreamStatisticsEntry( - @Embedded - val streamEntity: StreamEntity, + @Embedded + val streamEntity: StreamEntity, - @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID) - val streamId: Long, + @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID) + val streamId: Long, - @ColumnInfo(name = STREAM_LATEST_DATE) - val latestAccessDate: Date, + @ColumnInfo(name = STREAM_LATEST_DATE) + val latestAccessDate: Date, - @ColumnInfo(name = STREAM_WATCH_COUNT) - val watchCount: Long + @ColumnInfo(name = STREAM_WATCH_COUNT) + val watchCount: Long ) : LocalItem { fun toStreamInfoItem(): StreamInfoItem { diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt index 6d8425d2a..921c08b46 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt +++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt @@ -7,13 +7,13 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction import io.reactivex.Flowable +import java.util.Date import org.schabi.newpipe.database.BasicDAO import org.schabi.newpipe.database.stream.model.StreamEntity import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_ID import org.schabi.newpipe.extractor.stream.StreamType import org.schabi.newpipe.extractor.stream.StreamType.AUDIO_LIVE_STREAM import org.schabi.newpipe.extractor.stream.StreamType.LIVE_STREAM -import java.util.Date @Dao abstract class StreamDAO : BasicDAO { @@ -98,7 +98,6 @@ abstract class StreamDAO : BasicDAO { if (existentMinimalStream.duration > 0 && newerStream.duration < 0) { newerStream.duration = existentMinimalStream.duration } - } } @@ -120,21 +119,22 @@ abstract class StreamDAO : BasicDAO { * Minimal entry class used when comparing/updating an existent stream. */ internal data class StreamCompareFeed( - @ColumnInfo(name = STREAM_ID) - var uid: Long = 0, + @ColumnInfo(name = STREAM_ID) + var uid: Long = 0, - @ColumnInfo(name = StreamEntity.STREAM_TYPE) - var streamType: StreamType, + @ColumnInfo(name = StreamEntity.STREAM_TYPE) + var streamType: StreamType, - @ColumnInfo(name = StreamEntity.STREAM_TEXTUAL_UPLOAD_DATE) - var textualUploadDate: String? = null, + @ColumnInfo(name = StreamEntity.STREAM_TEXTUAL_UPLOAD_DATE) + var textualUploadDate: String? = null, - @ColumnInfo(name = StreamEntity.STREAM_UPLOAD_DATE) - var uploadDate: Date? = null, + @ColumnInfo(name = StreamEntity.STREAM_UPLOAD_DATE) + var uploadDate: Date? = null, - @ColumnInfo(name = StreamEntity.STREAM_IS_UPLOAD_DATE_APPROXIMATION) - var isUploadDateApproximation: Boolean? = null, + @ColumnInfo(name = StreamEntity.STREAM_IS_UPLOAD_DATE_APPROXIMATION) + var isUploadDateApproximation: Boolean? = null, - @ColumnInfo(name = StreamEntity.STREAM_DURATION) - var duration: Long) + @ColumnInfo(name = StreamEntity.STREAM_DURATION) + var duration: Long + ) } diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.kt b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.kt index 5d91091ff..d13f5cc2d 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.kt +++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.kt @@ -5,6 +5,9 @@ import androidx.room.Entity import androidx.room.Ignore import androidx.room.Index import androidx.room.PrimaryKey +import java.io.Serializable +import java.util.Calendar +import java.util.Date import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_SERVICE_ID import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_TABLE import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_URL @@ -13,9 +16,6 @@ import org.schabi.newpipe.extractor.stream.StreamInfo import org.schabi.newpipe.extractor.stream.StreamInfoItem import org.schabi.newpipe.extractor.stream.StreamType import org.schabi.newpipe.player.playqueue.PlayQueueItem -import java.io.Serializable -import java.util.Calendar -import java.util.Date @Entity(tableName = STREAM_TABLE, indices = [ @@ -23,42 +23,42 @@ import java.util.Date ] ) data class StreamEntity( - @PrimaryKey(autoGenerate = true) - @ColumnInfo(name = STREAM_ID) - var uid: Long = 0, + @PrimaryKey(autoGenerate = true) + @ColumnInfo(name = STREAM_ID) + var uid: Long = 0, - @ColumnInfo(name = STREAM_SERVICE_ID) - var serviceId: Int, + @ColumnInfo(name = STREAM_SERVICE_ID) + var serviceId: Int, - @ColumnInfo(name = STREAM_URL) - var url: String, + @ColumnInfo(name = STREAM_URL) + var url: String, - @ColumnInfo(name = STREAM_TITLE) - var title: String, + @ColumnInfo(name = STREAM_TITLE) + var title: String, - @ColumnInfo(name = STREAM_TYPE) - var streamType: StreamType, + @ColumnInfo(name = STREAM_TYPE) + var streamType: StreamType, - @ColumnInfo(name = STREAM_DURATION) - var duration: Long, + @ColumnInfo(name = STREAM_DURATION) + var duration: Long, - @ColumnInfo(name = STREAM_UPLOADER) - var uploader: String, + @ColumnInfo(name = STREAM_UPLOADER) + var uploader: String, - @ColumnInfo(name = STREAM_THUMBNAIL_URL) - var thumbnailUrl: String? = null, + @ColumnInfo(name = STREAM_THUMBNAIL_URL) + var thumbnailUrl: String? = null, - @ColumnInfo(name = STREAM_VIEWS) - var viewCount: Long? = null, + @ColumnInfo(name = STREAM_VIEWS) + var viewCount: Long? = null, - @ColumnInfo(name = STREAM_TEXTUAL_UPLOAD_DATE) - var textualUploadDate: String? = null, + @ColumnInfo(name = STREAM_TEXTUAL_UPLOAD_DATE) + var textualUploadDate: String? = null, - @ColumnInfo(name = STREAM_UPLOAD_DATE) - var uploadDate: Date? = null, + @ColumnInfo(name = STREAM_UPLOAD_DATE) + var uploadDate: Date? = null, - @ColumnInfo(name = STREAM_IS_UPLOAD_DATE_APPROXIMATION) - var isUploadDateApproximation: Boolean? = null + @ColumnInfo(name = STREAM_IS_UPLOAD_DATE_APPROXIMATION) + var isUploadDateApproximation: Boolean? = null ) : Serializable { @Ignore diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt index 0bb4c5e0f..d319c9fa3 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt @@ -7,6 +7,8 @@ import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers +import java.util.Calendar +import java.util.Date import org.schabi.newpipe.MainActivity.DEBUG import org.schabi.newpipe.NewPipeDatabase import org.schabi.newpipe.database.feed.model.FeedEntity @@ -16,8 +18,6 @@ import org.schabi.newpipe.database.stream.model.StreamEntity import org.schabi.newpipe.extractor.stream.StreamInfoItem import org.schabi.newpipe.extractor.stream.StreamType import org.schabi.newpipe.local.subscription.FeedGroupIcon -import java.util.Calendar -import java.util.Date class FeedDatabaseManager(context: Context) { private val database = NewPipeDatabase.getInstance(context) @@ -70,8 +70,11 @@ class FeedDatabaseManager(context: Context) { fun markAsOutdated(subscriptionId: Long) = feedTable .setLastUpdatedForSubscription(FeedLastUpdatedEntity(subscriptionId, null)) - fun upsertAll(subscriptionId: Long, items: List, - oldestAllowedDate: Date = FEED_OLDEST_ALLOWED_DATE.time) { + fun upsertAll( + subscriptionId: Long, + items: List, + oldestAllowedDate: Date = FEED_OLDEST_ALLOWED_DATE.time + ) { val itemsToInsert = ArrayList() loop@ for (streamItem in items) { val uploadDate = streamItem.uploadDate @@ -107,9 +110,9 @@ class FeedDatabaseManager(context: Context) { if (DEBUG) Log.d(this::class.java.simpleName, "clear() → streamTable.deleteOrphans() → $deletedOrphans") } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Feed Groups - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// fun subscriptionIdsForGroup(groupId: Long): Flowable> { return feedGroupTable.getSubscriptionIdsFor(groupId) @@ -161,6 +164,5 @@ class FeedDatabaseManager(context: Context) { FeedGroupEntity.GROUP_ALL_ID -> feedTable.oldestSubscriptionUpdateFromAll() else -> feedTable.oldestSubscriptionUpdate(groupId) } - } } diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt index 4f558e54a..8018e2cd8 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt @@ -33,6 +33,7 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import androidx.preference.PreferenceManager import icepick.State +import java.util.Calendar import kotlinx.android.synthetic.main.error_retry.error_button_retry import kotlinx.android.synthetic.main.error_retry.error_message_view import kotlinx.android.synthetic.main.fragment_feed.empty_state_view @@ -50,7 +51,6 @@ import org.schabi.newpipe.local.feed.service.FeedLoadService import org.schabi.newpipe.report.UserAction import org.schabi.newpipe.util.AnimationUtils.animateView import org.schabi.newpipe.util.Localization -import java.util.Calendar class FeedFragment : BaseListFragment() { private lateinit var viewModel: FeedViewModel @@ -111,9 +111,9 @@ class FeedFragment : BaseListFragment() { } } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Menu - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) @@ -163,9 +163,9 @@ class FeedFragment : BaseListFragment() { activity?.supportActionBar?.subtitle = null } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Handling - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// override fun showLoading() { animateView(refresh_root_view, false, 0) @@ -272,7 +272,6 @@ class FeedFragment : BaseListFragment() { } } - private fun handleErrorState(errorState: FeedState.ErrorState): Boolean { hideLoading() errorState.error?.let { @@ -296,9 +295,9 @@ class FeedFragment : BaseListFragment() { refresh_text?.text = getString(R.string.feed_oldest_subscription_update, oldestSubscriptionUpdateText) } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Load Service Handling - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// override fun doInitialLoadLogic() {} override fun reloadContent() = triggerUpdate() diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedState.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedState.kt index fd6a0f6fd..de3dd3113 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedState.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedState.kt @@ -1,24 +1,24 @@ package org.schabi.newpipe.local.feed import androidx.annotation.StringRes -import org.schabi.newpipe.extractor.stream.StreamInfoItem import java.util.Calendar +import org.schabi.newpipe.extractor.stream.StreamInfoItem sealed class FeedState { data class ProgressState( - val currentProgress: Int = -1, - val maxProgress: Int = -1, - @StringRes val progressMessage: Int = 0 + val currentProgress: Int = -1, + val maxProgress: Int = -1, + @StringRes val progressMessage: Int = 0 ) : FeedState() data class LoadedState( - val items: List, - val oldestUpdate: Calendar? = null, - val notLoadedCount: Long, - val itemsErrors: List = emptyList() + val items: List, + val oldestUpdate: Calendar? = null, + val notLoadedCount: Long, + val itemsErrors: List = emptyList() ) : FeedState() data class ErrorState( - val error: Throwable? = null + val error: Throwable? = null ) : FeedState() } diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt index 796eeae91..da2b5ffa4 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt @@ -9,6 +9,9 @@ import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.functions.Function4 import io.reactivex.schedulers.Schedulers +import java.util.Calendar +import java.util.Date +import java.util.concurrent.TimeUnit import org.schabi.newpipe.database.feed.model.FeedGroupEntity import org.schabi.newpipe.extractor.stream.StreamInfoItem import org.schabi.newpipe.local.feed.service.FeedEventManager @@ -17,9 +20,6 @@ import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.IdleEvent import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ProgressEvent import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.SuccessResultEvent import org.schabi.newpipe.util.DEFAULT_THROTTLE_TIMEOUT -import java.util.Calendar -import java.util.Date -import java.util.concurrent.TimeUnit class FeedViewModel(applicationContext: Context, val groupId: Long = FeedGroupEntity.GROUP_ALL_ID) : ViewModel() { class Factory(val context: Context, val groupId: Long = FeedGroupEntity.GROUP_ALL_ID) : ViewModelProvider.Factory { diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedEventManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedEventManager.kt index e9012ff37..b72098345 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedEventManager.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedEventManager.kt @@ -3,8 +3,8 @@ package org.schabi.newpipe.local.feed.service import androidx.annotation.StringRes import io.reactivex.Flowable import io.reactivex.processors.BehaviorProcessor -import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.IdleEvent import java.util.concurrent.atomic.AtomicBoolean +import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.IdleEvent object FeedEventManager { private var processor: BehaviorProcessor = BehaviorProcessor.create() @@ -34,5 +34,4 @@ object FeedEventManager { data class SuccessResultEvent(val itemsErrors: List = emptyList()) : Event() data class ErrorResultEvent(val error: Throwable) : Event() } - } diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt index 1e51120a5..65860096c 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt @@ -40,6 +40,11 @@ import io.reactivex.functions.Consumer import io.reactivex.functions.Function import io.reactivex.processors.PublishProcessor import io.reactivex.schedulers.Schedulers +import java.io.IOException +import java.util.Calendar +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicInteger import org.reactivestreams.Subscriber import org.reactivestreams.Subscription import org.schabi.newpipe.MainActivity.DEBUG @@ -57,11 +62,6 @@ import org.schabi.newpipe.local.feed.service.FeedEventManager.postEvent import org.schabi.newpipe.local.subscription.SubscriptionManager import org.schabi.newpipe.util.ExceptionUtils import org.schabi.newpipe.util.ExtractorHelper -import java.io.IOException -import java.util.Calendar -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicInteger class FeedLoadService : Service() { companion object { @@ -96,9 +96,9 @@ class FeedLoadService : Service() { private var disposables = CompositeDisposable() private var notificationUpdater = PublishProcessor.create() - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Lifecycle - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// override fun onCreate() { super.onCreate() @@ -153,9 +153,9 @@ class FeedLoadService : Service() { return null } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Loading & Handling - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// private class RequestException(val subscriptionId: Long, message: String, cause: Throwable) : Exception(message, cause) { companion object { @@ -314,7 +314,6 @@ class FeedLoadService : Service() { feedResultsHolder.addErrors(RequestException.wrapList(subscriptionId, info)) feedDatabaseManager.markAsOutdated(subscriptionId) } - } else if (notification.isOnError) { val error = notification.error!! feedResultsHolder.addError(error) @@ -327,7 +326,6 @@ class FeedLoadService : Service() { } } - private val errorHandlingConsumer: Consumer>>> get() = Consumer { if (it.isOnError) { @@ -356,9 +354,9 @@ class FeedLoadService : Service() { broadcastProgress() } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Notification - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// private lateinit var notificationManager: NotificationManagerCompat private lateinit var notificationBuilder: NotificationCompat.Builder @@ -414,9 +412,9 @@ class FeedLoadService : Service() { notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build()) } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Notification Actions - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// private lateinit var broadcastReceiver: BroadcastReceiver private val cancelSignal = AtomicBoolean() @@ -432,18 +430,18 @@ class FeedLoadService : Service() { registerReceiver(broadcastReceiver, IntentFilter(ACTION_CANCEL)) } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Error handling - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// private fun handleError(error: Throwable) { postEvent(ErrorResultEvent(error)) stopService() } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Results Holder - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// class ResultsHolder { /** diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt index 9ff08c32c..6e4d902e1 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt @@ -7,15 +7,15 @@ import org.schabi.newpipe.R import org.schabi.newpipe.util.ThemeHelper enum class FeedGroupIcon( - /** - * The id that will be used to store and retrieve icons from some persistent storage (e.g. DB). - */ - val id: Int, + /** + * The id that will be used to store and retrieve icons from some persistent storage (e.g. DB). + */ + val id: Int, - /** - * The attribute that points to a drawable resource. "R.attr" is used here to support multiple themes. - */ - @AttrRes val drawableResourceAttr: Int + /** + * The attribute that points to a drawable resource. "R.attr" is used here to support multiple themes. + */ + @AttrRes val drawableResourceAttr: Int ) { ALL(0, R.attr.ic_asterisk), MUSIC(1, R.attr.ic_music_note), @@ -60,4 +60,4 @@ enum class FeedGroupIcon( fun getDrawableRes(context: Context): Int { return ThemeHelper.resolveResourceIdFromAttr(context, drawableResourceAttr) } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt index 894b67024..7fea3b5d8 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt @@ -29,6 +29,12 @@ import com.xwray.groupie.Section import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder import icepick.State import io.reactivex.disposables.CompositeDisposable +import java.io.File +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import kotlin.math.floor +import kotlin.math.max import kotlinx.android.synthetic.main.dialog_title.view.itemAdditionalDetails import kotlinx.android.synthetic.main.dialog_title.view.itemTitleView import kotlinx.android.synthetic.main.fragment_subscription.items_list @@ -62,12 +68,6 @@ import org.schabi.newpipe.util.NavigationHelper import org.schabi.newpipe.util.OnClickGesture import org.schabi.newpipe.util.ShareUtils import org.schabi.newpipe.util.ThemeHelper -import java.io.File -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale -import kotlin.math.floor -import kotlin.math.max class SubscriptionFragment : BaseStateFragment() { private lateinit var viewModel: SubscriptionViewModel @@ -97,9 +97,9 @@ class SubscriptionFragment : BaseStateFragment() { setHasOptionsMenu(true) } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Fragment LifeCycle - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -143,9 +143,9 @@ class SubscriptionFragment : BaseStateFragment() { disposables.dispose() } - ////////////////////////////////////////////////////////////////////////// + // //////////////////////////////////////////////////////////////////////// // Menu - ////////////////////////////////////////////////////////////////////////// + // //////////////////////////////////////////////////////////////////////// override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) @@ -173,7 +173,6 @@ class SubscriptionFragment : BaseStateFragment() { importExportItem.isExpanded = false importExportItem.notifyChanged(FeedImportExportItem.REFRESH_EXPANDED_STATUS) } - } } @@ -221,9 +220,9 @@ class SubscriptionFragment : BaseStateFragment() { } } - ////////////////////////////////////////////////////////////////////////// + // //////////////////////////////////////////////////////////////////////// // Fragment Views - ////////////////////////////////////////////////////////////////////////// + // //////////////////////////////////////////////////////////////////////// private fun setupInitialLayout() { Section().apply { @@ -266,7 +265,6 @@ class SubscriptionFragment : BaseStateFragment() { { onExportSelected() }, importExportItemExpandedState ?: false) groupAdapter.add(Section(importExportItem, listOf(subscriptionsSection))) - } override fun initViews(rootView: View, savedInstanceState: Bundle?) { @@ -389,9 +387,9 @@ class SubscriptionFragment : BaseStateFragment() { items_list.post { feedGroupsSortMenuItem.notifyChanged(PAYLOAD_UPDATE_VISIBILITY_MENU_ITEM) } } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Contract - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// override fun showLoading() { super.showLoading() @@ -403,9 +401,9 @@ class SubscriptionFragment : BaseStateFragment() { animateView(items_list, true, 200) } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Fragment Error Handling - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// override fun onError(exception: Throwable): Boolean { if (super.onError(exception)) return true @@ -414,9 +412,9 @@ class SubscriptionFragment : BaseStateFragment() { return true } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Grid Mode - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // TODO: Move these out of this class, as it can be reused @@ -428,8 +426,8 @@ class SubscriptionFragment : BaseStateFragment() { getString(R.string.list_view_mode_auto_key) -> { val configuration = resources.configuration - (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE - && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)) + (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE && + configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)) } getString(R.string.list_view_mode_grid_key) -> true else -> false diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionViewModel.kt index 6454cc912..b7f16c319 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionViewModel.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionViewModel.kt @@ -6,11 +6,11 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.xwray.groupie.Group import io.reactivex.schedulers.Schedulers +import java.util.concurrent.TimeUnit import org.schabi.newpipe.local.feed.FeedDatabaseManager import org.schabi.newpipe.local.subscription.item.ChannelItem import org.schabi.newpipe.local.subscription.item.FeedGroupCardItem import org.schabi.newpipe.util.DEFAULT_THROTTLE_TIMEOUT -import java.util.concurrent.TimeUnit class SubscriptionViewModel(application: Application) : AndroidViewModel(application) { private var feedDatabaseManager: FeedDatabaseManager = FeedDatabaseManager(application) diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/decoration/FeedGroupCarouselDecoration.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/decoration/FeedGroupCarouselDecoration.kt index 24c8d9cb8..7b7490eaa 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/decoration/FeedGroupCarouselDecoration.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/decoration/FeedGroupCarouselDecoration.kt @@ -32,4 +32,4 @@ class FeedGroupCarouselDecoration(context: Context) : RecyclerView.ItemDecoratio outRect.right = marginStartEnd } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt index 421bd0de4..e9d9ac5b3 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt @@ -22,6 +22,7 @@ import com.xwray.groupie.Section import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder import icepick.Icepick import icepick.State +import java.io.Serializable import kotlinx.android.synthetic.main.dialog_feed_group_create.cancel_button import kotlinx.android.synthetic.main.dialog_feed_group_create.confirm_button import kotlinx.android.synthetic.main.dialog_feed_group_create.delete_button @@ -51,7 +52,6 @@ import org.schabi.newpipe.local.subscription.item.EmptyPlaceholderItem import org.schabi.newpipe.local.subscription.item.PickerIconItem import org.schabi.newpipe.local.subscription.item.PickerSubscriptionItem import org.schabi.newpipe.util.ThemeHelper -import java.io.Serializable class FeedGroupDialog : DialogFragment() { private lateinit var viewModel: FeedGroupDialogViewModel @@ -137,9 +137,9 @@ class FeedGroupDialog : DialogFragment() { showScreen(currentScreen) } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Setup - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// private fun setupListeners() { delete_button.setOnClickListener { showScreen(DeleteScreen) } @@ -311,9 +311,9 @@ class FeedGroupDialog : DialogFragment() { } } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Screen Selector - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// private fun showScreen(screen: ScreenState) { currentScreen = screen @@ -347,9 +347,9 @@ class FeedGroupDialog : DialogFragment() { } } - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// // Utils - /////////////////////////////////////////////////////////////////////////// + // ///////////////////////////////////////////////////////////////////////// private fun hideKeyboard() { val inputMethodManager = requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt index bd57a2639..ac00245e6 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialogViewModel.kt @@ -16,7 +16,6 @@ import org.schabi.newpipe.local.feed.FeedDatabaseManager import org.schabi.newpipe.local.subscription.FeedGroupIcon import org.schabi.newpipe.local.subscription.SubscriptionManager - class FeedGroupDialogViewModel(applicationContext: Context, val groupId: Long = FeedGroupEntity.GROUP_ALL_ID) : ViewModel() { class Factory(val context: Context, val groupId: Long = FeedGroupEntity.GROUP_ALL_ID) : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") @@ -84,4 +83,4 @@ class FeedGroupDialogViewModel(applicationContext: Context, val groupId: Long = object ProcessingEvent : DialogEvent() object SuccessEvent : DialogEvent() } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt index 6578854ce..92c063b4b 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt @@ -16,6 +16,7 @@ import com.xwray.groupie.TouchCallback import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder import icepick.Icepick import icepick.State +import java.util.Collections import kotlinx.android.synthetic.main.dialog_feed_group_reorder.confirm_button import kotlinx.android.synthetic.main.dialog_feed_group_reorder.feed_groups_list import org.schabi.newpipe.R @@ -24,7 +25,6 @@ import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewMo import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewModel.DialogEvent.SuccessEvent import org.schabi.newpipe.local.subscription.item.FeedGroupReorderItem import org.schabi.newpipe.util.ThemeHelper -import java.util.Collections class FeedGroupReorderDialog : DialogFragment() { private lateinit var viewModel: FeedGroupReorderDialogViewModel @@ -93,8 +93,11 @@ class FeedGroupReorderDialog : DialogFragment() { private fun getItemTouchCallback(): SimpleCallback { return object : TouchCallback() { - override fun onMove(recyclerView: RecyclerView, source: RecyclerView.ViewHolder, - target: RecyclerView.ViewHolder): Boolean { + override fun onMove( + recyclerView: RecyclerView, + source: RecyclerView.ViewHolder, + target: RecyclerView.ViewHolder + ): Boolean { val sourceIndex = source.adapterPosition val targetIndex = target.adapterPosition diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialogViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialogViewModel.kt index 8ef5bb55c..ea2cbe98f 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialogViewModel.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialogViewModel.kt @@ -49,4 +49,4 @@ class FeedGroupReorderDialogViewModel(application: Application) : AndroidViewMod object ProcessingEvent : DialogEvent() object SuccessEvent : DialogEvent() } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt index a6b958d4b..f33c58f43 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/ChannelItem.kt @@ -14,12 +14,11 @@ import org.schabi.newpipe.util.ImageDisplayConstants import org.schabi.newpipe.util.Localization import org.schabi.newpipe.util.OnClickGesture - class ChannelItem( - private val infoItem: ChannelInfoItem, - private val subscriptionId: Long = -1L, - var itemVersion: ItemVersion = ItemVersion.NORMAL, - var gesturesListener: OnClickGesture? = null + private val infoItem: ChannelInfoItem, + private val subscriptionId: Long = -1L, + var itemVersion: ItemVersion = ItemVersion.NORMAL, + var gesturesListener: OnClickGesture? = null ) : Item() { override fun getId(): Long = if (subscriptionId == -1L) super.getId() else subscriptionId diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt index 38151774b..c806277ee 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt @@ -7,4 +7,4 @@ import org.schabi.newpipe.R class EmptyPlaceholderItem : Item() { override fun getLayout(): Int = R.layout.list_empty_view override fun bind(viewHolder: GroupieViewHolder, position: Int) {} -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt index 2190bed76..1bc4d1673 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupAddItem.kt @@ -7,4 +7,4 @@ import org.schabi.newpipe.R class FeedGroupAddItem : Item() { override fun getLayout(): Int = R.layout.feed_group_add_new_item override fun bind(viewHolder: GroupieViewHolder, position: Int) {} -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt index 0e4ab8d18..12ff47b3f 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCardItem.kt @@ -9,9 +9,9 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity import org.schabi.newpipe.local.subscription.FeedGroupIcon data class FeedGroupCardItem( - val groupId: Long = FeedGroupEntity.GROUP_ALL_ID, - val name: String, - val icon: FeedGroupIcon + val groupId: Long = FeedGroupEntity.GROUP_ALL_ID, + val name: String, + val icon: FeedGroupIcon ) : Item() { constructor (feedGroupEntity: FeedGroupEntity) : this(feedGroupEntity.uid, feedGroupEntity.name, feedGroupEntity.icon) diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt index fb1e93cb8..717e2410a 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupReorderItem.kt @@ -14,13 +14,13 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity import org.schabi.newpipe.local.subscription.FeedGroupIcon data class FeedGroupReorderItem( - val groupId: Long = FeedGroupEntity.GROUP_ALL_ID, - val name: String, - val icon: FeedGroupIcon, - val dragCallback: ItemTouchHelper + val groupId: Long = FeedGroupEntity.GROUP_ALL_ID, + val name: String, + val icon: FeedGroupIcon, + val dragCallback: ItemTouchHelper ) : Item() { - constructor (feedGroupEntity: FeedGroupEntity, dragCallback: ItemTouchHelper) - : this(feedGroupEntity.uid, feedGroupEntity.name, feedGroupEntity.icon, dragCallback) + constructor (feedGroupEntity: FeedGroupEntity, dragCallback: ItemTouchHelper) : + this(feedGroupEntity.uid, feedGroupEntity.name, feedGroupEntity.icon, dragCallback) override fun getId(): Long { return when (groupId) { diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt index 0404fbc24..5478dcac4 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedImportExportItem.kt @@ -23,10 +23,10 @@ import org.schabi.newpipe.util.ThemeHelper import org.schabi.newpipe.views.CollapsibleView class FeedImportExportItem( - val onImportPreviousSelected: () -> Unit, - val onImportFromServiceSelected: (Int) -> Unit, - val onExportSelected: () -> Unit, - var isExpanded: Boolean = false + val onImportPreviousSelected: () -> Unit, + val onImportFromServiceSelected: (Int) -> Unit, + val onExportSelected: () -> Unit, + var isExpanded: Boolean = false ) : Item() { companion object { const val REFRESH_EXPANDED_STATUS = 123 @@ -108,7 +108,6 @@ class FeedImportExportItem( } catch (e: ExtractionException) { throw RuntimeException("Services array contains an entry that it's not a valid service name ($serviceName)", e) } - } } diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt index b8f8063a7..324932256 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/HeaderWithMenuItem.kt @@ -11,11 +11,11 @@ import kotlinx.android.synthetic.main.header_with_menu_item.header_title import org.schabi.newpipe.R class HeaderWithMenuItem( - val title: String, - @DrawableRes val itemIcon: Int = 0, - var showMenuItem: Boolean = true, - private val onClickListener: (() -> Unit)? = null, - private val menuItemOnClickListener: (() -> Unit)? = null + val title: String, + @DrawableRes val itemIcon: Int = 0, + var showMenuItem: Boolean = true, + private val onClickListener: (() -> Unit)? = null, + private val menuItemOnClickListener: (() -> Unit)? = null ) : Item() { companion object { const val PAYLOAD_UPDATE_VISIBILITY_MENU_ITEM = 1 diff --git a/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt b/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt index 4bc59fcee..14801c01c 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt +++ b/app/src/main/java/org/schabi/newpipe/settings/custom/DurationListPreference.kt @@ -43,4 +43,4 @@ class DurationListPreference : ListPreference { entries = newEntryTitles } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt b/app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt index 163d1bc4f..528912ceb 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt +++ b/app/src/main/java/org/schabi/newpipe/util/ExceptionUtils.kt @@ -79,4 +79,4 @@ class ExceptionUtils { return false } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/util/urlfinder/UrlFinder.kt b/app/src/main/java/org/schabi/newpipe/util/urlfinder/UrlFinder.kt index f9090d1b5..503fa2094 100644 --- a/app/src/main/java/org/schabi/newpipe/util/urlfinder/UrlFinder.kt +++ b/app/src/main/java/org/schabi/newpipe/util/urlfinder/UrlFinder.kt @@ -24,4 +24,4 @@ class UrlFinder { return null } } -} \ No newline at end of file +} diff --git a/app/src/test/java/org/schabi/newpipe/local/subscription/FeedGroupIconTest.kt b/app/src/test/java/org/schabi/newpipe/local/subscription/FeedGroupIconTest.kt index 9d53e891f..a0db83ba9 100644 --- a/app/src/test/java/org/schabi/newpipe/local/subscription/FeedGroupIconTest.kt +++ b/app/src/test/java/org/schabi/newpipe/local/subscription/FeedGroupIconTest.kt @@ -27,4 +27,4 @@ class FeedGroupIconTest { assertTrue("Repeated icon (current item: ${groupIcon.name} - ${groupIcon.id})", added) } } -} \ No newline at end of file +} diff --git a/app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt b/app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt index fc0e9dcbd..55dc9f469 100644 --- a/app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt +++ b/app/src/test/java/org/schabi/newpipe/util/ExceptionUtilsTest.kt @@ -1,14 +1,14 @@ package org.schabi.newpipe.util +import java.io.IOException +import java.io.InterruptedIOException +import java.net.SocketException +import javax.net.ssl.SSLException import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.schabi.newpipe.util.ExceptionUtils.Companion.hasAssignableCause import org.schabi.newpipe.util.ExceptionUtils.Companion.hasExactCause -import java.io.IOException -import java.io.InterruptedIOException -import java.net.SocketException -import javax.net.ssl.SSLException class ExceptionUtilsTest { @Test fun `assignable causes`() { @@ -66,4 +66,4 @@ class ExceptionUtilsTest { assertFalse(hasExactCause(Exception(IllegalStateException(Exception(SocketException()))), IOException::class.java)) assertFalse(hasExactCause(Exception(IllegalStateException(Exception(InterruptedIOException()))), IOException::class.java)) } -} \ No newline at end of file +} diff --git a/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt b/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt index 7bd0f50a6..99f26e472 100644 --- a/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt +++ b/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt @@ -96,4 +96,4 @@ class UrlFinderTest { assertEquals("https://www.youtube.com/watch?v=dQw4w9WgXcQ", UrlFinder.firstUrlFromInput("https://www.youtube.com/watch?v=dQw4w9WgXcQ\"Not PartOfTheUrl")) } -} \ No newline at end of file +}