Compare commits
17 Commits
a1b7569ef0
...
1.1
Author | SHA1 | Date | |
---|---|---|---|
0494efc2ad | |||
09871e8727 | |||
d220a03a89 | |||
95b2c1e70b | |||
4005a39696
|
|||
407a5d32a5 | |||
81ab379e0e
|
|||
5a4d30b9f8
|
|||
5c92f74ceb
|
|||
0906b95273
|
|||
4c9c7a3aa4 | |||
07ad6cb59d | |||
fcd27175ac | |||
a9c5282bdc | |||
52386c1987 | |||
fb59407f8b | |||
1261b80346 |
@ -3,12 +3,11 @@ run-name: ${{ gitea.actor }} is building an Android application
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- pipeline-test
|
||||
|
||||
jobs:
|
||||
Build:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Checkout the repo
|
||||
uses: actions/checkout@v4
|
||||
|
40
.gitea/workflows/debug.yaml
Normal file
40
.gitea/workflows/debug.yaml
Normal file
@ -0,0 +1,40 @@
|
||||
name: Gitea Android Builder
|
||||
run-name: ${{ gitea.actor }} is building an Android application
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "*"
|
||||
|
||||
jobs:
|
||||
Build:
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Checkout the repo
|
||||
uses: actions/checkout@v4
|
||||
- name: Set up JDK 23
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '23'
|
||||
distribution: 'temurin'
|
||||
- name: Set up Android SDK
|
||||
uses: android-actions/setup-android@v3
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Cache Gradle packages
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches
|
||||
~/.gradle/wrapper
|
||||
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
||||
- name: Build with Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
with:
|
||||
arguments: assembleDebug
|
||||
- name: Upload .apk Artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: android-app-apk
|
||||
path: app/build/outputs/apk/debug/*.apk
|
||||
- name: Status
|
||||
run: echo "This job's status is ${{ job.status }}."
|
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,12 +1,7 @@
|
||||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
/.idea/workspace.xml
|
||||
/.idea/navEditor.xml
|
||||
/.idea/assetWizardSettings.xml
|
||||
/.idea
|
||||
.DS_Store
|
||||
/build
|
||||
/captures
|
||||
|
1
.idea/misc.xml
generated
1
.idea/misc.xml
generated
@ -1,4 +1,3 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
|
||||
|
@ -61,5 +61,6 @@ dependencies {
|
||||
implementation(libs.converter.gson)
|
||||
implementation(libs.kotlinx.coroutines.android)
|
||||
implementation(libs.kotlinx.coroutines.core)
|
||||
implementation(libs.vico.compose.m3)
|
||||
|
||||
}
|
@ -4,8 +4,8 @@ import com.google.gson.annotations.SerializedName
|
||||
|
||||
// Данные
|
||||
data class GlobalResponse(
|
||||
@SerializedName("active_currencies") val activeCryptocurrencies: String,
|
||||
@SerializedName("total_market_cap_usd") val totalMarketCapUsd: String,
|
||||
@SerializedName("total_24h_volume_usd") val total24hVolumeUsd: String,
|
||||
@SerializedName("bitcoin_percentage_of_market_cap") val bitcoinPercentageOfMarketCap: String
|
||||
@SerializedName("active_currencies") val activeCryptocurrencies: String = "",
|
||||
@SerializedName("total_market_cap_usd") val totalMarketCapUsd: String = "",
|
||||
@SerializedName("total_24h_volume_usd") val total24hVolumeUsd: String = "",
|
||||
@SerializedName("bitcoin_percentage_of_market_cap") val bitcoinPercentageOfMarketCap: String = "0.0"
|
||||
)
|
@ -1,26 +1,85 @@
|
||||
package ru.vendetti.bitcoin_summarizer
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.magnifier
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Menu
|
||||
import androidx.compose.material.icons.filled.MoreVert
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.MediumTopAppBar
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.material3.rememberTopAppBarState
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableIntStateOf
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.patrykandpatrick.vico.compose.cartesian.CartesianChartHost
|
||||
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberAxisLabelComponent
|
||||
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberAxisLineComponent
|
||||
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottom
|
||||
import com.patrykandpatrick.vico.compose.cartesian.axis.rememberStart
|
||||
import com.patrykandpatrick.vico.compose.cartesian.layer.rememberLine
|
||||
import com.patrykandpatrick.vico.compose.cartesian.layer.rememberLineCartesianLayer
|
||||
import com.patrykandpatrick.vico.compose.cartesian.rememberCartesianChart
|
||||
import com.patrykandpatrick.vico.compose.cartesian.rememberVicoZoomState
|
||||
import com.patrykandpatrick.vico.compose.common.component.rememberLineComponent
|
||||
import com.patrykandpatrick.vico.compose.common.component.rememberTextComponent
|
||||
import com.patrykandpatrick.vico.compose.common.component.shapeComponent
|
||||
import com.patrykandpatrick.vico.compose.common.fill
|
||||
import com.patrykandpatrick.vico.compose.common.shape.rounded
|
||||
import com.patrykandpatrick.vico.compose.common.vicoTheme
|
||||
import com.patrykandpatrick.vico.core.cartesian.Zoom
|
||||
import com.patrykandpatrick.vico.core.cartesian.axis.BaseAxis
|
||||
import com.patrykandpatrick.vico.core.cartesian.axis.HorizontalAxis
|
||||
import com.patrykandpatrick.vico.core.cartesian.axis.VerticalAxis
|
||||
import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModelProducer
|
||||
import com.patrykandpatrick.vico.core.cartesian.data.CartesianLayerRangeProvider
|
||||
import com.patrykandpatrick.vico.core.cartesian.data.lineSeries
|
||||
import com.patrykandpatrick.vico.core.cartesian.decoration.HorizontalLine
|
||||
import com.patrykandpatrick.vico.core.cartesian.layer.LineCartesianLayer
|
||||
import com.patrykandpatrick.vico.core.common.Position
|
||||
import com.patrykandpatrick.vico.core.common.component.LineComponent
|
||||
import com.patrykandpatrick.vico.core.common.component.TextComponent
|
||||
import com.patrykandpatrick.vico.core.common.shape.CorneredShape
|
||||
import ru.vendetti.bitcoin_summarizer.ui.theme.BitcoinSummarizerTheme
|
||||
import ru.vendetti.bitcoin_summarizer.ui.theme.EnglishViolet
|
||||
import ru.vendetti.bitcoin_summarizer.ui.theme.Flame
|
||||
import ru.vendetti.bitcoin_summarizer.ui.theme.Green2
|
||||
import java.text.DateFormat
|
||||
import java.text.DecimalFormat
|
||||
import java.text.SimpleDateFormat
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.util.Date
|
||||
import kotlin.math.roundToInt
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@ -33,53 +92,218 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressLint("MutableCollectionMutableState", "SimpleDateFormat")
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Preview
|
||||
@Composable
|
||||
fun CryptoScreen() {
|
||||
// Создаем репозиторий для работы с API
|
||||
val cryptoRepository = remember { CryptoRepository(RetrofitClient.apiService) }
|
||||
|
||||
// Состояния для хранения результатов запросов
|
||||
var bitcoinTicker by remember { mutableStateOf("Загрузка Bitcoin Ticker...") }
|
||||
var globalData by remember { mutableStateOf("Загрузка глобальных данных...") }
|
||||
var fearGreedData by remember { mutableStateOf("Загрузка индекса страха и жадности...") }
|
||||
var bitcoinTicker by remember { mutableStateOf(TickerData()) }
|
||||
var globalData by remember { mutableStateOf(GlobalResponse()) }
|
||||
var fearGreedDataList by remember { mutableStateOf(ArrayList<FearAndGreedData>()) }
|
||||
|
||||
var fearGreedIndexDaysCount by remember { mutableIntStateOf(30) }
|
||||
|
||||
// Запускаем корутину для выполнения сетевых запросов
|
||||
LaunchedEffect(Unit) {
|
||||
LaunchedEffect(fearGreedIndexDaysCount) {
|
||||
// Запрос Bitcoin Ticker
|
||||
val tickerResponse = cryptoRepository.fetchBitcoinTicker()
|
||||
bitcoinTicker = tickerResponse?.joinToString(separator = "\n") { data ->
|
||||
"Название: ${data.name}, Цена: ${data.priceUsd}, Обновлено: ${data.lastUpdated}"
|
||||
} ?: "Ошибка загрузки Bitcoin Ticker"
|
||||
bitcoinTicker = tickerResponse!!.first()
|
||||
|
||||
// Запрос глобальных данных
|
||||
val globalResponse = cryptoRepository.fetchGlobalData()
|
||||
globalData = globalResponse?.let { data ->
|
||||
"Активных криптовалют: ${data.activeCryptocurrencies}\nРыночная капитализация: ${data.totalMarketCapUsd}\n24h Объем: ${data.total24hVolumeUsd}"
|
||||
} ?: "Ошибка загрузки глобальных данных"
|
||||
globalData = globalResponse!!
|
||||
|
||||
// Запрос индекса страха и жадности
|
||||
val fearResponse = cryptoRepository.fetchFearAndGreedData(30)
|
||||
fearGreedData = fearResponse?.dataList?.joinToString(separator = "\n") { data ->
|
||||
"Время: ${data.timestamp}, Значение: ${data.value}, Классификация: ${data.valueClassification}"
|
||||
} ?: "Ошибка загрузки данных страха и жадности"
|
||||
val fearResponse = cryptoRepository.fetchFearAndGreedData(fearGreedIndexDaysCount)
|
||||
fearGreedDataList = fearResponse?.dataList as ArrayList<FearAndGreedData>
|
||||
}
|
||||
|
||||
// Отображаем результаты в виде простой страницы
|
||||
Column(
|
||||
val modelProducer = remember { CartesianChartModelProducer() }
|
||||
|
||||
LaunchedEffect(fearGreedDataList) {
|
||||
modelProducer.runTransaction {
|
||||
var numberValues = Array<Int>(fearGreedDataList.count()) {
|
||||
index ->
|
||||
fearGreedDataList[fearGreedDataList.count() - index - 1]
|
||||
.value.toInt()
|
||||
}
|
||||
|
||||
if(numberValues.isEmpty())
|
||||
numberValues = Array<Int>(1) {0}
|
||||
|
||||
lineSeries { series(numberValues.toList()) }
|
||||
}
|
||||
}
|
||||
|
||||
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
|
||||
val zoomState = rememberVicoZoomState(
|
||||
zoomEnabled = false,
|
||||
initialZoom = Zoom.x(fearGreedIndexDaysCount.toDouble()))
|
||||
|
||||
// Отображаем результаты на странице
|
||||
Scaffold (
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(16.dp)
|
||||
.verticalScroll(rememberScrollState())
|
||||
) {
|
||||
Text(text = "Bitcoin Ticker Data", style = MaterialTheme.typography.bodyMedium)
|
||||
Text(text = bitcoinTicker)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
.nestedScroll(scrollBehavior.nestedScrollConnection),
|
||||
|
||||
Text(text = "Global Data", style = MaterialTheme.typography.bodyMedium)
|
||||
Text(text = globalData)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
topBar = {
|
||||
MediumTopAppBar(
|
||||
colors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = MaterialTheme.colorScheme.primary,
|
||||
scrolledContainerColor = MaterialTheme.colorScheme.primary,
|
||||
titleContentColor = MaterialTheme.colorScheme.onPrimary,
|
||||
navigationIconContentColor = MaterialTheme.colorScheme.onPrimary,
|
||||
actionIconContentColor = MaterialTheme.colorScheme.onPrimary,
|
||||
),
|
||||
title = {
|
||||
Text(
|
||||
"Bitcoin Summarizer!",
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis
|
||||
)
|
||||
},
|
||||
navigationIcon = {
|
||||
IconButton(onClick = {}) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.Menu,
|
||||
contentDescription = "Navigation hamburger menu"
|
||||
)
|
||||
}
|
||||
},
|
||||
actions = {
|
||||
IconButton(onClick = {}) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.MoreVert,
|
||||
contentDescription = "Actions"
|
||||
)
|
||||
}
|
||||
},
|
||||
scrollBehavior = scrollBehavior
|
||||
)
|
||||
},
|
||||
)
|
||||
{ innerPadding ->
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.background(Color.Transparent)
|
||||
.padding(innerPadding)
|
||||
.verticalScroll(rememberScrollState())
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.padding(16.dp, 16.dp, 16.dp, 36.dp)
|
||||
) {
|
||||
/* Fear Greed Chart Start */
|
||||
CartesianChartHost(
|
||||
zoomState = zoomState,
|
||||
chart = rememberCartesianChart(
|
||||
rememberLineCartesianLayer(
|
||||
lineProvider = LineCartesianLayer.LineProvider.series(
|
||||
vicoTheme.lineCartesianLayerColors.map{
|
||||
_ ->
|
||||
LineCartesianLayer
|
||||
.rememberLine(
|
||||
LineCartesianLayer.LineFill.single(
|
||||
fill(MaterialTheme.colorScheme.onPrimary)
|
||||
)
|
||||
)
|
||||
}
|
||||
),
|
||||
rangeProvider = remember { CartesianLayerRangeProvider.fixed(minY = 0.0, maxY = 100.0)}
|
||||
),
|
||||
startAxis = VerticalAxis.rememberStart(
|
||||
title = "FGI",
|
||||
titleComponent = rememberTextComponent(MaterialTheme.colorScheme.onPrimary),
|
||||
line = rememberAxisLineComponent(fill(MaterialTheme.colorScheme.onPrimary)),
|
||||
label = rememberAxisLabelComponent(MaterialTheme.colorScheme.onPrimary)
|
||||
),
|
||||
bottomAxis = HorizontalAxis.rememberBottom(
|
||||
title = "last $fearGreedIndexDaysCount days",
|
||||
titleComponent = rememberTextComponent(MaterialTheme.colorScheme.onPrimary),
|
||||
line = rememberAxisLineComponent(fill(MaterialTheme.colorScheme.onPrimary)),
|
||||
label = rememberAxisLabelComponent(MaterialTheme.colorScheme.onPrimary)
|
||||
),
|
||||
decorations = listOf(
|
||||
remember {
|
||||
HorizontalLine(
|
||||
y = { 25.toDouble() },
|
||||
line = LineComponent(fill(Flame), 2f),
|
||||
labelComponent = TextComponent(
|
||||
background =
|
||||
shapeComponent(
|
||||
fill(Flame),
|
||||
CorneredShape.rounded(
|
||||
topLeft = 4.dp,
|
||||
topRight = 4.dp
|
||||
)
|
||||
),
|
||||
),
|
||||
label = { "Fear" },
|
||||
verticalLabelPosition = Position.Vertical.Top
|
||||
)
|
||||
},
|
||||
remember {
|
||||
HorizontalLine(
|
||||
y = { 70.toDouble() },
|
||||
line = LineComponent(fill(Green2), 2f),
|
||||
labelComponent = TextComponent(
|
||||
background =
|
||||
shapeComponent(
|
||||
fill(Green2),
|
||||
CorneredShape.rounded(
|
||||
bottomLeft = 4.dp,
|
||||
bottomRight = 4.dp
|
||||
)
|
||||
),
|
||||
),
|
||||
label = { "Greed" },
|
||||
verticalLabelPosition = Position.Vertical.Bottom
|
||||
)
|
||||
}
|
||||
),
|
||||
),
|
||||
modelProducer = modelProducer,
|
||||
)
|
||||
/* Fear Greed Chart End */
|
||||
HorizontalDivider(thickness = 2.dp)
|
||||
Text(
|
||||
"Данные о Биткойне",
|
||||
modifier = Modifier
|
||||
.align(alignment = Alignment.CenterHorizontally),
|
||||
fontSize = 24.sp
|
||||
)
|
||||
val formatter = DecimalFormat("0.00")
|
||||
Text("Текущая цена: \n \$ ${formatter.format(bitcoinTicker.priceUsd.toFloat())}\n")
|
||||
Text("Суточный оборот: \n \$ ${bitcoinTicker.volume24hUsd}\n")
|
||||
Text("Капитализация: \n \$ ${bitcoinTicker.marketCapUsd}\n")
|
||||
Text(
|
||||
"Изменение курса за: " +
|
||||
"\n Сутки: ${formatter.format(bitcoinTicker.percentChange24h.toFloat())}% " +
|
||||
"\n Неделю: ${formatter.format(bitcoinTicker.percentChange7d.toFloat())}%\n"
|
||||
)
|
||||
|
||||
Text(text = "Fear & Greed Index", style = MaterialTheme.typography.bodyMedium)
|
||||
Text(text = fearGreedData)
|
||||
var humanDate = ""
|
||||
|
||||
if(bitcoinTicker.lastUpdated.isNotEmpty())
|
||||
humanDate = DateTimeFormatter.ISO_INSTANT
|
||||
.format(java.time.Instant.ofEpochSecond(bitcoinTicker.lastUpdated.toLong()))
|
||||
|
||||
Text("Дата последнего обновления: \n ${humanDate}\n")
|
||||
|
||||
HorizontalDivider(thickness = 2.dp)
|
||||
Text(
|
||||
"Глобальные данные",
|
||||
modifier = Modifier
|
||||
.align(alignment = Alignment.CenterHorizontally),
|
||||
fontSize = 24.sp
|
||||
)
|
||||
Text("Общая капитализация крипторынка: \n \$ ${globalData.totalMarketCapUsd}\n")
|
||||
Text("Всего видов криптовалют: \n ${globalData.activeCryptocurrencies}\n")
|
||||
Text("Суточный оборот других криптовалют: \n \$ ${globalData.total24hVolumeUsd}\n")
|
||||
Text("Процент доминации Биткоина: \n ${formatter.format(globalData.bitcoinPercentageOfMarketCap.toFloat())}%\n")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -7,19 +7,19 @@ typealias TickerResponse = List<TickerData>
|
||||
|
||||
// Сами данные
|
||||
data class TickerData(
|
||||
val id: String,
|
||||
val name: String,
|
||||
val symbol: String,
|
||||
val rank: String,
|
||||
@SerializedName("price_usd") val priceUsd: String,
|
||||
@SerializedName("price_btc") val priceBtc: String,
|
||||
@SerializedName("24h_volume_usd") val volume24hUsd: String,
|
||||
@SerializedName("market_cap_usd") val marketCapUsd: String,
|
||||
@SerializedName("available_supply") val availableSupply: String,
|
||||
@SerializedName("total_supply") val totalSupply: String,
|
||||
@SerializedName("max_supply") val maxSupply: String?,
|
||||
@SerializedName("percent_change_1h") val percentChange1h: String,
|
||||
@SerializedName("percent_change_24h") val percentChange24h: String,
|
||||
@SerializedName("percent_change_7d") val percentChange7d: String,
|
||||
@SerializedName("last_updated") val lastUpdated: String
|
||||
val id: String = "",
|
||||
val name: String = "",
|
||||
val symbol: String = "",
|
||||
val rank: String = "",
|
||||
@SerializedName("price_usd") val priceUsd: String = "0.0",
|
||||
@SerializedName("price_btc") val priceBtc: String = "0.0",
|
||||
@SerializedName("24h_volume_usd") val volume24hUsd: String = "0",
|
||||
@SerializedName("market_cap_usd") val marketCapUsd: String = "0",
|
||||
@SerializedName("available_supply") val availableSupply: String = "0",
|
||||
@SerializedName("total_supply") val totalSupply: String = "0",
|
||||
@SerializedName("max_supply") val maxSupply: String? = "0",
|
||||
@SerializedName("percent_change_1h") val percentChange1h: String = "0",
|
||||
@SerializedName("percent_change_24h") val percentChange24h: String = "0.0",
|
||||
@SerializedName("percent_change_7d") val percentChange7d: String = "0.0",
|
||||
@SerializedName("last_updated") val lastUpdated: String = ""
|
||||
)
|
@ -8,4 +8,12 @@ val Pink80 = Color(0xFFEFB8C8)
|
||||
|
||||
val Purple40 = Color(0xFF6650a4)
|
||||
val PurpleGrey40 = Color(0xFF625b71)
|
||||
val Pink40 = Color(0xFF7D5260)
|
||||
val Pink40 = Color(0xFF7D5260)
|
||||
|
||||
val EnglishViolet = Color(0xFF44355B)
|
||||
val DarkPurple = Color(0xFF31263E)
|
||||
val RaisinBlack = Color(0xFF221E22)
|
||||
val HunyadiYellow = Color(0xFFECA72C)
|
||||
val Flame = Color(0xFFEE5622)
|
||||
|
||||
val Green2 = Color(0xFFB1E434)
|
@ -9,28 +9,37 @@ import androidx.compose.material3.dynamicDarkColorScheme
|
||||
import androidx.compose.material3.dynamicLightColorScheme
|
||||
import androidx.compose.material3.lightColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
|
||||
private val DarkColorScheme = darkColorScheme(
|
||||
primary = Purple80,
|
||||
secondary = PurpleGrey80,
|
||||
tertiary = Pink80
|
||||
primary = RaisinBlack,
|
||||
secondary = DarkPurple,
|
||||
tertiary = EnglishViolet,
|
||||
|
||||
// Other default colors to override
|
||||
background = DarkPurple,
|
||||
surface = Color(0xFFFFFBFE),
|
||||
onPrimary = HunyadiYellow,
|
||||
onSecondary = HunyadiYellow,
|
||||
onTertiary = HunyadiYellow,
|
||||
onBackground = HunyadiYellow,
|
||||
onSurface = Color(0xFF1C1B1F),
|
||||
)
|
||||
|
||||
private val LightColorScheme = lightColorScheme(
|
||||
primary = Purple40,
|
||||
secondary = PurpleGrey40,
|
||||
tertiary = Pink40
|
||||
primary = HunyadiYellow,
|
||||
secondary = Flame,
|
||||
tertiary = EnglishViolet,
|
||||
|
||||
/* Other default colors to override
|
||||
background = Color(0xFFFFFBFE),
|
||||
// Other default colors to override
|
||||
background = Color.White,
|
||||
surface = Color(0xFFFFFBFE),
|
||||
onPrimary = Color.White,
|
||||
onPrimary = RaisinBlack,
|
||||
onSecondary = Color.White,
|
||||
onTertiary = Color.White,
|
||||
onBackground = Color(0xFF1C1B1F),
|
||||
onBackground = RaisinBlack,
|
||||
onSurface = Color(0xFF1C1B1F),
|
||||
*/
|
||||
)
|
||||
|
||||
@Composable
|
||||
|
@ -12,6 +12,7 @@ lifecycleRuntimeKtx = "2.8.7"
|
||||
activityCompose = "1.10.1"
|
||||
composeBom = "2025.02.00"
|
||||
retrofit = "2.9.0"
|
||||
vico = "2.0.2"
|
||||
|
||||
[libraries]
|
||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||
@ -32,6 +33,7 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
|
||||
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
|
||||
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
|
||||
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
|
||||
vico-compose-m3 = { group = "com.patrykandpatrick.vico", name = "compose-m3", version.ref = "vico" }
|
||||
|
||||
[plugins]
|
||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||
|
Reference in New Issue
Block a user