v3.0.1 release

mezhendosina · web-flow · commit 84085cf62bad · 2023-09-03T17:00:50.000+03:00
diff --git a/.github/workflows/publish-update.yml b/.github/workflows/publish-update.yml
@@ -112,7 +112,7 @@ jobs:
 
   send-to-channel:
     needs: [ prepare-release-notes, get-apk-version ]
-    if: ${{ needs.get-last-release-version.outputs.is-update }}
+#    if: ${{ needs.get-last-release-version.outputs.is-update }}
     runs-on: ubuntu-latest
     steps:
       - name: Get APK
@@ -131,7 +131,7 @@ jobs:
 
   create-release:
     needs: [ prepare-release-notes, get-apk-version ]
-    if: ${{ needs.get-last-release-version.outputs.is-update }}
+    #    if: ${{ needs.get-last-release-version.outputs.is-update }}
     runs-on: ubuntu-latest
     steps:
       - name: Get APK
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,16 +1 @@
-- Редизайн авторизации\n
-- Полностью переработана отправка домашнего задания\n
-- Теперь у всех предметов в названии есть крутые эмодзи\n
-- Появилась возможность узнать оценки за предыдущие учебные периоды\n
-- Повышена производительность и стабильность главного экрана\n
-- Переработано взаимодействие с фильтрами оценок\n
-- Доработано получение файлов. Теперь они сохраняются в собственной папке в /Android/Data\n
-- Переработан главный экран настроек\n
-- Переработан UI дневника\n
-- Улучшен UI\UX оценок\n
-- Улучшен UX объявлений\n
-- Оказывается приложение не давало войти, если у пользователя в пароле есть кириллица. За багфикс
-  спасибо @darkcat09\n
-- В некоторых местах появились красивые иллюстрации происходящего\n
-- Добавлена монохромная иконка для устройств на Android 12+\n
-- Прибрался в исходниках
+- Исправление багов
diff --git a/app/build.gradle b/app/build.gradle
@@ -33,8 +33,8 @@ android {
         applicationId "com.mezhendosina.sgo.app"
         minSdk 24
         targetSdk 33
-        versionCode 35
-        versionName '3.0.0'
+        versionCode 36
+        versionName '3.0.1'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/mezhendosina/sgo/app/ui/announcementsFlow/announcementsItem/AnnouncementsFragmentViewModel.kt b/app/src/main/java/com/mezhendosina/sgo/app/ui/announcementsFlow/announcementsItem/AnnouncementsFragmentViewModel.kt
@@ -17,16 +17,14 @@
 package com.mezhendosina.sgo.app.ui.announcementsFlow.announcementsItem
 
 import android.content.Context
-import android.view.View
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.mezhendosina.sgo.app.databinding.ItemAttachmentBinding
+import com.mezhendosina.sgo.app.model.answer.FileUiEntity
 import com.mezhendosina.sgo.app.model.attachments.AttachmentsRepository
 import com.mezhendosina.sgo.app.utils.PermissionNotGranted
 import com.mezhendosina.sgo.app.utils.toDescription
 import com.mezhendosina.sgo.data.netschool.NetSchoolSingleton
-import com.mezhendosina.sgo.data.netschool.api.attachments.entities.Attachment
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -40,14 +38,13 @@ class AnnouncementsFragmentViewModel(
 
     suspend fun downloadAttachment(
         context: Context,
-        attachment: Attachment,
-        binding: ItemAttachmentBinding
+        attachment: FileUiEntity,
     ) {
         try {
             attachmentsRepository.downloadAttachment(
                 context,
-                attachment.id,
-                attachment.originalFileName
+                attachment.id!!,
+                attachment.fileName
             )
         } catch (e: Exception) {
             if (e is PermissionNotGranted) {
@@ -57,10 +54,6 @@ class AnnouncementsFragmentViewModel(
                     _errorMessage.value = e.toDescription()
                 }
             }
-        } finally {
-            withContext(Dispatchers.Main) {
-                binding.progressBar.visibility = View.GONE
-            }
         }
     }
 }
diff --git a/app/src/main/java/com/mezhendosina/sgo/app/ui/announcementsFlow/announcementsItem/AnnouncementsItemFragment.kt b/app/src/main/java/com/mezhendosina/sgo/app/ui/announcementsFlow/announcementsItem/AnnouncementsItemFragment.kt
@@ -16,6 +16,8 @@
 
 package com.mezhendosina.sgo.app.ui.announcementsFlow.announcementsItem
 
+import android.Manifest
+import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
@@ -35,6 +37,9 @@ import com.mezhendosina.sgo.data.DateManipulation
 import com.mezhendosina.sgo.data.netschool.api.announcements.AnnouncementsResponseEntity
 import io.noties.markwon.Markwon
 import io.noties.markwon.html.HtmlPlugin
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.jsoup.Jsoup
 
 
@@ -44,8 +49,10 @@ class AnnouncementsItemFragment : Fragment(R.layout.fragment_announcement_item)
 
     internal val viewModel: AnnouncementsFragmentViewModel by viewModels()
 
-    private val registerPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) {}
+
+    private val storagePermission =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) {
+        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -83,7 +90,18 @@ class AnnouncementsItemFragment : Fragment(R.layout.fragment_announcement_item)
             val attachmentAdapter = AttachmentAdapter(
                 object : AttachmentClickListener {
                     override fun invoke(attachment: FileUiEntity, loadingList: MutableList<Int>) {
-                        TODO("Not yet implemented")
+                        val permission =
+                            requireContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                        if (permission == PackageManager.PERMISSION_GRANTED) {
+                            CoroutineScope(Dispatchers.Main).launch {
+                                viewModel.downloadAttachment(
+                                    requireContext(),
+                                    attachment,
+                                )
+                            }
+                        } else {
+                            storagePermission.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                        }
                     }
                 }
             )
diff --git a/app/src/main/java/com/mezhendosina/sgo/app/ui/journalFlow/lessonItem/LessonFragment.kt b/app/src/main/java/com/mezhendosina/sgo/app/ui/journalFlow/lessonItem/LessonFragment.kt
@@ -49,7 +49,6 @@ class LessonFragment : Fragment(R.layout.fragment_item_lesson) {
 
     private val storagePermission =
         registerForActivityResult(ActivityResultContracts.RequestPermission()) {
-            println(it)
         }
 
     private val onAttachmentClickListener = object : AttachmentClickListener {
diff --git a/app/src/main/java/com/mezhendosina/sgo/app/utils/ActivityUtils.kt b/app/src/main/java/com/mezhendosina/sgo/app/utils/ActivityUtils.kt
@@ -16,7 +16,7 @@
 
 package com.mezhendosina.sgo.app.utils
 
-import android.graphics.Color
+import android.os.Build
 import android.view.View
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
@@ -25,24 +25,29 @@ import androidx.core.view.WindowInsetsCompat
 
 
 fun AppCompatActivity.setupStatusBar(fragmentContainer: View) {
-    window.statusBarColor = Color.TRANSPARENT
     val w = window
-    w.setFlags(
-        WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
-        WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-    )
-    ViewCompat.setOnApplyWindowInsetsListener(fragmentContainer) { view, windowInsets ->
-        val insetsNavigation =
-            windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
-        val topBarInset = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars())
-        val insets =
-            windowInsets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures())
-        view.setPadding(
-            insets.left,
-            topBarInset.top,
-            insets.right,
-            insetsNavigation.bottom
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+
+        w.setFlags(
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
         )
-        windowInsets
+        ViewCompat.setOnApplyWindowInsetsListener(fragmentContainer) { view, windowInsets ->
+            val insetsNavigation =
+                windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val topBarInset = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars())
+            val insets =
+                windowInsets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures())
+            view.setPadding(
+                insets.left,
+                topBarInset.top,
+                insets.right,
+                insetsNavigation.bottom
+            )
+            windowInsets
+        }
+    } else {
+        fragmentContainer.fitsSystemWindows = true
     }
+
 }
