Merge pull request #71 from TimPushkin/codestyle

Improve codestyle
TimPushkin · Jun 28, 2023 · 1ce2ea9 · 1ce2ea9
2 parents 2243702 + e8c73d9
commit 1ce2ea9
Show file tree

Hide file tree

Showing 45 changed files with 55 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # DepNav – Department Navigator
 
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/c24bf04feb8840ebb9a6fea2f0389020)](https://www.codacy.com/gh/TimPushkin/DepNav/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=TimPushkin/DepNav&amp;utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/bc683c7328e847a49fe41f69b21a41b1)](https://app.codacy.com/gh/TimPushkin/DepNav/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Known Vulnerabilities](https://snyk.io/test/github/TimPushkin/DepNav/badge.svg)](https://snyk.io/test/github/TimPushkin/DepNav)
 
 **DepNav** is an Android application for viewing indoor maps of departments and searching for
@@ -35,6 +35,7 @@ The following download sources are available:
   or [AppGallery](https://appgallery.cloud.huawei.com/ag/n/app/C106717783?channelId=GitHub+repository&id=05d3f9cea9c44d829cd43b9f79593c88&s=A358D75497B3480E158A47713DE08E03B4047FD6FD5F2DA45C7AF9D9B5410F64&detailType=0&v=&callType=AGDLINK&installType=0000)
   (**recommended**) – install DepNav from app stores and receive its updates automatically
 
-- [APK](https://github.com/TimPushkin/DepNav/releases) – download, install, and update DepNav manually
+- [APK](https://github.com/TimPushkin/DepNav/releases) – download, install, and update DepNav
+  manually
 
 Android 5.0 or newer required.
diff --git a/app/src/androidTest/java/ru/spbu/depnav/data/db/AppDatabaseDaoTest.kt b/app/src/androidTest/java/ru/spbu/depnav/data/db/AppDatabaseDaoTest.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/androidTest/java/ru/spbu/depnav/data/db/DatabaseInserts.kt b/app/src/androidTest/java/ru/spbu/depnav/data/db/DatabaseInserts.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 @file:Suppress(
     "MethodOverloading", // Overloading insertAll for different tables
-    "TooManyFunctions" // All these function belong together
+    "TooManyFunctions" // All these functions belong together
 )
 
 package ru.spbu.depnav.data.db
@@ -37,10 +37,8 @@ private fun MarkerText.values() = listOf(markerId, languageId.name, title, descr
 
 @Suppress("ComplexMethod") // Further "simplification" is unreasonable
 private fun createContentValues(columnNames: Array<String>, values: List<Any?>): ContentValues {
-    if (columnNames.size != values.size) {
-        throw IllegalArgumentException(
-            "Expected ${columnNames.size} values, but was ${values.size}"
-        )
+    require(columnNames.size == values.size) {
+        "Expected ${columnNames.size} values, but was ${values.size}"
     }
     return ContentValues().apply {
         for ((col, v) in columnNames.zip(values)) {

diff --git a/app/src/androidTest/java/ru/spbu/depnav/data/db/MapInfoDaoTest.kt b/app/src/androidTest/java/ru/spbu/depnav/data/db/MapInfoDaoTest.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/androidTest/java/ru/spbu/depnav/data/db/MarketWithTextDaoTest.kt b/app/src/androidTest/java/ru/spbu/depnav/data/db/MarketWithTextDaoTest.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/androidTest/java/ru/spbu/depnav/data/db/SearchHistoryDaoTest.kt b/app/src/androidTest/java/ru/spbu/depnav/data/db/SearchHistoryDaoTest.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/DepNavApplication.kt b/app/src/main/java/ru/spbu/depnav/DepNavApplication.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/MainActivity.kt b/app/src/main/java/ru/spbu/depnav/MainActivity.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/db/AppDatabase.kt b/app/src/main/java/ru/spbu/depnav/data/db/AppDatabase.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/db/DatabaseModule.kt b/app/src/main/java/ru/spbu/depnav/data/db/DatabaseModule.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/db/MapInfoDao.kt b/app/src/main/java/ru/spbu/depnav/data/db/MapInfoDao.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/db/MarkerWithTextDao.kt b/app/src/main/java/ru/spbu/depnav/data/db/MarkerWithTextDao.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/db/SearchHistoryDao.kt b/app/src/main/java/ru/spbu/depnav/data/db/SearchHistoryDao.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/model/MapInfo.kt b/app/src/main/java/ru/spbu/depnav/data/model/MapInfo.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/model/Marker.kt b/app/src/main/java/ru/spbu/depnav/data/model/Marker.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/model/MarkerText.kt b/app/src/main/java/ru/spbu/depnav/data/model/MarkerText.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/model/MarkerTextFts.kt b/app/src/main/java/ru/spbu/depnav/data/model/MarkerTextFts.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/model/MarkerTextWithMatchInfo.kt b/app/src/main/java/ru/spbu/depnav/data/model/MarkerTextWithMatchInfo.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/model/SearchHistoryEntry.kt b/app/src/main/java/ru/spbu/depnav/data/model/SearchHistoryEntry.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/repository/MapInfoRepo.kt b/app/src/main/java/ru/spbu/depnav/data/repository/MapInfoRepo.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/repository/MarkerWithTextRepo.kt b/app/src/main/java/ru/spbu/depnav/data/repository/MarkerWithTextRepo.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/data/repository/SearchHistoryRepo.kt b/app/src/main/java/ru/spbu/depnav/data/repository/SearchHistoryRepo.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/NavDestination.kt b/app/src/main/java/ru/spbu/depnav/ui/NavDestination.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/FloorSwitch.kt b/app/src/main/java/ru/spbu/depnav/ui/map/FloorSwitch.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,6 +98,7 @@ fun FloorSwitch(
 
 @Preview
 @Composable
+@Suppress("UnusedPrivateMember")
 private fun FloorSwitchPreview() {
     DepNavTheme {
         FloorSwitch(

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/MapLegendDialog.kt b/app/src/main/java/ru/spbu/depnav/ui/map/MapLegendDialog.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2023  Timofey Pushkin
+ * Copyright (C) 2023  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/MapScreen.kt b/app/src/main/java/ru/spbu/depnav/ui/map/MapScreen.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/MapScreenViewModel.kt b/app/src/main/java/ru/spbu/depnav/ui/map/MapScreenViewModel.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/MarkerInfoLines.kt b/app/src/main/java/ru/spbu/depnav/ui/map/MarkerInfoLines.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/MarkerView.kt b/app/src/main/java/ru/spbu/depnav/ui/map/MarkerView.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -151,6 +151,7 @@ private fun RoomName(name: String, lineTrough: Boolean, modifier: Modifier = Mod
 
 @Preview
 @Composable
+@Suppress("UnusedPrivateMember")
 private fun MarkerIconPreview() {
     DepNavTheme {
         MarkerView(
@@ -163,6 +164,7 @@ private fun MarkerIconPreview() {
 
 @Preview
 @Composable
+@Suppress("UnusedPrivateMember")
 private fun MarkerIconClosedPreview() {
     DepNavTheme {
         MarkerView(
@@ -175,6 +177,7 @@ private fun MarkerIconClosedPreview() {
 
 @Preview
 @Composable
+@Suppress("UnusedPrivateMember")
 private fun RoomIconPreview() {
     DepNavTheme(darkTheme = false) {
         MarkerView(
@@ -187,6 +190,7 @@ private fun RoomIconPreview() {
 
 @Preview
 @Composable
+@Suppress("UnusedPrivateMember")
 private fun RoomIconClosedPreview() {
     DepNavTheme {
         MarkerView(

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/Pin.kt b/app/src/main/java/ru/spbu/depnav/ui/map/Pin.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/SettingsDialog.kt b/app/src/main/java/ru/spbu/depnav/ui/map/SettingsDialog.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/TopButton.kt b/app/src/main/java/ru/spbu/depnav/ui/map/TopButton.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/map/ZoomInHint.kt b/app/src/main/java/ru/spbu/depnav/ui/map/ZoomInHint.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/search/SearchField.kt b/app/src/main/java/ru/spbu/depnav/ui/search/SearchField.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/search/SearchResults.kt b/app/src/main/java/ru/spbu/depnav/ui/search/SearchResults.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/search/SearchScreen.kt b/app/src/main/java/ru/spbu/depnav/ui/search/SearchScreen.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/search/SearchScreenViewModel.kt b/app/src/main/java/ru/spbu/depnav/ui/search/SearchScreenViewModel.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/theme/Color.kt b/app/src/main/java/ru/spbu/depnav/ui/theme/Color.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/ui/theme/Theme.kt b/app/src/main/java/ru/spbu/depnav/ui/theme/Theme.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/utils/preferences/PreferencesManager.kt b/app/src/main/java/ru/spbu/depnav/utils/preferences/PreferencesManager.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/app/src/main/java/ru/spbu/depnav/utils/ranking/Bm25.kt b/app/src/main/java/ru/spbu/depnav/utils/ranking/Bm25.kt
@@ -1,6 +1,6 @@
 /**
  * DepNav -- department navigator.
- * Copyright (C) 2022  Timofey Pushkin
+ * Copyright (C) 2022  Timofei Pushkin
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by