From af43e19370bb969d82377aad5631db507d7fb730 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 13 May 2022 11:26:34 +0200 Subject: [PATCH] Clean up --- .../looker/droidify/database/Converters.kt | 1 - .../com/looker/droidify/database/DatabaseX.kt | 9 ++++++++- .../droidify/service/DownloadService.kt | 6 +++++- .../looker/droidify/service/SyncService.kt | 19 ++++++++++++++++--- .../droidify/ui/adapters/AppDetailAdapter.kt | 14 ++++++++++++-- 5 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/database/Converters.kt b/src/main/kotlin/com/looker/droidify/database/Converters.kt index 4f41609d..a385b61b 100644 --- a/src/main/kotlin/com/looker/droidify/database/Converters.kt +++ b/src/main/kotlin/com/looker/droidify/database/Converters.kt @@ -1,7 +1,6 @@ package com.looker.droidify.database import androidx.room.TypeConverter -import com.looker.droidify.database.entity.Product import com.looker.droidify.database.entity.Release import com.looker.droidify.entity.Author import com.looker.droidify.entity.Donate diff --git a/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt b/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt index ed8b7007..0a2100bd 100644 --- a/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt +++ b/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt @@ -5,7 +5,14 @@ import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters -import com.looker.droidify.database.entity.* +import com.looker.droidify.database.entity.Category +import com.looker.droidify.database.entity.CategoryTemp +import com.looker.droidify.database.entity.Ignored +import com.looker.droidify.database.entity.Installed +import com.looker.droidify.database.entity.Product +import com.looker.droidify.database.entity.ProductTemp +import com.looker.droidify.database.entity.Release +import com.looker.droidify.database.entity.Repository import com.looker.droidify.database.entity.Repository.Companion.defaultRepositories import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt b/src/main/kotlin/com/looker/droidify/service/DownloadService.kt index 97a9ec2d..251bc2e5 100644 --- a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt +++ b/src/main/kotlin/com/looker/droidify/service/DownloadService.kt @@ -7,7 +7,11 @@ import android.content.Intent import android.net.Uri import android.view.ContextThemeWrapper import androidx.core.app.NotificationCompat -import com.looker.droidify.* +import com.looker.droidify.BuildConfig +import com.looker.droidify.NOTIFICATION_CHANNEL_DOWNLOADING +import com.looker.droidify.NOTIFICATION_ID_DOWNLOADING +import com.looker.droidify.NOTIFICATION_ID_SYNCING +import com.looker.droidify.R import com.looker.droidify.content.Cache import com.looker.droidify.database.entity.Release import com.looker.droidify.database.entity.Repository diff --git a/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/src/main/kotlin/com/looker/droidify/service/SyncService.kt index fc6b4ff3..237276b5 100644 --- a/src/main/kotlin/com/looker/droidify/service/SyncService.kt +++ b/src/main/kotlin/com/looker/droidify/service/SyncService.kt @@ -12,7 +12,12 @@ import android.text.style.ForegroundColorSpan import android.view.ContextThemeWrapper import androidx.core.app.NotificationCompat import androidx.fragment.app.Fragment -import com.looker.droidify.* +import com.looker.droidify.BuildConfig +import com.looker.droidify.NOTIFICATION_CHANNEL_SYNCING +import com.looker.droidify.NOTIFICATION_CHANNEL_UPDATES +import com.looker.droidify.NOTIFICATION_ID_SYNCING +import com.looker.droidify.NOTIFICATION_ID_UPDATES +import com.looker.droidify.R import com.looker.droidify.content.Preferences import com.looker.droidify.database.DatabaseX import com.looker.droidify.database.entity.Repository @@ -30,8 +35,16 @@ import com.looker.droidify.utility.extension.text.formatSize import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.disposables.Disposable import io.reactivex.rxjava3.schedulers.Schedulers -import kotlinx.coroutines.* -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.asSharedFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch import java.lang.ref.WeakReference import kotlin.math.roundToInt diff --git a/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt index 683dc030..bae8f467 100644 --- a/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt @@ -15,7 +15,12 @@ import android.net.Uri import android.os.Parcel import android.text.SpannableStringBuilder import android.text.method.LinkMovementMethod -import android.text.style.* +import android.text.style.BulletSpan +import android.text.style.ClickableSpan +import android.text.style.RelativeSizeSpan +import android.text.style.ReplacementSpan +import android.text.style.TypefaceSpan +import android.text.style.URLSpan import android.text.util.Linkify import android.view.Gravity import android.view.MotionEvent @@ -54,7 +59,12 @@ import com.looker.droidify.utility.KParcelable import com.looker.droidify.utility.PackageItemResolver import com.looker.droidify.utility.Utils import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.resources.* +import com.looker.droidify.utility.extension.resources.TypefaceExtra +import com.looker.droidify.utility.extension.resources.getColorFromAttr +import com.looker.droidify.utility.extension.resources.getDrawableCompat +import com.looker.droidify.utility.extension.resources.inflate +import com.looker.droidify.utility.extension.resources.setTextSizeScaled +import com.looker.droidify.utility.extension.resources.sizeScaled import com.looker.droidify.utility.extension.text.formatSize import com.looker.droidify.utility.extension.text.nullIfEmpty import com.looker.droidify.utility.extension.text.trimAfter