diff --git a/app/src/main/java/com/mezhendosina/sgo/data/DateManipulation.kt b/app/src/main/java/com/mezhendosina/sgo/data/DateManipulation.kt
@@ -62,36 +62,38 @@ fun getWeeksList(): List<WeekStartEndEntity> {
     minusWeekCalendar.timeInMillis = currentYearTime
     val plusWeekCalendar = Calendar.getInstance()
     plusWeekCalendar.timeInMillis = currentYearTime
+    val currentCalendar = Calendar.getInstance()
+    currentCalendar.timeInMillis = currentYearTime
 
     minusWeekCalendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)
     plusWeekCalendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)
-    while (minusWeekCalendar[Calendar.MONTH] != Calendar.AUGUST || plusWeekCalendar[Calendar.MONTH] != Calendar.SEPTEMBER) {
-        if (minusWeekCalendar[Calendar.MONTH] != Calendar.AUGUST) {
-            minusWeekCalendar.add(Calendar.WEEK_OF_YEAR, -1)
-            val weekStart = minusWeekCalendar.dateToSting()
-            val weekEnd = minusWeekCalendar.getWeekEnd()
-            outList.add(
-                WeekStartEndEntity(
-                    weekStart,
-                    weekEnd,
-                    tabDate(weekStart),
-                    tabDate(weekEnd)
-                )
+
+    while (minusWeekCalendar[Calendar.MONTH] != Calendar.AUGUST) {
+        minusWeekCalendar.add(Calendar.WEEK_OF_YEAR, -1)
+        val weekStart = minusWeekCalendar.dateToSting()
+        val weekEnd = minusWeekCalendar.getWeekEnd()
+        outList.add(
+            WeekStartEndEntity(
+                weekStart,
+                weekEnd,
+                tabDate(weekStart),
+                tabDate(weekEnd)
             )
-        }
-        if (plusWeekCalendar[Calendar.MONTH] != Calendar.SEPTEMBER) {
-            val weekStart = plusWeekCalendar.dateToSting()
-            val weekEnd = plusWeekCalendar.getWeekEnd()
-            outList.add(
-                WeekStartEndEntity(
-                    weekStart,
-                    weekEnd,
-                    tabDate(weekStart),
-                    tabDate(weekEnd)
-                )
+        )
+    }
+
+    while (plusWeekCalendar[Calendar.YEAR] != currentCalendar[Calendar.YEAR] + 1 || plusWeekCalendar[Calendar.MONTH] != Calendar.SEPTEMBER) {
+        val weekStart = plusWeekCalendar.dateToSting()
+        val weekEnd = plusWeekCalendar.getWeekEnd()
+        outList.add(
+            WeekStartEndEntity(
+                weekStart,
+                weekEnd,
+                tabDate(weekStart),
+                tabDate(weekEnd)
             )
-            plusWeekCalendar.add(Calendar.WEEK_OF_YEAR, 1)
-        }
+        )
+        plusWeekCalendar.add(Calendar.WEEK_OF_YEAR, 1)
     }
 
     return outList.sortedBy { it.weekStart }
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -21,7 +21,7 @@
 
     <style name="Theme.SGOApp" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
+
         <item name="android:windowLightStatusBar">true</item>
 
         <item name="colorPrimary">@color/md_theme_light_primary</item>

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ class LessonFragment : Fragment(R.layout.fragment_item_lesson) {`
`49`	`49`
`50`	`50`	`private val storagePermission =`
`51`	`51`	`registerForActivityResult(ActivityResultContracts.RequestPermission()) {`
`52`		`- println(it)`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`private val onAttachmentClickListener = object : AttachmentClickListener {`