Skip to content

Commit bfa8fed

Browse files
authored
Merge pull request #4491 from kiwix/Fixes#4490
Cleanup codebase.
2 parents 709c181 + ccbe85d commit bfa8fed

File tree

25 files changed

+26
-502
lines changed

25 files changed

+26
-502
lines changed

app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/KiwixWifiP2pBroadcastReceiver.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class KiwixWifiP2pBroadcastReceiver(
5252
val wifiP2pState = intent.getIntExtra(EXTRA_WIFI_STATE, -1)
5353
p2pEventListener.onWifiP2pStateChanged(wifiP2pState == WIFI_P2P_STATE_ENABLED)
5454
}
55+
5556
WIFI_P2P_PEERS_CHANGED_ACTION -> p2pEventListener.onPeersChanged()
5657
WIFI_P2P_CONNECTION_CHANGED_ACTION -> {
5758
val networkInfo =
@@ -67,6 +68,7 @@ class KiwixWifiP2pBroadcastReceiver(
6768
p2pEventListener.onConnectionChanged(networkInfo.isConnected)
6869
}
6970
}
71+
7072
WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> {
7173
val userDevice =
7274
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/online/DownloadBookItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import org.kiwix.kiwixmobile.core.zim_manager.Byte
6262
import org.kiwix.kiwixmobile.ui.BookDescription
6363
import org.kiwix.kiwixmobile.ui.BookIcon
6464
import org.kiwix.kiwixmobile.ui.BookTitle
65-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.LibraryDownloadItem
65+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.LibraryDownloadItem
6666

6767
const val DOWNLOAD_BOOK_ITEM_TESTING_TAG = "downloadBookItemTestingTag"
6868
const val DOWNLOADING_PAUSE_BUTTON_TESTING_TAG = "downloadingPauseButtonTestingTag"

app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/online/OnlineBookItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ import org.kiwix.kiwixmobile.ui.TagsView
6666
import org.kiwix.kiwixmobile.zimManager.Fat32Checker.FileSystemState.CannotWrite4GbFile
6767
import org.kiwix.kiwixmobile.zimManager.Fat32Checker.FileSystemState.DetectingFileSystem
6868
import org.kiwix.kiwixmobile.zimManager.libraryView.AvailableSpaceCalculator
69-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.BookItem
69+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.BookItem
7070

7171
const val ONLINE_BOOK_ITEM_TESTING_TAG = "onlineBookItemTestingTag"
7272
const val ONLINE_BOOK_SIZE_TEXT_TESTING_TAG = "onlineBookSizeTextTestingTag"

app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/online/OnlineLibraryFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ import org.kiwix.kiwixmobile.ui.KiwixDestination
9696
import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel
9797
import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.OnlineLibraryRequest
9898
import org.kiwix.kiwixmobile.zimManager.libraryView.AvailableSpaceCalculator
99-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem
99+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem
100100
import javax.inject.Inject
101101

102102
const val LANGUAGE_MENU_ICON_TESTING_TAG = "languageMenuIconTestingTag"

app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/online/OnlineLibraryScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ import org.kiwix.kiwixmobile.core.utils.ComposeDimens.FOUR_DP
8383
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SIXTEEN_DP
8484
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SIX_DP
8585
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.THREE_DP
86-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem
87-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.DividerItem
86+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem
87+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.DividerItem
8888

8989
const val ONLINE_LIBRARY_SEARCH_VIEW_TESTING_TAG = "onlineLibrarySearchViewTestingTag"
9090
const val ONLINE_LIBRARY_SEARCH_VIEW_CLOSE_BUTTON_TESTING_TAG =

app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/online/OnlineLibraryScreenState.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ package org.kiwix.kiwixmobile.nav.destination.library.online
2121
import androidx.compose.material3.SnackbarHostState
2222
import org.kiwix.kiwixmobile.core.utils.BookUtils
2323
import org.kiwix.kiwixmobile.zimManager.libraryView.AvailableSpaceCalculator
24-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem
25-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.BookItem
26-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.LibraryDownloadItem
24+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem
25+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.BookItem
26+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.LibraryDownloadItem
2727

2828
data class OnlineLibraryScreenState(
2929
/**

app/src/main/java/org/kiwix/kiwixmobile/zimManager/FileWritingFileSystemChecker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class FileWritingFileSystemChecker : FileSystemChecker {
3232
when (val capability = readCapability(resultFile)) {
3333
CAN_WRITE_4GB,
3434
CANNOT_WRITE_4GB -> return capability
35+
3536
else -> {}
3637
}
3738
}
@@ -57,7 +58,7 @@ class FileWritingFileSystemChecker : FileSystemChecker {
5758
private fun readCapability(resultFile: File) =
5859
try {
5960
FileSystemCapability.valueOf(resultFile.readText())
60-
} catch (illegalArgumentException: IllegalArgumentException) {
61+
} catch (_: IllegalArgumentException) {
6162
INCONCLUSIVE
6263
}
6364

app/src/main/java/org/kiwix/kiwixmobile/zimManager/ZimManageViewModel.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ import org.kiwix.kiwixmobile.zimManager.fileselectView.effects.None
111111
import org.kiwix.kiwixmobile.zimManager.fileselectView.effects.OpenFileWithNavigation
112112
import org.kiwix.kiwixmobile.zimManager.fileselectView.effects.ShareFiles
113113
import org.kiwix.kiwixmobile.zimManager.fileselectView.effects.StartMultiSelection
114-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem
115-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.BookItem
116-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.DividerItem
117-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem.LibraryDownloadItem
114+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem
115+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.BookItem
116+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.DividerItem
117+
import org.kiwix.kiwixmobile.zimManager.libraryView.LibraryListItem.LibraryDownloadItem
118118
import org.kiwix.libkiwix.Book
119119
import retrofit2.Response
120120
import java.util.concurrent.TimeUnit.SECONDS
@@ -124,7 +124,6 @@ const val DEFAULT_PROGRESS = 0
124124
const val MAX_PROGRESS = 100
125125

126126
const val THREE = 3
127-
const val FOUR = 4
128127

129128
class ZimManageViewModel @Inject constructor(
130129
private val downloadDao: DownloadRoomDao,

app/src/main/java/org/kiwix/kiwixmobile/zimManager/libraryView/AvailableSpaceCalculator.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import org.kiwix.kiwixmobile.core.dao.DownloadRoomDao
2525
import org.kiwix.kiwixmobile.core.downloader.model.DownloadModel
2626
import org.kiwix.kiwixmobile.core.entity.LibkiwixBook
2727
import org.kiwix.kiwixmobile.core.settings.StorageCalculator
28-
import org.kiwix.kiwixmobile.zimManager.libraryView.adapter.LibraryListItem
2928
import javax.inject.Inject
3029

3130
class AvailableSpaceCalculator @Inject constructor(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.kiwix.kiwixmobile.zimManager.libraryView.adapter
19+
package org.kiwix.kiwixmobile.zimManager.libraryView
2020

2121
import com.tonyodev.fetch2.Error
2222
import com.tonyodev.fetch2.Status

0 commit comments

Comments
 (0)