Compare commits

..

No commits in common. "85c9bd50cd6fc14e3321d4daeae85bf24e0ad06d" and "d3d7bd391b33fd5e1f5036be3b98cd83b890aa7d" have entirely different histories.

3 changed files with 12 additions and 6 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<application <application
android:allowBackup="true" android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"

View File

@ -2,10 +2,14 @@ package ru.vendetti.bitcoin_summarizer
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
// Данные // Обёртка для данных
data class GlobalResponse( data class GlobalResponse(
@SerializedName("active_currencies") val activeCryptocurrencies: String, val data: GlobalData
)
// Сами данные
data class GlobalData(
@SerializedName("active_cryptocurrencies") val activeCryptocurrencies: String,
@SerializedName("total_market_cap_usd") val totalMarketCapUsd: String, @SerializedName("total_market_cap_usd") val totalMarketCapUsd: String,
@SerializedName("total_24h_volume_usd") val total24hVolumeUsd: String, @SerializedName("total_24h_volume_usd") val total24hVolumeUsd: String
@SerializedName("bitcoin_percentage_of_market_cap") val bitcoinPercentageOfMarketCap: String
) )

View File

@ -3,6 +3,7 @@ package ru.vendetti.bitcoin_summarizer
import android.os.Bundle import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
@ -25,6 +26,7 @@ import ru.vendetti.bitcoin_summarizer.ui.theme.BitcoinSummarizerTheme
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent { setContent {
BitcoinSummarizerTheme { BitcoinSummarizerTheme {
CryptoScreen() CryptoScreen()
@ -53,7 +55,7 @@ fun CryptoScreen() {
// Запрос глобальных данных // Запрос глобальных данных
val globalResponse = cryptoRepository.fetchGlobalData() val globalResponse = cryptoRepository.fetchGlobalData()
globalData = globalResponse?.let { data -> globalData = globalResponse?.data?.let { data ->
"Активных криптовалют: ${data.activeCryptocurrencies}\nРыночная капитализация: ${data.totalMarketCapUsd}\n24h Объем: ${data.total24hVolumeUsd}" "Активных криптовалют: ${data.activeCryptocurrencies}\nРыночная капитализация: ${data.totalMarketCapUsd}\n24h Объем: ${data.total24hVolumeUsd}"
} ?: "Ошибка загрузки глобальных данных" } ?: "Ошибка загрузки глобальных данных"