Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update libraries #6244

Merged
merged 1 commit into from
Jun 26, 2023
Merged

Update libraries #6244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"

//Splash screen
implementation "androidx.core:core-splashscreen:1.0.0"
implementation "androidx.core:core-splashscreen:1.0.1"

//AppWidgets
implementation 'androidx.glance:glance-appwidget:1.0.0-alpha05'
implementation 'androidx.glance:glance-appwidget:1.0.0-beta01'

// Room
def room_version = '2.5.1'
Expand Down
26 changes: 24 additions & 2 deletions app/src/main/java/io/horizontalsystems/bankwallet/widgets/AppWidgetTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,34 @@ import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.sp
import androidx.glance.appwidget.unit.ColorProvider
import androidx.glance.color.ColorProvider
import androidx.glance.text.FontWeight
import androidx.glance.text.TextAlign
import androidx.glance.text.TextStyle
import androidx.glance.unit.ColorProvider
import io.horizontalsystems.bankwallet.ui.compose.*
import io.horizontalsystems.bankwallet.ui.compose.Black50
import io.horizontalsystems.bankwallet.ui.compose.Dark
import io.horizontalsystems.bankwallet.ui.compose.Green50
import io.horizontalsystems.bankwallet.ui.compose.GreenD
import io.horizontalsystems.bankwallet.ui.compose.GreenL
import io.horizontalsystems.bankwallet.ui.compose.Grey
import io.horizontalsystems.bankwallet.ui.compose.Grey50
import io.horizontalsystems.bankwallet.ui.compose.Light
import io.horizontalsystems.bankwallet.ui.compose.LightGrey
import io.horizontalsystems.bankwallet.ui.compose.Red20
import io.horizontalsystems.bankwallet.ui.compose.Red50
import io.horizontalsystems.bankwallet.ui.compose.RedD
import io.horizontalsystems.bankwallet.ui.compose.RedL
import io.horizontalsystems.bankwallet.ui.compose.Steel10
import io.horizontalsystems.bankwallet.ui.compose.Steel20
import io.horizontalsystems.bankwallet.ui.compose.SteelDark
import io.horizontalsystems.bankwallet.ui.compose.SteelLight
import io.horizontalsystems.bankwallet.ui.compose.Yellow20
import io.horizontalsystems.bankwallet.ui.compose.Yellow50
import io.horizontalsystems.bankwallet.ui.compose.YellowD
import io.horizontalsystems.bankwallet.ui.compose.YellowL
import io.horizontalsystems.bankwallet.ui.compose.darkPalette
import io.horizontalsystems.bankwallet.ui.compose.lightPalette

object AppWidgetTheme {
val colors: ColorProviders
Expand Down
34 changes: 29 additions & 5 deletions app/src/main/java/io/horizontalsystems/bankwallet/widgets/MarketWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.core.net.toUri
import androidx.glance.*
import androidx.glance.GlanceId
import androidx.glance.GlanceModifier
import androidx.glance.Image
import androidx.glance.ImageProvider
import androidx.glance.action.ActionParameters
import androidx.glance.action.clickable
import androidx.glance.appwidget.CircularProgressIndicator
Expand All @@ -18,9 +21,24 @@ import androidx.glance.appwidget.SizeMode
import androidx.glance.appwidget.action.ActionCallback
import androidx.glance.appwidget.action.actionRunCallback
import androidx.glance.appwidget.action.actionStartActivity
import androidx.glance.appwidget.provideContent
import androidx.glance.appwidget.state.updateAppWidgetState
import androidx.glance.layout.*
import androidx.glance.background
import androidx.glance.currentState
import androidx.glance.layout.Alignment
import androidx.glance.layout.Alignment.Vertical.Companion.CenterVertically
import androidx.glance.layout.Box
import androidx.glance.layout.Column
import androidx.glance.layout.ContentScale
import androidx.glance.layout.Row
import androidx.glance.layout.Spacer
import androidx.glance.layout.fillMaxHeight
import androidx.glance.layout.fillMaxSize
import androidx.glance.layout.fillMaxWidth
import androidx.glance.layout.height
import androidx.glance.layout.padding
import androidx.glance.layout.size
import androidx.glance.layout.width
import androidx.glance.text.FontWeight
import androidx.glance.text.Text
import androidx.glance.text.TextAlign
Expand All @@ -30,7 +48,8 @@ import io.horizontalsystems.bankwallet.core.App
import io.horizontalsystems.bankwallet.modules.market.Value
import java.math.BigDecimal
import java.text.SimpleDateFormat
import java.util.*
import java.util.Date
import java.util.Locale

class MarketWidget : GlanceAppWidget() {

Expand All @@ -40,16 +59,21 @@ class MarketWidget : GlanceAppWidget() {
private val largeMode = DpSize(260.dp, 280.dp)
}

override suspend fun provideGlance(context: Context, id: GlanceId) {
provideContent {
content(context, id)
}
}

override val sizeMode: SizeMode = SizeMode.Responsive(
setOf(smallMode, mediumMode, largeMode)
)

override val stateDefinition = MarketWidgetStateDefinition

@Composable
override fun Content() {
private fun content(context: Context, glanceId: GlanceId) {
val state = currentState<MarketWidgetState>()
val context = LocalContext.current

AppWidgetTheme {
Column(
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ buildscript {

compose_version = '1.3.3'
kotlin_version = '1.8.0'
material_version = "1.8.0"
material_version = "1.9.0"
appcompat_version = "1.6.1"
constraint_version = "2.1.4"
core_ktx_version = "1.9.0"
fragment_ktx_version = "1.5.5"
navigation_ktx_version = "2.5.3"
core_ktx_version = "1.10.1"
fragment_ktx_version = "1.6.0"
navigation_ktx_version = "2.6.0"
rxjava_version = "2.2.19"
biometric_version = "1.1.0"
junit_version = "4.13.2"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/horizontalsystems/core/Extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fun View.hideKeyboard(context: Context) {
fun NavController.setNavigationResult(key: String, bundle: Bundle, destinationId: Int? = null) {
val backStackEntry = when (destinationId) {
null -> previousBackStackEntry
else -> backQueue.findLast { it.destination.id == destinationId }
else -> currentBackStack.value.findLast { it.destination.id == destinationId }
}

backStackEntry?.savedStateHandle?.set(key, bundle)
Expand Down