app/build.gradle.kts

@@ -34,17 +34,16 @@ android {
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-            resValue("string", "app_name", "@string/app_name_reg")
         }
         debug {
             applicationIdSuffix = ".debug"
             versionNameSuffix =
-                "-debug+${LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE)}"
+                "-debug+${LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)}"
-            resValue("string", "app_name", "@string/app_name_dev")
+            resValue("string", "app_name", "app_name_dev")
         }
         create("beta") {
             versionNameSuffix =
-                "-beta+${LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE)}"
+                "-beta+${LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)}"
             resValue("string", "app_name", "@string/app_name_beta")
             signingConfig = signingConfigs.getByName("debug")
         }
@@ -105,8 +104,7 @@ dependencies {
     implementation(libs.coil.compose)
 
     implementation(libs.androidx.datastore.preferences)
-    implementation(libs.splitties.base)
+    implementation(libs.splitties.funpack.android.base.with.views.dsl)
-    implementation(libs.splitties.room)
 
     implementation(libs.compose)
 

app/src/main/java/ru/sweetbread/unn/API.kt

@@ -214,8 +214,9 @@ suspend fun getScheduleDay(
     if ((type == ME.type) and (id == ME.unnId!!)) {
         val schedule = withContext(Dispatchers.IO) { loadSchedule(date) }
         Log.d("Schedule", schedule.joinToString())
-        if (schedule.isNotEmpty())
+        if (schedule.size != 0) {
             return schedule
+        }
     }
 
     return getSchedule(type, id, date, date)

app/src/main/java/ru/sweetbread/unn/db/Schedule.kt

@@ -376,7 +376,7 @@ fun loadSchedule(oid: Int): ScheduleUnit? {
 
 fun loadSchedule(date: LocalDate): ArrayList<ScheduleUnit> {
     db.scheduleDao().getSchedule(date.format(DateTimeFormatter.ISO_DATE))
-        .map { Log.d("meow", "${it.oid}: ${loadSchedule(it.oid)}") }
+        .mapNotNull { Log.d("meow", "${it.oid}: ${loadSchedule(it.oid)}") }
     return ArrayList(
         db.scheduleDao().getSchedule(date.format(DateTimeFormatter.ISO_DATE))
             .mapNotNull { loadSchedule(it.oid) }

app/src/main/java/ru/sweetbread/unn/ui/composes/Schedule.kt

@@ -51,7 +51,6 @@ import ru.sweetbread.unn.R
 import ru.sweetbread.unn.ScheduleUnit
 import ru.sweetbread.unn.getScheduleDay
 import ru.sweetbread.unn.ui.theme.UNNTheme
-import splitties.resources.appStr
 import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -102,15 +101,12 @@ fun ScheduleDay(modifier: Modifier = Modifier, date: LocalDate) {
     if (loadedDate == date) {
         Log.d("Loaded", "${date.format(DateTimeFormatter.ISO_DATE)} ${lessons.size}")
         LazyColumn (modifier) {
-            items(lessons) {
+            items(lessons) { // TODO: Add empty list notification
                 ScheduleItem(unit = it, modifier = Modifier.clickable {
                     expanded = if (it.oid == expanded) 0
                     else it.oid
                 }, expanded = expanded == it.oid)
             }
-
-            if (lessons.isEmpty())
-                item { Text(appStr(R.string.noData)) }
         }
     } else {
         LinearProgressIndicator(

app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt

@@ -38,7 +38,6 @@ import ru.sweetbread.unn.db.AppDatabase
 import ru.sweetbread.unn.ui.composes.Blogposts
 import ru.sweetbread.unn.ui.composes.Schedule
 import ru.sweetbread.unn.ui.theme.UNNTheme
-import splitties.arch.room.roomDb
 import splitties.toast.toast
 
 val client = HttpClient(Android) {
@@ -63,13 +62,18 @@ val client = HttpClient(Android) {
     }
 }
 
-val db = roomDb<AppDatabase>(name = "database")
+lateinit var db: AppDatabase
 
 class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        db = Room.databaseBuilder(
+            applicationContext,
+            AppDatabase::class.java, "database"
+        ).build()
+
         setContent {
             UNNTheme {
                 Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {

app/src/main/res/values-ru/strings.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name_reg">ННГУ</string>
-    <string name="app_name_dev">ННГУ Альфа</string>
-    <string name="app_name_beta">ННГУ Бета</string>
     <string name="prompt_password">Пароль</string>
+    <string name="app_name">ННГУ</string>
     <string name="prompt_login">Логин</string>
     <string name="sign_in">Войти</string>
     <string name="assistant">Ассистент</string>
@@ -13,5 +11,5 @@
     <string name="auditorium">Аудитория</string>
     <string name="building">Здание</string>
     <string name="floor">Этаж</string>
-    <string name="noData">Нет данных</string>
+    <string name="app_name_beta">ННГУ Бета</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,8 +1,6 @@
 <resources>
-    <string name="app_name_reg">UNN</string>
+    <string name="app_name">UNN</string>
-    <string name="app_name_dev">UNN Dev</string>
+<!--    <string name="title_activity_login">LoginActivity</string>-->
-    <string name="app_name_beta">UNN Beta</string>
-    <!--    <string name="title_activity_login">LoginActivity</string>-->
     <string name="prompt_email" translatable="false">Email</string>
     <string name="prompt_login">Login</string>
     <string name="prompt_password">Password</string>
@@ -15,6 +13,7 @@
     <string name="building">Building</string>
     <string name="floor">Floor</string>
     <string name="lorem" translatable="false">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam vel iaculis elit. Aliquam varius urna ut nisl rhoncus ullamcorper. Maecenas et nisl at dui mollis maximus nec in libero. Ut eu nulla id felis hendrerit lobortis. Maecenas vel facilisis lectus. Morbi eleifend massa a ante consequat, eu aliquam elit euismod. Aenean quis erat tincidunt, egestas ligula id, convallis tortor. Vivamus volutpat condimentum nisl sed eleifend.  Aenean dapibus dolor ut orci lobortis, placerat lobortis tortor pretium. Nam eros lectus, convallis sed ultricies sit amet, lacinia sed sem. In mi odio, porta non malesuada et, cursus a metus. Morbi quis odio sed quam commodo gravida id sit amet dolor. Donec ac iaculis massa. Nulla mauris sapien, auctor consequat est in, tempus accumsan ipsum. Donec semper volutpat nisi. Quisque dignissim tellus ipsum, sed malesuada libero aliquam sed. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae;  Nam eleifend pharetra orci eu scelerisque. In hac habitasse platea dictumst. Sed non neque vitae metus porttitor vestibulum ut eget felis. Aliquam venenatis a magna eu mattis. Proin rutrum, sapien id viverra finibus, nisi quam aliquam eros, et dignissim lectus sem sit amet purus. Donec et semper enim, sed pretium lacus. Nullam venenatis ullamcorper maximus. Mauris pellentesque velit non sem sollicitudin molestie. Duis hendrerit consequat enim eget euismod.</string>
-    <string name="noData">No Data</string>
+    <string name="app_name_dev" translatable="false">UNN Dev</string>
+    <string name="app_name_beta">UNN Beta</string>
     <!--    <string name="login_failed">"Login failed"</string>-->
 </resources>

gradle/libs.versions.toml

@@ -23,7 +23,7 @@ activity = "1.9.2"
 navigationCompose = "2.7.7"  # Updating this will cause an error!
 roomRuntime = "2.6.1"
 secretsGradlePlugin = "2.0.1"
-splitties = "3.0.0"
+splittiesFunPackAndroidBaseWithViewsDsl = "3.0.0"
 kefirbb = "1.5"
 
 [libraries]
@@ -62,8 +62,7 @@ androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecy
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 secrets-gradle-plugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }
-splitties-base = { module = "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl", version.ref = "splitties" }
+splitties-funpack-android-base-with-views-dsl = { module = "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl", version.ref = "splittiesFunPackAndroidBaseWithViewsDsl" }
-splitties-room = { module = "com.louiscad.splitties:splitties-arch-room", version.ref = "splitties" }
 kefirbb = { group = "org.kefirsf", name = "kefirbb", version.ref = "kefirbb" }
 
 [plugins]