From b4beaf4f9432f12668d6ba6146aee5ac290719fb Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 22:37:45 +0500 Subject: [PATCH 01/15] CI/CD time optimization attempt --- .gitea/workflows/build.yaml | 12 +++++++++--- gradle.properties | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d0594b5..0174b18 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - pipeline-test jobs: Build: @@ -18,12 +19,17 @@ jobs: distribution: 'temurin' - name: Set up Android SDK uses: android-actions/setup-android@v3 + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - uses: gradle/gradle-build-action@v2 - with: - arguments: assembleDebug + run: ./gradlew --no-daemon assembleDebug - name: Upload .apk Artifact uses: actions/upload-artifact@v3 with: diff --git a/gradle.properties b/gradle.properties index 20e2a01..0ebaa7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +org.gradle.caching=true +org.gradle.parallel=true \ No newline at end of file -- 2.47.2 From 3b196de1d87591e7879c2e9375af2c2707c9851e Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 22:43:32 +0500 Subject: [PATCH 02/15] CI/CD time optimization attempt 2 --- .gitea/workflows/build.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0174b18..ede375f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,8 +17,6 @@ jobs: with: java-version: '23' distribution: 'temurin' - - name: Set up Android SDK - uses: android-actions/setup-android@v3 - name: Cache Gradle packages uses: actions/cache@v3 with: @@ -26,10 +24,14 @@ jobs: ~/.gradle/caches ~/.gradle/wrapper key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + - name: Set up Android SDK + uses: android-actions/setup-android@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew --no-daemon assembleDebug + uses: gradle/gradle-build-action@v2 + with: + arguments: assembleDebug - name: Upload .apk Artifact uses: actions/upload-artifact@v3 with: -- 2.47.2 From 91a8b0380b0ccf53363e849ae38e414cc5e8e2a2 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 23:15:46 +0500 Subject: [PATCH 03/15] CI/CD time optimization attempt 3 --- gradle.properties | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0ebaa7d..20e2a01 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,6 +20,4 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true -org.gradle.caching=true -org.gradle.parallel=true \ No newline at end of file +android.nonTransitiveRClass=true \ No newline at end of file -- 2.47.2 From f05f4fbbadcb1aeaafb9501e2215c04c364d1893 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 23:18:04 +0500 Subject: [PATCH 04/15] CI/CD time optimization attempt 4 --- .gitea/workflows/build.yaml | 7 ------- gradle.properties | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ede375f..9bacd38 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,13 +17,6 @@ jobs: with: java-version: '23' distribution: 'temurin' - - name: Cache Gradle packages - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - name: Set up Android SDK uses: android-actions/setup-android@v3 - name: Grant execute permission for gradlew diff --git a/gradle.properties b/gradle.properties index 20e2a01..0ebaa7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +org.gradle.caching=true +org.gradle.parallel=true \ No newline at end of file -- 2.47.2 From da80ba3abd102cdb0735f7e90c4e910e86ee3424 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 23:27:17 +0500 Subject: [PATCH 05/15] CI/CD time optimization attempt 5 --- .gitea/workflows/build.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9bacd38..5ce1bef 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -21,6 +21,13 @@ jobs: 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: -- 2.47.2 From 3e6e44c4b3a6ec0a7c49409ca674f1f0ef3a8ef5 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 23:32:49 +0500 Subject: [PATCH 06/15] CI/CD time optimization attempt 5 --- .gitea/workflows/build.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5ce1bef..e1838ff 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,21 +13,22 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4 - name: Set up JDK 23 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '23' distribution: 'temurin' - - name: Set up Android SDK - uses: android-actions/setup-android@v3 + cache: 'gradle' +# - 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: 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: -- 2.47.2 From 186f1e693cafc64b54f535d5bfe804a5c0c16dcc Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 23:36:03 +0500 Subject: [PATCH 07/15] CI/CD time optimization attempt 5 --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index e1838ff..ca99c65 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '23' - distribution: 'temurin' + distribution: 'zulu' cache: 'gradle' # - name: Set up Android SDK # uses: android-actions/setup-android@v3 -- 2.47.2 From 9c184c08a820d6691027ed3b04cb81980e597d28 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 23:40:39 +0500 Subject: [PATCH 08/15] CI/CD time optimization attempt 6 --- .gitea/workflows/build.yaml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ca99c65..11c32a8 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -16,25 +16,24 @@ jobs: uses: actions/setup-java@v4 with: java-version: '23' - distribution: 'zulu' - cache: 'gradle' -# - name: Set up Android SDK -# uses: android-actions/setup-android@v3 + 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: 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 + uses: actions/upload-artifact@v4 with: name: android-app-apk path: app/build/outputs/apk/debug/*.apk -- 2.47.2 From d1bc545a073058a6bd1ae035ed07de453e76f8db Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 4 Mar 2025 23:44:32 +0500 Subject: [PATCH 09/15] CI/CD time optimization attempt 6 --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 11c32a8..ac4c3df 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: with: arguments: assembleDebug - name: Upload .apk Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: android-app-apk path: app/build/outputs/apk/debug/*.apk -- 2.47.2 From 0906b95273635943c72e9ffcfc8de7eb24ca1c7b Mon Sep 17 00:00:00 2001 From: Andy Kolibri Vendetti Date: Wed, 5 Mar 2025 21:11:15 +0500 Subject: [PATCH 10/15] CI/CD image update --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ac4c3df..681cd5a 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -8,7 +8,7 @@ on: jobs: Build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04-slim steps: - name: Checkout the repo uses: actions/checkout@v4 -- 2.47.2 From 5c92f74ceb464f0529dce8558016d6d926af640a Mon Sep 17 00:00:00 2001 From: Andy Kolibri Vendetti Date: Wed, 5 Mar 2025 21:14:13 +0500 Subject: [PATCH 11/15] CI/CD image update fix --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 681cd5a..4c19eff 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -8,7 +8,7 @@ on: jobs: Build: - runs-on: ubuntu-24.04-slim + runs-on: ubuntu-24.04 steps: - name: Checkout the repo uses: actions/checkout@v4 -- 2.47.2 From 5a4d30b9f846a4c61c255be57db869eb9a107e8b Mon Sep 17 00:00:00 2001 From: Andy Kolibri Vendetti Date: Wed, 5 Mar 2025 21:18:04 +0500 Subject: [PATCH 12/15] CI/CD image update revert --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4c19eff..ac4c3df 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -8,7 +8,7 @@ on: jobs: Build: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Checkout the repo uses: actions/checkout@v4 -- 2.47.2 From 81ab379e0ed3526cb8f86f0cbb6a72fe81b6876e Mon Sep 17 00:00:00 2001 From: Andy Kolibri Vendetti Date: Wed, 5 Mar 2025 21:30:26 +0500 Subject: [PATCH 13/15] CI/CD branching update --- .gitea/workflows/build.yaml | 3 +-- .gitea/workflows/debug.yaml | 42 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 .gitea/workflows/debug.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ac4c3df..7f29dda 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -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 diff --git a/.gitea/workflows/debug.yaml b/.gitea/workflows/debug.yaml new file mode 100644 index 0000000..50fa2e2 --- /dev/null +++ b/.gitea/workflows/debug.yaml @@ -0,0 +1,42 @@ +name: Gitea Android Builder +run-name: ${{ gitea.actor }} is building an Android application +on: + push: + branches: + - main + 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 }}." -- 2.47.2 From 4005a39696b4cccaa47d9ad65a16f9a49ee508ba Mon Sep 17 00:00:00 2001 From: Andy Kolibri Vendetti Date: Wed, 5 Mar 2025 21:40:07 +0500 Subject: [PATCH 14/15] CI/CD branching fix --- .gitea/workflows/debug.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/debug.yaml b/.gitea/workflows/debug.yaml index 50fa2e2..3bc1027 100644 --- a/.gitea/workflows/debug.yaml +++ b/.gitea/workflows/debug.yaml @@ -2,8 +2,6 @@ name: Gitea Android Builder run-name: ${{ gitea.actor }} is building an Android application on: push: - branches: - - main tags: - "*" -- 2.47.2 From 5529b3dafc9675ac2a12328a7ed361abc259c716 Mon Sep 17 00:00:00 2001 From: Andy Kolibri Vendetti Date: Sun, 9 Mar 2025 00:08:36 +0500 Subject: [PATCH 15/15] Some minor fixes --- .../bitcoin_summarizer/MainActivity.kt | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/ru/vendetti/bitcoin_summarizer/MainActivity.kt b/app/src/main/java/ru/vendetti/bitcoin_summarizer/MainActivity.kt index c54a116..0d020b4 100644 --- a/app/src/main/java/ru/vendetti/bitcoin_summarizer/MainActivity.kt +++ b/app/src/main/java/ru/vendetti/bitcoin_summarizer/MainActivity.kt @@ -7,10 +7,9 @@ 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.PaddingValues -import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.Spacer +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 @@ -39,7 +38,6 @@ 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 @@ -51,14 +49,12 @@ 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 @@ -71,15 +67,10 @@ 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?) { @@ -125,14 +116,14 @@ fun CryptoScreen() { LaunchedEffect(fearGreedDataList) { modelProducer.runTransaction { - var numberValues = Array(fearGreedDataList.count()) { + var numberValues = Array(fearGreedDataList.count()) { index -> fearGreedDataList[fearGreedDataList.count() - index - 1] .value.toInt() } if(numberValues.isEmpty()) - numberValues = Array(1) {0} + numberValues = Array(1) {0} lineSeries { series(numberValues.toList()) } } @@ -159,7 +150,7 @@ fun CryptoScreen() { ), title = { Text( - "Bitcoin Summarizer!", + "Bitcoin Summarizer", maxLines = 1, overflow = TextOverflow.Ellipsis ) @@ -220,7 +211,7 @@ fun CryptoScreen() { label = rememberAxisLabelComponent(MaterialTheme.colorScheme.onPrimary) ), bottomAxis = HorizontalAxis.rememberBottom( - title = "last $fearGreedIndexDaysCount days", + title = "последние $fearGreedIndexDaysCount дней", titleComponent = rememberTextComponent(MaterialTheme.colorScheme.onPrimary), line = rememberAxisLineComponent(fill(MaterialTheme.colorScheme.onPrimary)), label = rememberAxisLabelComponent(MaterialTheme.colorScheme.onPrimary) @@ -229,7 +220,7 @@ fun CryptoScreen() { remember { HorizontalLine( y = { 25.toDouble() }, - line = LineComponent(fill(Flame), 2f), + line = LineComponent(fill(Flame), 1f), labelComponent = TextComponent( background = shapeComponent( @@ -240,14 +231,14 @@ fun CryptoScreen() { ) ), ), - label = { "Fear" }, + label = { "Страх" }, verticalLabelPosition = Position.Vertical.Top ) }, remember { HorizontalLine( y = { 70.toDouble() }, - line = LineComponent(fill(Green2), 2f), + line = LineComponent(fill(Green2), 1f), labelComponent = TextComponent( background = shapeComponent( @@ -258,7 +249,7 @@ fun CryptoScreen() { ) ), ), - label = { "Greed" }, + label = { "Жадность" }, verticalLabelPosition = Position.Vertical.Bottom ) } @@ -267,13 +258,16 @@ fun CryptoScreen() { modelProducer = modelProducer, ) /* Fear Greed Chart End */ + Spacer(modifier = Modifier.height(16.dp)) HorizontalDivider(thickness = 2.dp) + Spacer(modifier = Modifier.height(16.dp)) Text( - "Данные о Биткойне", + "Данные о Биткоине", modifier = Modifier .align(alignment = Alignment.CenterHorizontally), fontSize = 24.sp ) + Spacer(modifier = Modifier.height(16.dp)) val formatter = DecimalFormat("0.00") Text("Текущая цена: \n \$ ${formatter.format(bitcoinTicker.priceUsd.toFloat())}\n") Text("Суточный оборот: \n \$ ${bitcoinTicker.volume24hUsd}\n") @@ -293,12 +287,14 @@ fun CryptoScreen() { Text("Время последнего обновления: \n ${humanDate}\n") HorizontalDivider(thickness = 2.dp) + Spacer(modifier = Modifier.height(16.dp)) Text( "Глобальные данные", modifier = Modifier .align(alignment = Alignment.CenterHorizontally), fontSize = 24.sp ) + Spacer(modifier = Modifier.height(16.dp)) Text("Общая капитализация крипторынка: \n \$ ${globalData.totalMarketCapUsd}\n") Text("Всего тикеров: \n ${globalData.activeCryptocurrencies}\n") Text("Суточный оборот всех криптовалют: \n \$ ${globalData.total24hVolumeUsd}\n") -- 2.47.2