mirror of
https://github.com/danilkinkin/buckwheat.git
synced 2025-12-31 04:13:02 +00:00
refactor: remove unused code
This commit is contained in:
parent
cd21e6ac20
commit
7f61d2f3e2
25 changed files with 5 additions and 98 deletions
|
|
@ -75,8 +75,7 @@ fun Analytics(
|
|||
LocalWindowInsets.current.calculateBottomPadding().coerceAtLeast(16.dp)
|
||||
|
||||
Surface(Modifier.height(IntrinsicSize.Min)) {
|
||||
Column(
|
||||
) {
|
||||
Column {
|
||||
if (!periodFinished) {
|
||||
MiddlePeriodAnalyticsHeader(
|
||||
onClose = onClose,
|
||||
|
|
|
|||
|
|
@ -3,12 +3,9 @@ package com.danilkinkin.buckwheat.base
|
|||
import androidx.activity.compose.PredictiveBackHandler
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.CornerSize
|
||||
|
|
@ -39,7 +36,6 @@ import com.danilkinkin.buckwheat.data.SystemBarState
|
|||
import com.danilkinkin.buckwheat.ui.isNightMode
|
||||
import com.danilkinkin.buckwheat.util.observeLiveData
|
||||
import com.danilkinkin.buckwheat.util.setSystemStyle
|
||||
import kotlinx.coroutines.flow.onCompletion
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlin.coroutines.cancellation.CancellationException
|
||||
import kotlin.math.roundToInt
|
||||
|
|
|
|||
|
|
@ -57,9 +57,6 @@ class ModalBottomSheetState(
|
|||
val isVisible: Boolean
|
||||
get() = currentValue != ModalBottomSheetValue.Hidden
|
||||
|
||||
private val hasHalfExpandedState: Boolean
|
||||
get() = anchors.values.contains(ModalBottomSheetValue.HalfExpanded)
|
||||
|
||||
init {
|
||||
if (isSkipHalfExpanded) {
|
||||
require(initialValue != ModalBottomSheetValue.HalfExpanded) {
|
||||
|
|
@ -82,7 +79,7 @@ class ModalBottomSheetState(
|
|||
this.render = true
|
||||
}
|
||||
|
||||
suspend fun show() {
|
||||
fun show() {
|
||||
show(emptyMap())
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,11 @@ import androidx.compose.foundation.gestures.Orientation
|
|||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.offset
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
|
|
|
|||
|
|
@ -45,9 +45,7 @@ class BalloonController {
|
|||
tooltipId: Int,
|
||||
) {
|
||||
showedBalloons.value = showedBalloons.value?.minus(tooltipId)
|
||||
balloons.value!![tooltipId]?.let {
|
||||
it.onClose()
|
||||
}
|
||||
balloons.value!![tooltipId]?.onClose()
|
||||
}
|
||||
|
||||
fun destroy(
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
|
|||
import androidx.room.*
|
||||
import com.danilkinkin.buckwheat.data.entities.Transaction
|
||||
import com.danilkinkin.buckwheat.data.entities.TransactionType
|
||||
import java.util.*
|
||||
|
||||
@Dao
|
||||
interface TransactionDao {
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ class EditorViewModel @Inject constructor(
|
|||
.stripTrailingZeros()
|
||||
.toPlainString()
|
||||
|
||||
if (formatSpent == "0") return false
|
||||
|
||||
return true
|
||||
return formatSpent != "0"
|
||||
}
|
||||
}
|
||||
|
|
@ -44,30 +44,6 @@ fun calcMaxFont(
|
|||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun calcFontHeight(
|
||||
text: String = "SAMPLE 1234567890",
|
||||
style: TextStyle = MaterialTheme.typography.displayLarge,
|
||||
): Dp {
|
||||
val intrinsics = ParagraphIntrinsics(
|
||||
text = text,
|
||||
style = style,
|
||||
density = LocalDensity.current,
|
||||
fontFamilyResolver = createFontFamilyResolver(LocalContext.current)
|
||||
)
|
||||
|
||||
val paragraph = Paragraph(
|
||||
paragraphIntrinsics = intrinsics,
|
||||
constraints = Constraints(maxWidth = ceil(1000f).toInt()),
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Clip
|
||||
)
|
||||
|
||||
return with(LocalDensity.current) {
|
||||
paragraph.firstBaseline.toDp()
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun calcAdaptiveFont(
|
||||
height: Float,
|
||||
|
|
|
|||
|
|
@ -19,13 +19,10 @@ import androidx.compose.foundation.layout.Box
|
|||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.danilkinkin.buckwheat.editor.tagging
|
||||
|
||||
import android.util.Log
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.core.EaseInOutQuad
|
||||
import androidx.compose.animation.core.tween
|
||||
|
|
@ -8,24 +7,16 @@ import androidx.compose.animation.fadeIn
|
|||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.slideInHorizontally
|
||||
import androidx.compose.animation.slideOutHorizontally
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.gestures.FlingBehavior
|
||||
import androidx.compose.foundation.gestures.ScrollScope
|
||||
import androidx.compose.foundation.gestures.scrollable
|
||||
import androidx.compose.foundation.horizontalScroll
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.lazy.LazyRow
|
||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.livedata.observeAsState
|
||||
|
|
@ -34,20 +25,13 @@ import androidx.compose.runtime.remember
|
|||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.geometry.Offset
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
|
||||
import androidx.compose.ui.input.nestedscroll.NestedScrollSource
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.unit.Velocity
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.zIndex
|
||||
import androidx.hilt.navigation.compose.hiltViewModel
|
||||
import com.danilkinkin.buckwheat.data.SpendsViewModel
|
||||
import com.danilkinkin.buckwheat.editor.EditStage
|
||||
import com.danilkinkin.buckwheat.editor.EditorViewModel
|
||||
import com.danilkinkin.buckwheat.editor.FocusController
|
||||
import com.danilkinkin.buckwheat.editor.calcFontHeight
|
||||
import com.danilkinkin.buckwheat.util.observeLiveData
|
||||
|
||||
@Composable
|
||||
|
|
|
|||
|
|
@ -3,12 +3,9 @@ package com.danilkinkin.buckwheat.editor.toolbar.restBudgetPill
|
|||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.material3.LocalContentColor
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
|
|
|
|||
|
|
@ -3,12 +3,9 @@ package com.danilkinkin.buckwheat.editor.toolbar.restBudgetPill
|
|||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.material3.LocalContentColor
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.danilkinkin.buckwheat.editor.toolbar.restBudgetPill
|
||||
|
||||
import android.content.res.Configuration.UI_MODE_NIGHT_YES
|
||||
import androidx.compose.animation.*
|
||||
import androidx.compose.animation.core.*
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
|
|
|
|||
|
|
@ -6,10 +6,8 @@ import androidx.lifecycle.SavedStateHandle
|
|||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.danilkinkin.buckwheat.di.SpendsRepository
|
||||
import com.danilkinkin.buckwheat.util.isZero
|
||||
import com.danilkinkin.buckwheat.util.numberFormat
|
||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.launch
|
||||
import java.math.BigDecimal
|
||||
|
|
|
|||
|
|
@ -150,9 +150,7 @@ data class AnimatedItem<T>(
|
|||
|
||||
other as AnimatedItem<*>
|
||||
|
||||
if (item != other.item) return false
|
||||
|
||||
return true
|
||||
return item == other.item
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,15 +6,12 @@ import androidx.compose.foundation.layout.Column
|
|||
import androidx.compose.foundation.layout.IntrinsicSize
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Card
|
||||
|
|
|
|||
|
|
@ -3,11 +3,8 @@ package com.danilkinkin.buckwheat.settings
|
|||
import android.content.res.Configuration.UI_MODE_NIGHT_YES
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
|
|
|
|||
|
|
@ -2,11 +2,8 @@ package com.danilkinkin.buckwheat.settings
|
|||
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
|
|
|
|||
|
|
@ -7,13 +7,10 @@ import androidx.compose.foundation.clickable
|
|||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.offset
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.LocalContentColor
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.danilkinkin.buckwheat.util
|
||||
|
||||
import android.content.Context
|
||||
import android.util.Log
|
||||
import com.danilkinkin.buckwheat.R
|
||||
import com.danilkinkin.buckwheat.data.ExtendCurrency
|
||||
import java.math.BigDecimal
|
||||
|
|
|
|||
|
|
@ -2,11 +2,8 @@ package com.danilkinkin.buckwheat.wallet
|
|||
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.LocalContentColor
|
||||
|
|
|
|||
|
|
@ -2,11 +2,8 @@ package com.danilkinkin.buckwheat.wallet
|
|||
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.asPaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.LocalContentColor
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import android.content.Context
|
|||
import android.content.Intent
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.compositionLocalOf
|
||||
import androidx.compose.runtime.staticCompositionLocalOf
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.datastore.preferences.core.floatPreferencesKey
|
||||
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ import com.danilkinkin.buckwheat.widget.CanvasText
|
|||
import com.danilkinkin.buckwheat.widget.LocalAccentColor
|
||||
import com.danilkinkin.buckwheat.widget.LocalContentColor
|
||||
import com.danilkinkin.buckwheat.widget.WidgetReceiver
|
||||
import com.danilkinkin.buckwheat.widget.extend.ExtendWidgetContent
|
||||
|
||||
@Composable
|
||||
@GlanceComposable
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
import java.net.URI
|
||||
|
||||
pluginManagement {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue