From 82c366a9a47c24a84d717bf1dabbb87300b46333 Mon Sep 17 00:00:00 2001 From: daichi-matsumoto Date: Sat, 16 Dec 2023 02:22:59 +0900 Subject: [PATCH] run detekt --- app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt | 3 ++- .../fanbox/core/datastore/PixiViewPreferencesDataStore.kt | 2 +- .../java/caios/android/fanbox/core/logs/CommonPayload.kt | 2 +- .../android/fanbox/core/logs/category/NavigationLog.kt | 4 ++-- .../android/fanbox/core/logs/puree/PixiViewLogFilter.kt | 2 +- .../android/fanbox/core/logs/puree/PixiViewLogOutput.kt | 2 +- .../android/fanbox/core/logs/puree/PureeConfigurator.kt | 6 +++--- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt b/app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt index a74915e5..8b5ddcfb 100644 --- a/app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt +++ b/app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt @@ -84,7 +84,8 @@ private fun IdleScreen( navigationType: PixiViewNavigationType, modifier: Modifier = Modifier, ) { - val bottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden, skipHalfExpanded = true) + val bottomSheetState = + rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden, skipHalfExpanded = true) val bottomSheetNavigator = remember { BottomSheetNavigator(bottomSheetState) } PixiViewNavHost( diff --git a/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PixiViewPreferencesDataStore.kt b/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PixiViewPreferencesDataStore.kt index c9808f05..abe593f3 100644 --- a/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PixiViewPreferencesDataStore.kt +++ b/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PixiViewPreferencesDataStore.kt @@ -40,7 +40,7 @@ class PixiViewPreferencesDataStore( isGridMode = if (it.hasIsGridMode()) it.isGridMode else false, isFollowTabDefaultHome = if (it.hasIsFollowTabDefaultHome()) it.isFollowTabDefaultHome else false, isHideAdultContents = if (it.hasIsHideAdultContents()) it.isHideAdultContents else true, - isOverrideAdultContents = if (it.hasIsOverrideAdultContents()) it.isOverrideAdultContents else false, + isOverrideAdultContents = if (it.hasIsOverrideAdultContents()) it.isOverrideAdultContents else true, isPlusMode = if (it.hasIsPlusMode()) it.isPlusMode else false, isAgreedPrivacyPolicy = if (it.hasIsAgreedPrivacyPolicy()) it.isAgreedPrivacyPolicy else false, isAgreedTermsOfService = if (it.hasIsAgreedTermsOfService()) it.isAgreedTermsOfService else false, diff --git a/core/logs/src/main/java/caios/android/fanbox/core/logs/CommonPayload.kt b/core/logs/src/main/java/caios/android/fanbox/core/logs/CommonPayload.kt index 04669d31..8c379268 100644 --- a/core/logs/src/main/java/caios/android/fanbox/core/logs/CommonPayload.kt +++ b/core/logs/src/main/java/caios/android/fanbox/core/logs/CommonPayload.kt @@ -25,7 +25,7 @@ data class CommonPayload( // アプリケーション VersionName (21.27.0.13 のような文字列) val applicationVersionName: String, // タイムゾーン(Asia/Tokyoなど) - val timeZone: String + val timeZone: String, ) { fun applyToJsonObject(jsonLog: JSONObject) = jsonLog.apply { put("pixiview_id", pixiviewId) diff --git a/core/logs/src/main/java/caios/android/fanbox/core/logs/category/NavigationLog.kt b/core/logs/src/main/java/caios/android/fanbox/core/logs/category/NavigationLog.kt index 13301071..1ea2c9df 100644 --- a/core/logs/src/main/java/caios/android/fanbox/core/logs/category/NavigationLog.kt +++ b/core/logs/src/main/java/caios/android/fanbox/core/logs/category/NavigationLog.kt @@ -7,7 +7,7 @@ import kotlinx.serialization.json.put // This class is automatically generated by generate-log-classes. sealed class NavigationLog : LogCategory { class Navigate internal constructor( - private val screenRoute: String + private val screenRoute: String, ) : NavigationLog() { override val properties: JsonObject = buildJsonObject { put("event_category", "navigation") @@ -19,7 +19,7 @@ sealed class NavigationLog : LogCategory { companion object { // 画面遷移したときのログ fun navigate( - screenRoute: String + screenRoute: String, ) = Navigate(screenRoute) } } diff --git a/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogFilter.kt b/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogFilter.kt index feac0f2b..38a87af0 100644 --- a/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogFilter.kt +++ b/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogFilter.kt @@ -26,7 +26,7 @@ class PixiViewLogFilter( applicationVariant = BuildConfig.BUILD_TYPE, applicationVersionCode = pixiViewConfig.versionCode.toLong(), applicationVersionName = pixiViewConfig.versionName, - timeZone = ZoneId.systemDefault().id + timeZone = ZoneId.systemDefault().id, ) return commonPayload.applyToJsonObject(log) diff --git a/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogOutput.kt b/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogOutput.kt index c348c00e..8b7bc833 100644 --- a/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogOutput.kt +++ b/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PixiViewLogOutput.kt @@ -5,7 +5,7 @@ import org.json.JSONObject import timber.log.Timber import java.time.Duration -class PixiViewLogOutput: PureeBufferedOutput("pixiview_activity_log") { +class PixiViewLogOutput : PureeBufferedOutput("pixiview_activity_log") { override val flushInterval: Duration = Duration.ofSeconds(15) diff --git a/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PureeConfigurator.kt b/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PureeConfigurator.kt index 22c10aa5..6e25f735 100644 --- a/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PureeConfigurator.kt +++ b/core/logs/src/main/java/caios/android/fanbox/core/logs/puree/PureeConfigurator.kt @@ -40,15 +40,15 @@ object PureeConfigurator { return PureeLogger.Builder( lifecycle = ProcessLifecycleOwner.get().lifecycle, logSerializer = PureeKotlinSerializer(formatter), - logStore = DbPureeLogStore(context, "puree-kotlin.db") + logStore = DbPureeLogStore(context, "puree-kotlin.db"), ) .filter( PixiViewLogFilter(pixiViewConfig, userData, userAgent = "PixiView"), - PixiViewActivityLog::class.java + PixiViewActivityLog::class.java, ) .output( PixiViewLogOutput(), - PixiViewActivityLog::class.java + PixiViewActivityLog::class.java, ) .build() }