lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ktlint errors

This commit is contained in:
Stypox 2020-11-04 18:07:40 +01:00
parent f0ca916432
commit b66047e084
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
10 changed files with 99 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -150,7 +150,7 @@ task formatKtlint(type: JavaExec) {
} }
afterEvaluate { afterEvaluate {
preDebugBuild.dependsOn runCheckstyle, runKtlint preDebugBuild.dependsOn formatKtlint, runCheckstyle, runKtlint
} }
dependencies { dependencies {

2
app/src/main/java/org/schabi/newpipe/about/License.kt
View File

@ -2,8 +2,8 @@ package org.schabi.newpipe.about
import android.net.Uri import android.net.Uri
import android.os.Parcelable import android.os.Parcelable
import java.io.Serializable
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize
import java.io.Serializable
/** /**
* Class for storing information about a software license. * Class for storing information about a software license.

7
app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
View File

@ -1,6 +1,11 @@
package org.schabi.newpipe.database.feed.dao package org.schabi.newpipe.database.feed.dao
import androidx.room.* import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Update
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import org.schabi.newpipe.database.feed.model.FeedEntity import org.schabi.newpipe.database.feed.model.FeedEntity
import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity

7
app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt
View File

@ -1,6 +1,11 @@
package org.schabi.newpipe.database.stream.dao package org.schabi.newpipe.database.stream.dao
import androidx.room.* import androidx.room.ColumnInfo
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.Transaction
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import org.schabi.newpipe.database.BasicDAO import org.schabi.newpipe.database.BasicDAO
import org.schabi.newpipe.database.stream.model.StreamEntity import org.schabi.newpipe.database.stream.model.StreamEntity

6
app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.kt
View File

@ -1,6 +1,10 @@
package org.schabi.newpipe.database.stream.model package org.schabi.newpipe.database.stream.model
import androidx.room.* import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.Ignore
import androidx.room.Index
import androidx.room.PrimaryKey
import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_SERVICE_ID 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_TABLE
import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_URL import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_URL

14
app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt
View File

@ -7,9 +7,6 @@ import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.core.Maybe import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.schedulers.Schedulers import io.reactivex.rxjava3.schedulers.Schedulers
import java.time.LocalDate
import java.time.OffsetDateTime
import java.time.ZoneOffset
import org.schabi.newpipe.MainActivity.DEBUG import org.schabi.newpipe.MainActivity.DEBUG
import org.schabi.newpipe.NewPipeDatabase import org.schabi.newpipe.NewPipeDatabase
import org.schabi.newpipe.database.feed.model.FeedEntity import org.schabi.newpipe.database.feed.model.FeedEntity
@ -19,6 +16,9 @@ import org.schabi.newpipe.database.stream.model.StreamEntity
import org.schabi.newpipe.extractor.stream.StreamInfoItem import org.schabi.newpipe.extractor.stream.StreamInfoItem
import org.schabi.newpipe.extractor.stream.StreamType import org.schabi.newpipe.extractor.stream.StreamType
import org.schabi.newpipe.local.subscription.FeedGroupIcon import org.schabi.newpipe.local.subscription.FeedGroupIcon
import java.time.LocalDate
import java.time.OffsetDateTime
import java.time.ZoneOffset
class FeedDatabaseManager(context: Context) { class FeedDatabaseManager(context: Context) {
private val database = NewPipeDatabase.getInstance(context) private val database = NewPipeDatabase.getInstance(context)
@ -92,8 +92,12 @@ class FeedDatabaseManager(context: Context) {
feedTable.insertAll(feedEntities) feedTable.insertAll(feedEntities)
} }
feedTable.setLastUpdatedForSubscription(FeedLastUpdatedEntity(subscriptionId, feedTable.setLastUpdatedForSubscription(
OffsetDateTime.now(ZoneOffset.UTC))) FeedLastUpdatedEntity(
subscriptionId,
OffsetDateTime.now(ZoneOffset.UTC)
)
)
} }
fun removeOrphansOrOlderStreams(oldestAllowedDate: OffsetDateTime = FEED_OLDEST_ALLOWED_DATE) { fun removeOrphansOrOlderStreams(oldestAllowedDate: OffsetDateTime = FEED_OLDEST_ALLOWED_DATE) {

5
app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
View File

@ -13,7 +13,10 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity
import org.schabi.newpipe.extractor.stream.StreamInfoItem import org.schabi.newpipe.extractor.stream.StreamInfoItem
import org.schabi.newpipe.ktx.toCalendar import org.schabi.newpipe.ktx.toCalendar
import org.schabi.newpipe.local.feed.service.FeedEventManager import org.schabi.newpipe.local.feed.service.FeedEventManager
import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.* import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ErrorResultEvent
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 org.schabi.newpipe.util.DEFAULT_THROTTLE_TIMEOUT
import java.time.OffsetDateTime import java.time.OffsetDateTime
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

6
app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
View File

@ -49,7 +49,9 @@ import org.schabi.newpipe.extractor.ListInfo
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
import org.schabi.newpipe.extractor.stream.StreamInfoItem import org.schabi.newpipe.extractor.stream.StreamInfoItem
import org.schabi.newpipe.local.feed.FeedDatabaseManager import org.schabi.newpipe.local.feed.FeedDatabaseManager
import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.* import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ErrorResultEvent
import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ProgressEvent
import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.SuccessResultEvent
import org.schabi.newpipe.local.feed.service.FeedEventManager.postEvent import org.schabi.newpipe.local.feed.service.FeedEventManager.postEvent
import org.schabi.newpipe.local.subscription.SubscriptionManager import org.schabi.newpipe.local.subscription.SubscriptionManager
import org.schabi.newpipe.util.ExceptionUtils import org.schabi.newpipe.util.ExceptionUtils
@ -262,7 +264,7 @@ class FeedLoadService : Service() {
override fun onComplete() { override fun onComplete() {
if (maxProgress.get() == 0) { if (maxProgress.get() == 0) {
postEvent(IdleEvent) postEvent(FeedEventManager.Event.IdleEvent)
stopService() stopService()
return return

71
app/src/main/java/org/schabi/newpipe/player/event/BasePlayerGestureListener.kt
View File

@ -118,22 +118,30 @@ abstract class BasePlayerGestureListener(
initSecPointerX = event.getX(1) initSecPointerX = event.getX(1)
initSecPointerY = event.getY(1) initSecPointerY = event.getY(1)
// record distance between fingers // record distance between fingers
initPointerDistance = hypot(initFirstPointerX - initSecPointerX.toDouble(), initPointerDistance = hypot(
initFirstPointerY - initSecPointerY.toDouble()) initFirstPointerX - initSecPointerX.toDouble(),
initFirstPointerY - initSecPointerY.toDouble()
)
isResizing = true isResizing = true
} }
if (event.action == MotionEvent.ACTION_MOVE && !isMovingInPopup && isResizing) { if (event.action == MotionEvent.ACTION_MOVE && !isMovingInPopup && isResizing) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onTouch() ACTION_MOVE > v = [$v], e1.getRaw = [${event.rawX}" + Log.d(
", ${event.rawY}]") TAG,
"onTouch() ACTION_MOVE > v = [$v], e1.getRaw =" +
"[${event.rawX}, ${event.rawY}]"
)
} }
return handleMultiDrag(event) return handleMultiDrag(event)
} }
if (event.action == MotionEvent.ACTION_UP) { if (event.action == MotionEvent.ACTION_UP) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onTouch() ACTION_UP > v = [$v], e1.getRaw = [${event.rawX}" + Log.d(
", ${event.rawY}]") TAG,
"onTouch() ACTION_UP > v = [$v], e1.getRaw =" +
" [${event.rawX}, ${event.rawY}]"
)
} }
if (isMovingInPopup) { if (isMovingInPopup) {
isMovingInPopup = false isMovingInPopup = false
@ -163,18 +171,24 @@ abstract class BasePlayerGestureListener(
private fun handleMultiDrag(event: MotionEvent): Boolean { private fun handleMultiDrag(event: MotionEvent): Boolean {
if (initPointerDistance != -1.0 && event.pointerCount == 2) { if (initPointerDistance != -1.0 && event.pointerCount == 2) {
// get the movements of the fingers // get the movements of the fingers
val firstPointerMove = hypot(event.getX(0) - initFirstPointerX.toDouble(), val firstPointerMove = hypot(
event.getY(0) - initFirstPointerY.toDouble()) event.getX(0) - initFirstPointerX.toDouble(),
val secPointerMove = hypot(event.getX(1) - initSecPointerX.toDouble(), event.getY(0) - initFirstPointerY.toDouble()
event.getY(1) - initSecPointerY.toDouble()) )
val secPointerMove = hypot(
event.getX(1) - initSecPointerX.toDouble(),
event.getY(1) - initSecPointerY.toDouble()
)
// minimum threshold beyond which pinch gesture will work // minimum threshold beyond which pinch gesture will work
val minimumMove = ViewConfiguration.get(service).scaledTouchSlop val minimumMove = ViewConfiguration.get(service).scaledTouchSlop
if (max(firstPointerMove, secPointerMove) > minimumMove) { if (max(firstPointerMove, secPointerMove) > minimumMove) {
// calculate current distance between the pointers // calculate current distance between the pointers
val currentPointerDistance = hypot(event.getX(0) - event.getX(1).toDouble(), val currentPointerDistance = hypot(
event.getY(0) - event.getY(1).toDouble()) event.getX(0) - event.getX(1).toDouble(),
event.getY(0) - event.getY(1).toDouble()
)
val popupWidth = playerImpl.popupWidth.toDouble() val popupWidth = playerImpl.popupWidth.toDouble()
// change co-ordinates of popup so the center stays at the same position // change co-ordinates of popup so the center stays at the same position
@ -187,7 +201,8 @@ abstract class BasePlayerGestureListener(
playerImpl.updatePopupSize( playerImpl.updatePopupSize(
min(playerImpl.screenWidth.toDouble(), newWidth).toInt(), min(playerImpl.screenWidth.toDouble(), newWidth).toInt(),
-1) -1
)
return true return true
} }
} }
@ -316,22 +331,30 @@ abstract class BasePlayerGestureListener(
} }
val isTouchingStatusBar: Boolean = initialEvent.y < getStatusBarHeight(service) val isTouchingStatusBar: Boolean = initialEvent.y < getStatusBarHeight(service)
val isTouchingNavigationBar: Boolean = (initialEvent.y val isTouchingNavigationBar: Boolean =
> playerImpl.rootView.height - getNavigationBarHeight(service)) initialEvent.y > (playerImpl.rootView.height - getNavigationBarHeight(service))
if (isTouchingStatusBar || isTouchingNavigationBar) { if (isTouchingStatusBar || isTouchingNavigationBar) {
return false return false
} }
val insideThreshold = abs(movingEvent.y - initialEvent.y) <= MOVEMENT_THRESHOLD val insideThreshold = abs(movingEvent.y - initialEvent.y) <= MOVEMENT_THRESHOLD
if (!isMovingInMain && (insideThreshold || abs(distanceX) > abs(distanceY)) || if (
playerImpl.currentState == BasePlayer.STATE_COMPLETED) { !isMovingInMain && (insideThreshold || abs(distanceX) > abs(distanceY)) ||
playerImpl.currentState == BasePlayer.STATE_COMPLETED
) {
return false return false
} }
isMovingInMain = true isMovingInMain = true
onScroll(MainPlayer.PlayerType.VIDEO, getDisplayHalfPortion(initialEvent), onScroll(
initialEvent, movingEvent, distanceX, distanceY) MainPlayer.PlayerType.VIDEO,
getDisplayHalfPortion(initialEvent),
initialEvent,
movingEvent,
distanceX,
distanceY
)
return true return true
} }
@ -373,8 +396,14 @@ abstract class BasePlayerGestureListener(
playerImpl.popupLayoutParams.x = posX.toInt() playerImpl.popupLayoutParams.x = posX.toInt()
playerImpl.popupLayoutParams.y = posY.toInt() playerImpl.popupLayoutParams.y = posY.toInt()
onScroll(MainPlayer.PlayerType.POPUP, getDisplayHalfPortion(initialEvent), onScroll(
initialEvent, movingEvent, distanceX, distanceY) MainPlayer.PlayerType.POPUP,
getDisplayHalfPortion(initialEvent),
initialEvent,
movingEvent,
distanceX,
distanceY
)
playerImpl.windowManager playerImpl.windowManager
.updateViewLayout(playerImpl.rootView, playerImpl.popupLayoutParams) .updateViewLayout(playerImpl.rootView, playerImpl.popupLayoutParams)

2
app/src/main/java/us/shandian/giga/get/MissionRecoveryInfo.kt
View File

@ -1,13 +1,13 @@
package us.shandian.giga.get package us.shandian.giga.get
import android.os.Parcelable import android.os.Parcelable
import java.io.Serializable
import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.Parcelize
import org.schabi.newpipe.extractor.MediaFormat import org.schabi.newpipe.extractor.MediaFormat
import org.schabi.newpipe.extractor.stream.AudioStream import org.schabi.newpipe.extractor.stream.AudioStream
import org.schabi.newpipe.extractor.stream.Stream import org.schabi.newpipe.extractor.stream.Stream
import org.schabi.newpipe.extractor.stream.SubtitlesStream import org.schabi.newpipe.extractor.stream.SubtitlesStream
import org.schabi.newpipe.extractor.stream.VideoStream import org.schabi.newpipe.extractor.stream.VideoStream
import java.io.Serializable
@Parcelize @Parcelize
class MissionRecoveryInfo( class MissionRecoveryInfo(