mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-08-03 10:46:53 -04:00
d5f3a04b6b
# Conflicts: # app/src/main/java/eu/mhutti1/utils/storage/StorageDevice.kt # app/src/main/java/org/kiwix/kiwixmobile/base/BaseContract.java # app/src/main/java/org/kiwix/kiwixmobile/base/BaseFragment.kt # app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarkItem.kt # app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksContract.java # app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksModule.java # app/src/main/java/org/kiwix/kiwixmobile/data/DataModule.java # app/src/main/java/org/kiwix/kiwixmobile/data/local/entity/LibraryDataSource.java # app/src/main/java/org/kiwix/kiwixmobile/data/local/entity/NetworkLanguageSpec.java # app/src/main/java/org/kiwix/kiwixmobile/di/components/ServiceComponent.kt # app/src/main/java/org/kiwix/kiwixmobile/di/modules/ActivityBindingModule.java # app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt # app/src/main/java/org/kiwix/kiwixmobile/di/qualifiers/Computation.java # app/src/main/java/org/kiwix/kiwixmobile/di/qualifiers/IO.java # app/src/main/java/org/kiwix/kiwixmobile/di/qualifiers/MainThread.java # app/src/main/java/org/kiwix/kiwixmobile/downloader/model/Base64String.kt # app/src/main/java/org/kiwix/kiwixmobile/downloader/model/Seconds.kt # app/src/main/java/org/kiwix/kiwixmobile/extensions/BookExtensions.kt # app/src/main/java/org/kiwix/kiwixmobile/extensions/ConnectivityManagerExtensions.kt # app/src/main/java/org/kiwix/kiwixmobile/extensions/ImageViewExtensions.kt # app/src/main/java/org/kiwix/kiwixmobile/extensions/TextViewExtensions.kt # app/src/main/java/org/kiwix/kiwixmobile/extensions/ViewExtensions.kt # app/src/main/java/org/kiwix/kiwixmobile/history/HistoryContract.java # app/src/main/java/org/kiwix/kiwixmobile/history/HistoryModule.java # app/src/main/java/org/kiwix/kiwixmobile/intro/IntroContract.java # app/src/main/java/org/kiwix/kiwixmobile/intro/IntroModule.java # app/src/main/java/org/kiwix/kiwixmobile/intro/IntroPresenter.java # app/src/main/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegate.kt # app/src/main/java/org/kiwix/kiwixmobile/language/adapter/LanguageListItem.kt # app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/Action.kt # app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/State.kt # app/src/main/java/org/kiwix/kiwixmobile/main/MainContract.java # app/src/main/java/org/kiwix/kiwixmobile/main/MainModule.java # app/src/main/java/org/kiwix/kiwixmobile/settings/SettingsContract.java # app/src/main/java/org/kiwix/kiwixmobile/settings/SettingsPresenter.java # app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageContainer.kt # app/src/main/java/org/kiwix/kiwixmobile/utils/UpdateUtils.java # app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostCallbacks.java # app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostContract.java # app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java # app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.java # app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/IpAddressCallbacks.java # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/BaseBroadcastReceiver.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ConnectivityBroadcastReceiver.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/DefaultLanguageProvider.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/KiloByte.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/NetworkState.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SimplePageChangeListener.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SimpleTextListener.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ArticleCount.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserver.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/adapter/BooksOnDiskAdapter.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/None.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/StartMultiSelection.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/LibraryAdapter.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/LibraryListItem.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/base/AdapterDelegate.kt # app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/base/BaseViewHolder.kt # core/src/main/java/org/kiwix/kiwixmobile/core/KiwixViewModelFactory.java # core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java # core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksAdapter.java # core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksPresenter.java # core/src/main/java/org/kiwix/kiwixmobile/core/data/DataSource.java # core/src/main/java/org/kiwix/kiwixmobile/core/data/Repository.kt # core/src/main/java/org/kiwix/kiwixmobile/core/di/ViewModelKey.java # core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ViewModelModule.kt # core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivity.java # core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt # core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ContextExtensions.kt # core/src/main/java/org/kiwix/kiwixmobile/core/help/HelpAdapter.java # core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java # core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryAdapter.java # core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryPresenter.java # core/src/main/java/org/kiwix/kiwixmobile/core/intro/CustomViewPager.java # core/src/main/java/org/kiwix/kiwixmobile/core/intro/IntroActivity.java # core/src/main/java/org/kiwix/kiwixmobile/core/intro/IntroPagerAdapter.java # core/src/main/java/org/kiwix/kiwixmobile/core/language/LanguageActivity.kt # core/src/main/java/org/kiwix/kiwixmobile/core/language/adapter/LanguageListViewHolder.kt # core/src/main/java/org/kiwix/kiwixmobile/core/language/viewmodel/LanguageViewModel.kt # core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.java # core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java # core/src/main/java/org/kiwix/kiwixmobile/core/main/MainActivity.java # core/src/main/java/org/kiwix/kiwixmobile/core/main/MainPresenter.java # core/src/main/java/org/kiwix/kiwixmobile/core/main/OnSwipeTouchListener.java # core/src/main/java/org/kiwix/kiwixmobile/core/newdb/entities/BookOnDiskEntity.kt # core/src/main/java/org/kiwix/kiwixmobile/core/newdb/entities/LanguageEntity.kt # core/src/main/java/org/kiwix/kiwixmobile/core/settings/PrefsFragment.java # core/src/main/java/org/kiwix/kiwixmobile/core/settings/StorageCalculator.kt # core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt # core/src/main/java/org/kiwix/kiwixmobile/core/utils/AnimationUtils.java # core/src/main/java/org/kiwix/kiwixmobile/core/utils/ImageUtils.kt # core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt # core/src/main/java/org/kiwix/kiwixmobile/core/utils/ServerUtils.java # core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.java # core/src/main/java/org/kiwix/kiwixmobile/core/webserver/WebServerHelper.java # core/src/main/java/org/kiwix/kiwixmobile/core/webserver/ZimHostActivity.java # core/src/main/java/org/kiwix/kiwixmobile/core/wifi_hotspot/HotspotNotificationManager.java # core/src/main/java/org/kiwix/kiwixmobile/core/wifi_hotspot/HotspotService.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/Language.kt # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BooksOnDiskListItem.kt # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BooksOnDiskViewHolder.kt # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/effects/ShareFiles.kt # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/library_view/adapter/LibraryViewHolder.kt # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/library_view/adapter/base/AbsDelegateAdapter.kt # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/library_view/adapter/base/AdapterDelegateManager.kt # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/FileItem.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/FileListAdapter.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/KiwixWifiP2pBroadcastReceiver.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/LocalFileTransferActivity.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/WifiDirectManager.java # core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/WifiPeerListAdapter.java # core/src/test/java/org/kiwix/kiwixmobile/core/language/adapter/LanguageDelegateTest.kt # core/src/test/java/org/kiwix/kiwixmobile/core/language/viewmodel/SaveLanguagesAndFinishTest.kt # core/src/test/java/org/kiwix/kiwixmobile/core/settings/StorageCalculatorTest.kt # core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt # core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/StorageObserverTest.kt