the most important changes of all time

README.md

@@ -1,2 +1,6 @@
-# vyatsu-schedule
+# vyatsu-schedulegit
 
+## settings-branch
+blank settings at first, soon will add update feature. 
+
+settings will be presetned as fourth button on the bottom of the screen.

app/src/main/java/agzam/vyatsu/data/remote/pdf/Pdf2Table.kt

@@ -38,7 +38,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {
 
     private val svgBuilder = StringBuilder()
     private val currentPath = StringBuilder()
-    private val tableSvg = StringBuilder()
+    val tableSvg = StringBuilder()
 
 
     private val currentSubPathLines = mutableListOf<PdfLine>()
@@ -52,7 +52,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {
         val width = mediaBox.width
         val height = mediaBox.height
         return """
-            <svg width="$width" height="$height" viewBox="0 0 $width $height" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+            <svg width="$width" height="$height" viewBox="0 0 $width $height" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style='font-size: 50%;'>
                 <g>${svgBuilder}</g>
                 <g>${tableSvg}</g>
             </svg>
@@ -211,7 +211,7 @@ class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) {
                 val bottom = ys[ii+1]
                 cells.add(TableCell(left, top, right-left, bottom-top))
 
-                tableSvg.append("<rect fill='${if (i % 2 == 0) "#f" else "#0"}${if (ii % 2 == 0) "f0" else "00"}' x='$left' y='$top' width='${right-left}' height='${bottom-top}'/>\n")
+                tableSvg.append("<rect fill='${if (i % 2 == 0) "#ff" else "#9e"}${if (ii % 2 == 0) "ff9e" else "9e9e"}' x='$left' y='$top' width='${right-left}' height='${bottom-top}'/>\n")
             }
             columns.add(TableColumn(left, right-left, cells))
         }

app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt

@@ -52,12 +52,6 @@ object PdfScheduleParser {
                 svg.processPage(page)
                 val cols = svg.asTable()
 
-                /** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/
-                Log.v(SVG_TAG,  "====")
-                for(line in  svg.asSvg().split("\n")) {
-                    Log.v(SVG_TAG,  line)
-                }
-
                 if(cols.size != 3) throw RuntimeException("Found columns: ${cols.size}/3")
 
                 // Парсинг текста
@@ -67,6 +61,11 @@ object PdfScheduleParser {
                 textStripper.getText(doc)
                 val texts = textStripper.blocks
 
+                for(text in texts) {
+                    svg.tableSvg.appendLine("<text x='${text.x}' y='${text.y}'>${text.text}</text>")
+                    svg.tableSvg.appendLine("<circle cx='${text.x}' cy='${text.y}' r='1' fill='red'/>")
+                }
+
                 val daysColumn      = cols[0] // Колонка "День", имеет формат "<день> dd.mm.yy"
                 val intervalsColumn = cols[1] // Колонка "Интервал", имеет формат "HH:mm-HH:mm"
                 val lessonsColumn   = cols[2] // Колонка с инофрмацией о паре
@@ -114,7 +113,10 @@ object PdfScheduleParser {
                         group = content(groupCell)
                         continue
                     }
-                    if(day.size != 2) continue // XXX: добавить защиту от заголовка и выбрасывать исключения вместо пропуска?
+                    if(day.size != 2) {
+                        Log.w(TAG, "Day data is not in format <day> <date>: $day")
+                        continue // XXX: добавить защиту от заголовка и выбрасывать исключения вместо пропуска?
+                    }
 
                     val date = dateFrom(day[1]) ?: continue
                     val intervals = mutableListOf<TimeSlot>()
@@ -161,7 +163,7 @@ object PdfScheduleParser {
                                 val type = LessonType.fromRaw(typeMatch.first().value.trim())
                                 val teacher = raw.substring(typeMatch.last().range.last+1, raw.length - room.length).trim()
                                 var subgroup: String? = null
-                                Log.d(TAG, subject + " " + group)
+                                Log.d(TAG, "$subject $group")
                                 if(group != null && subject.startsWith("$group,")) {
                                     subject = subject.substring(group.length + 1).trim()
                                     val subgroupMatch = SUBGROUP_REGEX.find(subject)
@@ -192,6 +194,18 @@ object PdfScheduleParser {
                 for (text in texts.filter { it.rotation != 0f }) {
                     Log.v(TAG, "${text.x.roundToInt()}\t${text.y.roundToInt()}\t${text.text}")
                 }
+
+                /** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/
+                Log.v(SVG_TAG,  "====")
+                for(line in  svg.asSvg().split("\n")) {
+                    if(line.length > 250) {
+                        Log.v(SVG_TAG, "length: " + line.length)
+                        Log.v(SVG_TAG + "-" + (pageIndex+1),  "length: " + line.length)
+                        continue
+                    }
+                    Log.v(SVG_TAG,  line)
+                    Log.v(SVG_TAG + "-" + (pageIndex+1),  line)
+                }
             }
         } catch (e: Exception) {
             Log.e(TAG, "Parsing error", e)

app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfTextParser.kt

@@ -7,6 +7,7 @@ import com.tom_roush.pdfbox.text.TextPosition
  * Парсер блоков текста из PDF
  * @author Agzam
  */
+
 class PdfTextParser : PDFTextStripper() {
 
     data class TextBlock(
@@ -25,9 +26,32 @@ class PdfTextParser : PDFTextStripper() {
     }
 
     override fun writeString(string: String?, textPositions: MutableList<TextPosition>?) {
-        if (!string.isNullOrBlank() && !textPositions.isNullOrEmpty()) {
-            val first = textPositions.first()
-            val last = textPositions.last()
+        if (textPositions.isNullOrEmpty()) return
+
+        val currentWordChars = mutableListOf<TextPosition>()
+
+        for (tp in textPositions) {
+            val unicode = tp.unicode
+
+            if (unicode == " " || unicode == "\u00A0" || unicode == "\t") {
+                addWordBlock(currentWordChars)
+                currentWordChars.clear()
+            } else {
+                currentWordChars.add(tp)
+            }
+        }
+
+        addWordBlock(currentWordChars)
+    }
+
+    private fun addWordBlock(wordChars: List<TextPosition>) {
+        if (wordChars.isEmpty()) return
+
+        val first = wordChars.first()
+        val last = wordChars.last()
+
+        val wordText = wordChars.joinToString("") { it.unicode }.trim()
+        if (wordText.isEmpty()) return
 
         val matrix = first.textMatrix
         val rotation = first.dir
@@ -36,10 +60,17 @@ class PdfTextParser : PDFTextStripper() {
 
         val x = matrix.translateX
         val y = matrix.translateY - first.heightDir
-
         val height = first.heightDir
 
-            blocks.add(TextBlock(string.trim(), x, currentPage.mediaBox.height - y - height, totalWidth, height, rotation))
-        }
+        blocks.add(
+            TextBlock(
+                text = wordText,
+                x = x,
+                y = currentPage.mediaBox.height - y - height,
+                width = totalWidth,
+                height = height,
+                rotation = rotation
+            )
+        )
     }
 }

app/src/main/java/agzam/vyatsu/ui/home/HomeScreen.kt

@@ -4,12 +4,14 @@ import agzam.vyatsu.ui.info.BuildingsScreen
 import agzam.vyatsu.ui.info.CallsScreen
 import agzam.vyatsu.ui.schedule.ScheduleScreen
 import agzam.vyatsu.ui.schedule.ScheduleViewModel
+import agzam.vyatsu.ui.settings.SettingsScreen
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.DateRange
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
@@ -25,7 +27,8 @@ import androidx.compose.ui.Modifier
 private enum class HomeTab(val label: String) {
     SCHEDULE("Расписание"),
     CALLS("Звонки"),
-    BUILDINGS("Корпуса")
+    BUILDINGS("Корпуса"),
+    SETTINGS("Настройки")
 }
 
 @Composable
@@ -48,6 +51,7 @@ fun HomeScreen(
                                     HomeTab.SCHEDULE -> Icons.Default.DateRange
                                     HomeTab.CALLS -> Icons.Default.Info
                                     HomeTab.BUILDINGS -> Icons.Default.Home
+                                    HomeTab.SETTINGS -> Icons.Default.Settings
                                 },
                                 contentDescription = t.label
                             )
@@ -67,6 +71,7 @@ fun HomeScreen(
                 HomeTab.SCHEDULE -> ScheduleScreen(viewModel = scheduleViewModel, onSwitchGroup = onSwitchGroup)
                 HomeTab.CALLS -> CallsScreen()
                 HomeTab.BUILDINGS -> BuildingsScreen()
+                HomeTab.SETTINGS -> SettingsScreen()
             }
         }
     }

app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt

@@ -1,6 +1,7 @@
 package agzam.vyatsu.ui.schedule
 
 import agzam.vyatsu.domain.model.Day
+import agzam.vyatsu.domain.model.LessonType
 import agzam.vyatsu.domain.model.SchedulePeriod
 import agzam.vyatsu.domain.model.TimeSlot
 import androidx.compose.foundation.clickable
@@ -285,27 +286,48 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
         } else {
             slot.lessons.forEach { lesson ->
                 Column(Modifier.fillMaxWidth().padding(vertical = 2.dp)) {
+                    var any = false
+                    if(lesson.type != LessonType.OTHER) {
                         Text(
                             lesson.type.label,
                             style = MaterialTheme.typography.bodySmall,
                             color = MaterialTheme.colorScheme.onSurfaceVariant
                         )
+                        any = true
+                    }
 
+                    val subject = lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw
+                    if(subject.isNotEmpty()) {
                         Text(
-                        lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw,
+                            subject,
                             style = MaterialTheme.typography.bodyLarge
                         )
-                    Text(
-                        listOfNotNull(
+                        any = true
+                    }
+
+                    val meta = listOfNotNull(
                         lesson.subgroup,
                         lesson.teacher,
                         lesson.room
-                        )
-                            .filter { it.isNotBlank() }
-                            .joinToString(" · "),
+                    ).filter { it.isNotBlank() }.joinToString(" · ")
+
+                    if(meta.isNotEmpty()) {
+                        Text(
+                            meta,
                             style = MaterialTheme.typography.bodySmall,
                             color = MaterialTheme.colorScheme.onSurfaceVariant
                         )
+                        any = true
+                    }
+
+                    if(!any) {
+                        Text(
+                            "-",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+
                 }
             }
         }

app/src/main/java/agzam/vyatsu/ui/settings/SettingsScreen.kt

@@ -0,0 +1,53 @@
+package agzam.vyatsu.ui.settings
+
+import agzam.vyatsu.BuildConfig
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun SettingsScreen() {
+    Column(
+        Modifier
+            .fillMaxSize()
+            .windowInsetsPadding(WindowInsets.statusBars)
+            .padding(horizontal = 16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Spacer(Modifier.height(24.dp))
+        Text(
+            "Настройки",
+            style = MaterialTheme.typography.titleLarge
+        )
+        Spacer(Modifier.weight(1f))
+        Text(
+            "Здесь появятся настройки\n(автоматические обновления и др.)",
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center
+        )
+        Spacer(Modifier.weight(1f))
+        Text(
+            "Версия ${BuildConfig.VERSION_NAME}",
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+        )
+    }
+}

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
+<vector
     android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +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" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +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" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>