Compare commits

..

No commits in common. "e6d8a5b7aaa77c39afe67f71ad785ed66ed5d8b0" and "fa0905486af66dc1da20cf01bc5b1b0c557e38c1" have entirely different histories.

30 changed files with 12 additions and 190 deletions

1
.idea/gradle.xml generated
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>

View File

@ -56,10 +56,4 @@ dependencies {
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
implementation(libs.retrofit)
implementation(libs.converter.gson)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.kotlinx.coroutines.core)
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

View File

@ -1,22 +0,0 @@
package ru.vendetti.bitcoin_summarizer
import retrofit2.Response
import retrofit2.http.GET
import retrofit2.http.Query
// Retrofit-API-интерфейс
interface CryptoApiService {
// Получение индекса страха и жадности (по умолчанию за 30 дней)
@GET("fng/")
suspend fun getFearAndGreedIndex(
@Query("limit") limit: Int = 30
): Response<FearAndGreedResponse>
// Получение глобальной информации
@GET("v1/global/")
suspend fun getGlobalData(): Response<GlobalResponse>
// Получение данных Bitcoin
@GET("v1/ticker/bitcoin/")
suspend fun getBitcoinTicker(): Response<TickerResponse>
}

View File

@ -1,58 +0,0 @@
package ru.vendetti.bitcoin_summarizer
//Репозиторий для обработки запросов
class CryptoRepository(private val apiService: CryptoApiService) {
/**
* Запрашивает данные для Bitcoin-тикера
*/
suspend fun fetchBitcoinTicker(): TickerResponse? {
return try {
val response = apiService.getBitcoinTicker()
if (response.isSuccessful) {
response.body()
} else {
println("Ошибка запроса Bitcoin Ticker: ${response.code()}")
null
}
} catch (e: Exception) {
println("Exception при получении Bitcoin Ticker: ${e.localizedMessage}")
null
}
}
/**
* Запрашивает глобальные данные крипторынка
*/
suspend fun fetchGlobalData(): GlobalResponse? {
return try {
val response = apiService.getGlobalData()
if (response.isSuccessful) {
response.body()
} else {
println("Ошибка запроса Global Data: ${response.code()}")
null
}
} catch (e: Exception) {
println("Exception при получении Global Data: ${e.localizedMessage}")
null
}
}
/**
* Запрашивает индекс страха и жадности за указанный период (по умолчанию 30 дней)
*/
suspend fun fetchFearAndGreedData(limit: Int = 30): FearAndGreedResponse? {
return try {
val response = apiService.getFearAndGreedIndex(limit)
if (response.isSuccessful) {
response.body()
} else {
println("Ошибка запроса Fear & Greed Index: ${response.code()}")
null
}
} catch (e: Exception) {
println("Exception при получении Fear & Greed Index: ${e.localizedMessage}")
null
}
}
}

View File

@ -1,23 +0,0 @@
package ru.vendetti.bitcoin_summarizer
import com.google.gson.annotations.SerializedName
// Обёртка для данных (тут вложенность есть и это API v2, а не v1, поэтому чуть сложнее структура, чем в GlobalResponse.kt)
data class FearAndGreedResponse(
@SerializedName("name")
val name: String,
@SerializedName("data")
val dataList: List<FearAndGreedData>
)
// Сами данные
data class FearAndGreedData(
@SerializedName("value")
val value: String,
@SerializedName("value_classification")
val valueClassification: String,
@SerializedName("timestamp")
val timestamp: String,
@SerializedName("time_until_update")
val timeUntilUpdate: String
)

View File

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

View File

@ -1,16 +0,0 @@
package ru.vendetti.bitcoin_summarizer
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
object RetrofitClient {
private const val BASE_URL = "https://api.alternative.me/"
val apiService: CryptoApiService by lazy {
Retrofit.Builder()
.baseUrl(BASE_URL)
.addConverterFactory(GsonConverterFactory.create())
.build()
.create(CryptoApiService::class.java)
}
}

View File

@ -1,25 +0,0 @@
package ru.vendetti.bitcoin_summarizer
import com.google.gson.annotations.SerializedName
// Обёртка для данных (тут json-массив с одним элементом, поэтому выглядит так)
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
)

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 982 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

View File

@ -1,21 +1,16 @@
[versions]
agp = "8.8.1"
converterGson = "2.9.0"
kotlin = "2.0.0"
coreKtx = "1.10.1"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
kotlinxCoroutinesAndroid = "1.7.1"
kotlinxCoroutinesCore = "1.7.1"
lifecycleRuntimeKtx = "2.6.1"
activityCompose = "1.8.0"
composeBom = "2024.04.01"
retrofit = "2.9.0"
[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "converterGson" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
@ -29,9 +24,6 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
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" }
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }