Merge pull request 'main' (#25 ) from main into pipeline-test

Reviewed-on: #25
Merge pull request 'Some minor fixes' (#23 ) from ops into main
2025-03-08 22:15:23 +03:00 · 2025-03-08 22:11:34 +03:00 · 2025-03-09 00:08:36 +05:00 · 2025-03-08 15:50:58 +03:00 · 2025-03-08 17:48:53 +05:00 · 2025-03-08 17:37:03 +05:00
18 changed files with 27 additions and 254 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +0,0 @@
-Bitcoin summarizer
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
-  </component>
-</project>
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
-  </component>
-</project>
--- a/.idea/migrations.xml
+++ b/.idea/migrations.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +0,0 @@
-<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">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
        applicationId = "ru.vendetti.bitcoin_summarizer"
        minSdk = 29
        targetSdk = 35
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "1.2"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,13 +3,13 @@
    xmlns:tools="http://schemas.android.com/tools">
    <uses-permission android:name="android.permission.INTERNET" />
    <application
-        android:allowBackup="true"
+        android:allowBackup="false"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
+        android:supportsRtl="false"
        android:theme="@style/Theme.BitcoinSummarizer"
        tools:targetApi="31">
        <activity
--- 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<Int>(fearGreedDataList.count()) {
+            var numberValues = Array(fearGreedDataList.count()) {
                index ->
                    fearGreedDataList[fearGreedDataList.count() - index - 1]
                        .value.toInt()
            }

            if(numberValues.isEmpty())
-                numberValues = Array<Int>(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")
@@ -290,18 +284,20 @@ fun CryptoScreen() {
                    humanDate = DateTimeFormatter.ISO_INSTANT
                        .format(java.time.Instant.ofEpochSecond(bitcoinTicker.lastUpdated.toLong()))

-                Text("Дата последнего обновления: \n ${humanDate}\n")
+                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")
+                Text("Всего тикеров: \n ${globalData.activeCryptocurrencies}\n")
+                Text("Суточный оборот всех криптовалют: \n \$ ${globalData.total24hVolumeUsd}\n")
                Text("Процент доминации Биткоина: \n ${formatter.format(globalData.bitcoinPercentageOfMarketCap.toFloat())}%\n")
            }
        }
--- a/app/src/main/java/ru/vendetti/bitcoin_summarizer/ui/theme/Theme.kt
+++ b/app/src/main/java/ru/vendetti/bitcoin_summarizer/ui/theme/Theme.kt
@@ -45,16 +45,9 @@ private val LightColorScheme = lightColorScheme(
@Composable
 fun BitcoinSummarizerTheme(
    darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
    content: @Composable () -> Unit
 ) {
    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
        darkTheme -> DarkColorScheme
        else -> LightColorScheme
    }
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-agp = "8.8.2"
+agp = "8.9.0"
 converterGson = "2.9.0"
 kotlin = "2.0.0"
 coreKtx = "1.15.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-kotlinxCoroutinesAndroid = "1.7.3"
-kotlinxCoroutinesCore = "1.7.3"
+kotlinxCoroutinesAndroid = "1.10.1"
+kotlinxCoroutinesCore = "1.10.1"
 lifecycleRuntimeKtx = "2.8.7"
 activityCompose = "1.10.1"
 composeBom = "2025.02.00"
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Feb 26 23:45:23 YEKT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Author	SHA1	Message	Date
Andy Kolibri Vendetti	eeda7031dc	Merge pull request 'main' (#25 ) from main into pipeline-test All checks were successful Gitea Android Builder / Build (push) Successful in 1m18s Details Reviewed-on: #25	2025-03-08 22:15:23 +03:00
Andy Kolibri Vendetti	4edf0f7352	Merge pull request 'Some minor fixes' (#23 ) from ops into main Reviewed-on: #23	2025-03-08 22:11:34 +03:00
Andy Kolibri Vendetti	5529b3dafc	Some minor fixes	2025-03-09 00:08:36 +05:00
Andy Kolibri Vendetti	087b732fa5	Merge pull request 'dev' (#22 ) from dev into main All checks were successful Gitea Android Builder / Build (push) Successful in 3m32s Details Reviewed-on: #22	2025-03-08 15:50:58 +03:00
Andy Kolibri Vendetti	08df502b1f	Some minor fixes (manifest, text typos, gradle app ver etc.)	2025-03-08 17:48:53 +05:00
Andy Kolibri Vendetti	28196510a3	.idea dir removed from the repo	2025-03-08 17:37:03 +05:00
Andy Kolibri Vendetti	3691477e92	dependencies updated	2025-03-08 17:28:12 +05:00
B3S23	580c5b6611	Merge pull request 'removed dynamic color, cause we are controlling colors by ourself' (#21 ) from dev into main All checks were successful Gitea Android Builder / Build (push) Successful in 1m36s Details Reviewed-on: #21	2025-03-08 11:45:03 +03:00
B3S23	8f0ffb7041	removed dynamic color, cause we are controlling colors by ourself	2025-03-08 11:44:29 +03:00