andy/bitcoin-summarizer
2
2
Fork 0
Code Pull Requests Actions Packages Releases 6 Activity

main #24

Merged
andy merged 33 commits from main into dev 2025-03-08 22:13:53 +03:00
Conversation 0 Commits 33 Files Changed 4 +6 -12
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 85c9bd50cd - Show all commits

2
app/src/main/AndroidManifest.xml
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"

12
app/src/main/java/ru/vendetti/bitcoin_summarizer/GlobalResponse.kt
View File

@ -2,14 +2,10 @@ package ru.vendetti.bitcoin_summarizer
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
// Обёртка для данных // Данные
data class GlobalResponse( data class GlobalResponse(
val data: GlobalData @SerializedName("active_currencies") val activeCryptocurrencies: String,
)
// Сами данные
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
) )

4
app/src/main/java/ru/vendetti/bitcoin_summarizer/MainActivity.kt
View File

@ -3,7 +3,6 @@ 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
@ -26,7 +25,6 @@ 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()
@ -55,7 +53,7 @@ fun CryptoScreen() {
// Запрос глобальных данных // Запрос глобальных данных
val globalResponse = cryptoRepository.fetchGlobalData() val globalResponse = cryptoRepository.fetchGlobalData()
globalData = globalResponse?.data?.let { data -> globalData = globalResponse?.let { data ->
"Активных криптовалют: ${data.activeCryptocurrencies}\nРыночная капитализация: ${data.totalMarketCapUsd}\n24h Объем: ${data.total24hVolumeUsd}" "Активных криптовалют: ${data.activeCryptocurrencies}\nРыночная капитализация: ${data.totalMarketCapUsd}\n24h Объем: ${data.total24hVolumeUsd}"
} ?: "Ошибка загрузки глобальных данных" } ?: "Ошибка загрузки глобальных данных"