Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
1 result

Target

Select target project
  • justJanne/meteroid
1 result
Select Git revision
  • main
1 result
Show changes
Showing
with 26 additions and 7 deletions
app/src/main/res/mipmap-xxhdpi/ic_launcher.png

9.69 KiB

app/src/main/res/mipmap-xxhdpi/ic_launcher.webp

4.51 KiB

app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp

8.4 KiB

app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp

6.14 KiB

app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

11.4 KiB

<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#003984</color>
</resources>
\ No newline at end of file
......@@ -15,4 +15,10 @@
<item name="android:windowMinWidthMajor">100%</item>
<item name="android:windowMinWidthMinor">100%</item>
</style>
<style name="Theme.Meteroid.SplashScreen" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">#003984</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
<item name="postSplashScreenTheme">@style/Theme.Meteroid</item>
</style>
</resources>
[versions]
androidGradlePlugin = "8.1.3"
androidx-activity = "1.8.0"
androidGradlePlugin = "8.1.4"
androidx-activity = "1.8.1"
androidx-appcompat = "1.6.1"
androidx-compose-bom = "2023.10.01"
androidx-compose-compiler = "1.5.4"
androidx-compose-material = "1.5.0-alpha04"
androidx-compose-material3 = "1.2.0-alpha10"
androidx-compose-runtimetracing = "1.0.0-alpha04"
androidx-compose-tooling = "1.6.0-alpha08"
androidx-compose-material3 = "1.2.0-alpha11"
androidx-compose-runtimetracing = "1.0.0-alpha05"
androidx-compose-tooling = "1.6.0-beta01"
androidx-datastore = "1.0.0"
androidx-hilt = "1.1.0"
androidx-navigation = "2.7.5"
......@@ -34,7 +34,7 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi
androidx-compose-animation = { group = "androidx.compose.animation", name = "animation" }
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version = "1.6.0-alpha08" }
androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version = "1.6.0-beta01" }
androidx-compose-material = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" }
androidx-compose-material-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "androidx-compose-material3" }
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
......@@ -46,6 +46,8 @@ androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-toolin
androidx-compose-ui-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidx-compose-tooling" }
androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
androidx-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
......
ic_launcher-playstore.png

30.7 KiB

......@@ -26,6 +26,6 @@ package de.chaosdorf.meteroid.model
data class AccountInfo(
val server: Server,
val user: User?,
val user: User,
val pinned: Boolean
)
......@@ -59,6 +59,9 @@ interface PinnedUserRepository {
@Query("SELECT userId FROM PinnedUser WHERE serverId = :serverId")
fun getAllFlow(serverId: ServerId): Flow<List<UserId>>
@Query("SELECT User.* FROM PinnedUser JOIN User on PinnedUser.userId = User.userId AND PinnedUser.serverId = User.serverId")
fun getPinnedUsersFlow(): Flow<List<User>>
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun save(user: PinnedUser)
......
......@@ -51,6 +51,8 @@ interface ServerRepository {
@Query("SELECT * FROM Server WHERE serverId = :id LIMIT 1")
fun getFlow(id: ServerId): Flow<Server?>
@Query("SELECT count(*) FROM Server")
fun countFlow(): Flow<Int>
@Query("SELECT * FROM Server")
suspend fun getAll(): List<Server>
......
......@@ -86,6 +86,8 @@ interface TransactionRepository {
@Query("SELECT * FROM `Transaction` WHERE serverId = :serverId AND userId = :userId ORDER BY timestamp DESC")
fun getAllFlow(serverId: ServerId, userId: UserId): Flow<List<Transaction>>
@Query("SELECT * FROM `Transaction` WHERE serverId = :serverId AND userId = :userId ORDER BY timestamp DESC LIMIT 1")
suspend fun getLatest(serverId: ServerId, userId: UserId): Transaction?
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun save(transaction: Transaction)
......