Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import com.android.build.gradle.BaseExtension
import com.flipperdevices.buildlogic.ApkConfig
import com.flipperdevices.buildlogic.ApkConfig.IS_SENTRY_PUBLISH
import gradle.kotlin.dsl.accessors._7a4d13f58a317316fed3ebe1f66c7d31.compose
import gradle.kotlin.dsl.accessors._7a4d13f58a317316fed3ebe1f66c7d31.kotlin
import gradle.kotlin.dsl.accessors._7a4d13f58a317316fed3ebe1f66c7d31.sourceSets
import io.sentry.android.gradle.extensions.SentryPluginExtension
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ import net.lingala.zip4j.model.enums.CompressionLevel
import net.lingala.zip4j.model.enums.CompressionMethod
import java.io.File
import javax.inject.Inject
import kotlin.time.Duration.Companion.minutes
import kotlin.time.DurationUnit
import kotlin.time.toDuration

private val SENTRY_TIMEOUT = 5.minutes
private val SENTRY_TIMEOUT = 5.toDuration(DurationUnit.MINUTES)

class Shake2ReportViewModel @Inject constructor(
private val application: Application,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,5 @@ commonTestDependencies {
implementation(projects.components.core.test)
implementation(libs.junit)
implementation(libs.kotlin.coroutines.test)
implementation(libs.roboelectric)
implementation(libs.ktx.testing)
implementation(libs.mockk)
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import com.flipperdevices.bridge.connection.feature.protocolversion.model.Flippe
import com.flipperdevices.core.data.SemVer
import kotlinx.coroutines.flow.StateFlow
import kotlin.time.Duration
import kotlin.time.Duration.Companion.seconds
import kotlin.time.DurationUnit
import kotlin.time.toDuration

private val VERSION_WAITING_TIMEOUT = 30.seconds
private val VERSION_WAITING_TIMEOUT = 30.toDuration(DurationUnit.SECONDS)

interface FVersionFeatureApi : FDeviceFeatureApi {
fun getVersionInformationFlow(): StateFlow<SemVer?>
Expand Down
7 changes: 7 additions & 0 deletions components/bridge/connection/pbutils/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.gradle.kotlin.dsl.withType

plugins {
id("flipper.multiplatform")
id("flipper.multiplatform-dependencies")
Expand All @@ -19,3 +22,7 @@ commonDependencies {
implementation(projects.components.core.ktx)
implementation(libs.okio)
}

tasks.withType<Detekt> {
enabled = false
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ androidDependencies {
}

dependencies {
commonKsp(libs.dagger.compiler)
ksp(libs.dagger.compiler)
}
15 changes: 5 additions & 10 deletions components/bridge/connection/sample/desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ plugins {
}

kotlin {
jvm("desktop") {
withJava()
}
jvm("desktop")

sourceSets {
val desktopMain by getting
desktopMain.dependencies {
implementation(compose.desktop.currentOs)
implementation(libs.dagger)
implementation(libs.anvil.utils.annotations)
}
}
}
Expand All @@ -46,7 +46,7 @@ compose.desktop {
val patch = semVers.getOrNull(3)
?: semVers.getOrNull(2)
?: 0
"${major}.${minor}.${patch}"
"$major.$minor.$patch"
}
}
}
Expand All @@ -65,12 +65,7 @@ anvil {
)
}

dependencies {
"implementation"(libs.dagger)
"implementation"(libs.anvil.utils.annotations)
"commonKsp"(libs.anvil.utils.compiler)
}

dependencies {
ksp(libs.dagger.compiler)
ksp(libs.anvil.utils.compiler)
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
import javax.inject.Inject
import kotlin.time.Duration.Companion.seconds
import kotlin.time.DurationUnit
import kotlin.time.toDuration

private val FLIPPER_NAME_REGEXP = "Flipper ([A-Za-z]+)".toRegex()

Expand All @@ -36,7 +37,7 @@ class USBSearchViewModel @Inject constructor(
flow {
while (true) {
emit(Unit)
delay(1.seconds)
delay(1.toDuration(DurationUnit.SECONDS))
}
},
persistedStorage.getAllDevices()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class RoomDatabaseModule {
AppDatabase::class.java,
DATABASE_NAME
).addTypeConverter(databaseKeyContentConverter)
.fallbackToDestructiveMigration()
.fallbackToDestructiveMigration(true)
.build()
}

Expand Down
6 changes: 6 additions & 0 deletions components/core/build-konfig/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import com.flipperdevices.buildlogic.ApkConfig
import com.flipperdevices.buildlogic.ApkConfig.CURRENT_FLAVOR_TYPE
import io.gitlab.arturbosch.detekt.Detekt
import org.gradle.kotlin.dsl.withType

plugins {
id("flipper.multiplatform")
Expand Down Expand Up @@ -33,3 +35,7 @@ buildConfig {
ApkConfig.ROBOELECTRIC_SDK_VERSION
)
}

tasks.withType<Detekt> {
enabled = false
}
1 change: 0 additions & 1 deletion components/core/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ commonDependencies {
commonTestDependencies {
implementation(libs.junit)
implementation(libs.mockito.kotlin)
implementation(libs.ktx.testing)
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("MatchingDeclarationName")

package com.flipperdevices.core.log

@Suppress("PropertyName")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ package com.flipperdevices.core.markdown
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextLinkStyles
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.unit.dp
import com.flipperdevices.core.ui.theme.LocalPallet
import com.flipperdevices.core.ui.theme.LocalTypography
import com.mikepenz.markdown.compose.Markdown
import com.mikepenz.markdown.model.DefaultMarkdownColors
import com.mikepenz.markdown.model.DefaultMarkdownTypography
import com.mikepenz.markdown.model.MarkdownColors
import com.mikepenz.markdown.model.MarkdownPadding
import com.mikepenz.markdown.model.MarkdownTypography
Expand Down Expand Up @@ -49,7 +51,9 @@ fun markdownColors(
codeBackground = backgroundCode,
inlineCodeBackground = backgroundCode,
dividerColor = dividerColor,
inlineCodeText = text
inlineCodeText = text,
tableText = text,
tableBackground = backgroundCode,
)

@Composable
Expand All @@ -71,21 +75,27 @@ fun markdownTypography(
quoteStyle: TextStyle = LocalTypography.current.bodyR14,
textStyle: TextStyle = LocalTypography.current.bodyR14
): MarkdownTypography {
return object : MarkdownTypography {
override val bullet = bulletStyle.merge(additionalTextStyle)
override val code = codeStyle.merge(additionalTextStyle)
override val h1 = h1Style.merge(additionalTextStyle)
override val h2 = h2Style.merge(additionalTextStyle)
override val h3 = h3Style.merge(additionalTextStyle)
override val h4 = h4Style.merge(additionalTextStyle)
override val h5 = h5Style.merge(additionalTextStyle)
override val h6 = h6Style.merge(additionalTextStyle)
override val inlineCode = inlineCode.merge(additionalTextStyle)
override val link = linkStyle.merge(additionalTextStyle)
override val list = listStyle.merge(additionalTextStyle)
override val ordered = orderedStyle.merge(additionalTextStyle)
override val paragraph = paragraphStyle.merge(additionalTextStyle)
override val quote = quoteStyle.merge(additionalTextStyle)
override val text = textStyle.merge(additionalTextStyle)
}
return DefaultMarkdownTypography(
bullet = bulletStyle.merge(additionalTextStyle),
code = codeStyle.merge(additionalTextStyle),
h1 = h1Style.merge(additionalTextStyle),
h2 = h2Style.merge(additionalTextStyle),
h3 = h3Style.merge(additionalTextStyle),
h4 = h4Style.merge(additionalTextStyle),
h5 = h5Style.merge(additionalTextStyle),
h6 = h6Style.merge(additionalTextStyle),
inlineCode = inlineCode.merge(additionalTextStyle),
link = linkStyle.merge(additionalTextStyle),
list = listStyle.merge(additionalTextStyle),
ordered = orderedStyle.merge(additionalTextStyle),
paragraph = paragraphStyle.merge(additionalTextStyle),
quote = quoteStyle.merge(additionalTextStyle),
text = textStyle.merge(additionalTextStyle),
textLink = TextLinkStyles(
style = textStyle.merge(additionalTextStyle).copy(
textDecoration = TextDecoration.Underline,
).toSpanStyle()
),
table = textStyle.merge(additionalTextStyle)
)
}
7 changes: 7 additions & 0 deletions components/core/preference/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.gradle.kotlin.dsl.withType

plugins {
id("flipper.multiplatform")
id("flipper.multiplatform-dependencies")
Expand All @@ -14,6 +17,10 @@ commonDependencies {
api(libs.datastore)
}

tasks.withType<Detekt> {
enabled = false
}

wire {
kotlin {
enumMode = "sealed_class"
Expand Down
1 change: 1 addition & 0 deletions components/core/ui/hexkeyboard/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ commonDependencies {

// Compose
implementation(libs.compose.constraint)
implementation(libs.compose.material.icons.core)
}
3 changes: 2 additions & 1 deletion components/core/ui/ktx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ commonDependencies {
}

androidDependencies {

implementation(libs.image.lottie)

implementation(libs.compose.material.icons.core)
}
3 changes: 3 additions & 0 deletions components/deeplink/api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ commonDependencies {
implementation(libs.kotlin.serialization.json)

implementation(libs.annotations)
}

androidDependencies {
implementation(libs.appcompat)
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.flipperdevices.faphub.dao.network.network.utils

import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toInstant
Expand All @@ -11,6 +10,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
import kotlin.time.Instant

object DateSerializer : KSerializer<LocalDateTime> {
override val descriptor: SerialDescriptor =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
import com.flipperdevices.core.ui.ktx.OrangeAppBar
import com.flipperdevices.core.ui.ktx.clickableRipple
import com.flipperdevices.core.ui.ktx.elements.SwipeRefresh
Expand Down Expand Up @@ -175,8 +174,7 @@ private fun ComposableFapScreenBar(
putExtra(Intent.EXTRA_TEXT, url)
type = "text/plain"
}
ContextCompat.startActivity(
context,
context.startActivity(
Intent.createChooser(intent, shareTitle),
null
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ internal fun ComposableScreenshotsPager(
.onEach { event ->
when (event) {
is ImageSelectViewModel.Event.ImageSelected -> {
zoomState.reset().join()
zoomState.reset()
pagerState.scrollToPage(event.index)
}
}
Expand Down
1 change: 0 additions & 1 deletion components/filemngr/editor/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,4 @@ commonDependencies {
commonTestDependencies {
// Testing
implementation(libs.junit)
implementation(libs.ktx.testing)
}
1 change: 0 additions & 1 deletion components/filemngr/listing/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,4 @@ commonDependencies {
commonTestDependencies {
implementation(projects.components.core.test)
implementation(libs.junit)
implementation(libs.ktx.testing)
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ import kotlinx.coroutines.job
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import okio.Path
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.DurationUnit
import kotlin.time.toDuration

private val DEBOUNCE_TIME = 1.toDuration(DurationUnit.SECONDS)

class SearchViewModel @AssistedInject constructor(
featureProvider: FFeatureProvider,
Expand Down Expand Up @@ -130,7 +133,7 @@ class SearchViewModel @AssistedInject constructor(
init {
combine(
flow = featureState,
flow2 = _searchState.debounceAfterFirst(timeout = 1000.milliseconds),
flow2 = _searchState.debounceAfterFirst(DEBOUNCE_TIME),
transform = { featureState, _ ->
when (featureState) {
FFeatureStatus.NotFound -> _state.emit(State.Unsupported)
Expand Down
1 change: 0 additions & 1 deletion components/filemngr/upload/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,4 @@ commonDependencies {
commonTestDependencies {
implementation(projects.components.core.test)
implementation(libs.junit)
implementation(libs.ktx.testing)
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ import kotlinx.coroutines.plus
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.withTimeout
import javax.inject.Inject
import kotlin.time.Duration.Companion.seconds
import kotlin.time.DurationUnit
import kotlin.time.toDuration

private val TIMEOUT = 10.seconds
private val TIMEOUT = 10.toDuration(DurationUnit.SECONDS)

class PairDeviceViewModel(
private val firstPairBleManagerFactory: FirstPairBleManager.Factory,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ import kotlinx.coroutines.SupervisorJob
import java.util.Stack
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration.Companion.seconds
import kotlin.time.DurationUnit
import kotlin.time.toDuration

private val TIMER_DELAY = 1.seconds
private val TIMER_DELAY = 1.toDuration(DurationUnit.SECONDS)

@Singleton
@ContributesBinding(AppGraph::class, InAppNotificationStorage::class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal fun RemoteGridComposableContent(
targetState = model,
modifier = modifier,
transitionSpec = { fadeIn().togetherWith(fadeOut()) },
contentKey = { model.contentKey }
contentKey = { it.contentKey }
) { animatedModel ->
when (animatedModel) {
is RemoteGridComponent.Model.Error -> {
Expand Down
Loading
Loading