Fixes & renaming

Author: alllexey-dev

app/src/main/java/dev/alllexey/itmowidgets/services/MyFirebaseMessagingService.kt

@@ -156,7 +156,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
         createNotificationChannel(channelId)
 
         val notificationBuilder = NotificationCompat.Builder(this, channelId)
-            .setSmallIcon(R.drawable.ic_notification)
+            .setSmallIcon(R.drawable.ic_exercise)
             .setContentTitle(title)
             .setContentText(messageBody)
             .setAutoCancel(true)

app/src/main/java/dev/alllexey/itmowidgets/ui/sport/sign/SportSignViewModel.kt

@@ -28,6 +28,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 import java.time.DayOfWeek
 import java.time.LocalDate
+import java.time.OffsetDateTime
 import java.time.format.TextStyle
 import java.util.Locale
 
@@ -212,13 +213,13 @@ class SportSignViewModel(private val myItmo: MyItmoApi, context: Context) : View
                     val isAvailable = lesson.available > 0 && lesson.canSignIn.isCanSignIn
                     // If "Show Only Available" is on, we hide full lessons, unless Auto Sign is ON (which might show them)
                     // or if the user is already signed up.
-                    val shouldShow = lesson.signed || !state.showOnlyAvailable || isAvailable || (state.showAutoSign && lesson.canSignIn.isCanSignIn)
+                    val shouldShow = !state.showOnlyAvailable || (lesson.dateEnd > OffsetDateTime.now() && (lesson.signed || isAvailable || (state.showAutoSign && lesson.canSignIn.isCanSignIn)))
 
                     isToday && shouldShow
                 }
                 .map { createSportLessonData(it, isReal = true) }
                 // Filter again after mapping because createSportLessonData calculates precise unavailability reasons
-                .filter { item -> !state.showOnlyAvailable || item.canSignIn || item.apiData.signed || (state.showAutoSign && item.apiData.available <= 0) }
+                .filter { item -> !state.showOnlyAvailable || (item.apiData.dateEnd > OffsetDateTime.now() && (item.canSignIn || item.apiData.signed || (state.showAutoSign && item.apiData.available <= 0))) }
 
             // B. Phantom Lessons (Auto Sign suggestions based on history)
             val phantomLessons = if (state.showAutoSign) {
@@ -278,6 +279,7 @@ class SportSignViewModel(private val myItmo: MyItmoApi, context: Context) : View
     private fun createSportLessonData(lesson: SportLesson, isReal: Boolean): SportLessonData {
         val reasons = if (isReal) UnavailableReason.getSortedUnavailableReasons(lesson) else {
             val allowed = setOf(
+                UnavailableReason.LessonInPast::class,
                 UnavailableReason.SelectionFailed::class,
                 UnavailableReason.HealthGroupMismatch::class,
                 UnavailableReason.Other::class,

app/src/main/res/layout/fragment_onboarding_services.xml

@@ -18,7 +18,7 @@
             android:id="@+id/tv_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Кастомные сервисы"
+            android:text="Пользовательские сервисы"
             android:textAlignment="center"
             android:textAppearance="?attr/textAppearanceTitleLargeEmphasized"
             app:layout_constraintTop_toTopOf="parent" />
@@ -96,7 +96,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="Кастомные сервисы"
+                        android:text="Пользовательские сервисы"
                         android:textAppearance="?attr/textAppearanceTitleMedium" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch

app/src/main/res/xml/account_preferences.xml

@@ -33,13 +33,13 @@
         <SwitchPreference
             app:defaultValue="false"
             app:key="custom_services_allow"
-            app:summary="Добавляет в приложение уникальные инструменты"
+            app:summary="Добавляет в приложение уникальные инструменты. Ваш токен MyITMO будет отправлен на сервер приложения для аутентификации."
             app:title="Пользовательские сервисы" />
 
-        <Preference
-            app:icon="@drawable/ic_outline_help"
-            app:key="custom_services_info"
-            app:summary="Подробное описание новых функций"
-            app:title="Что это дает?" />
+<!--        <Preference-->
+<!--            app:icon="@drawable/ic_outline_help"-->
+<!--            app:key="custom_services_info"-->
+<!--            app:summary="Подробное описание уникальных функций"-->
+<!--            app:title="Что это такое?" />-->
     </PreferenceCategory>
 </PreferenceScreen>