From 3d43ad151b91f01296d18c214a279fd8049f7632 Mon Sep 17 00:00:00 2001 From: HissPirat Date: Wed, 24 Jun 2020 09:47:23 +0200 Subject: [PATCH] #2147 renamed KiwixMainFragment -> KiwixReaderFragment and removed (FRAGMENT) title string --- app/detekt_baseline.xml | 4 ++-- .../kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt | 4 ++-- .../main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt | 2 +- .../main/{KiwixMainFragment.kt => KiwixReaderFragment.kt} | 2 +- .../org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename app/src/main/java/org/kiwix/kiwixmobile/main/{KiwixMainFragment.kt => KiwixReaderFragment.kt} (99%) diff --git a/app/detekt_baseline.xml b/app/detekt_baseline.xml index 2252b3b5b..0b71972bd 100644 --- a/app/detekt_baseline.xml +++ b/app/detekt_baseline.xml @@ -5,7 +5,7 @@ EmptyFunctionBlock:None.kt$None${ } EmptyFunctionBlock:SimplePageChangeListener.kt$SimplePageChangeListener${ } EmptyFunctionBlock:ZimHostActivity.kt$ZimHostActivity.<no name provided>${} - ForbiddenComment:KiwixMainFragment.kt$KiwixMainFragment$// TODO: Show to user + ForbiddenComment:KiwixReaderFragment.kt$KiwixReaderFragment$// TODO: Show to user LongParameterList:ZimManageViewModel.kt$ZimManageViewModel$( booksOnFileSystem: List<BookOnDisk>, activeDownloads: List<DownloadModel>, allLanguages: List<Language>, libraryNetworkEntity: LibraryNetworkEntity, filter: String, fileSystemState: FileSystemState ) MagicNumber:LibraryListItem.kt$LibraryListItem.LibraryDownloadItem$1000L MagicNumber:ShareFiles.kt$ShareFiles$24 @@ -44,7 +44,7 @@ ReturnCount:Fat32Checker.kt$Fat32Checker$private fun canCreate4GbFile(storage: String): Boolean ReturnCount:LanguageActivity.kt$LanguageActivity$override fun onOptionsItemSelected(item: MenuItem): Boolean TooGenericExceptionCaught:FileWritingFileSystemChecker.kt$FileWritingFileSystemChecker$e: Exception - TooGenericExceptionCaught:KiwixMainFragment.kt$KiwixMainFragment$e: Exception + TooGenericExceptionCaught:KiwixReaderFragment.kt$KiwixReaderFragment$e: Exception TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() ) TooGenericExceptionThrown:LibraryViewHolder.kt$LibraryViewHolder.LibraryBookViewHolder$throw RuntimeException("impossible invalid state: ${item.fileSystemState}") TooGenericExceptionThrown:ZimManageViewModel.kt$ZimManageViewModel$throw RuntimeException("Impossible state") diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt index b7365777c..d0ead37cc 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt @@ -27,7 +27,7 @@ import org.kiwix.kiwixmobile.intro.IntroModule import org.kiwix.kiwixmobile.language.LanguageActivity import org.kiwix.kiwixmobile.local_file_transfer.LocalFileTransferActivity import org.kiwix.kiwixmobile.main.KiwixMainActivity -import org.kiwix.kiwixmobile.main.KiwixMainFragment +import org.kiwix.kiwixmobile.main.KiwixReaderFragment import org.kiwix.kiwixmobile.settings.KiwixSettingsActivity import org.kiwix.kiwixmobile.splash.KiwixSplashActivity import org.kiwix.kiwixmobile.webserver.ZimHostActivity @@ -57,7 +57,7 @@ interface KiwixActivityComponent { fun inject(zimHostActivity: ZimHostActivity) fun inject(introActivity: IntroActivity) fun inject(kiwixSplashActivity: KiwixSplashActivity) - fun inject(kiwixMainFragment: KiwixMainFragment) + fun inject(kiwixMainFragment: KiwixReaderFragment) @Subcomponent.Builder interface Builder { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt index 47e6c5af0..952c85ebd 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt @@ -68,6 +68,6 @@ class KiwixMainActivity : CoreMainActivity() { return } supportFragmentManager.beginTransaction() - .add(R.id.fragment_custom_app_container, KiwixMainFragment()).commit() + .add(R.id.fragment_custom_app_container, KiwixReaderFragment()).commit() } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixReaderFragment.kt similarity index 99% rename from app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt rename to app/src/main/java/org/kiwix/kiwixmobile/main/KiwixReaderFragment.kt index 27bac4e68..82a47635a 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixReaderFragment.kt @@ -53,7 +53,7 @@ import org.kiwix.kiwixmobile.webserver.ZimHostActivity import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity import java.io.File -class KiwixMainFragment : CoreReaderFragment() { +class KiwixReaderFragment : CoreReaderFragment() { override fun inject(baseActivity: BaseActivity) { baseActivity.kiwixActivityComponent.inject(this) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java index 589c95dad..723ecead0 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java @@ -714,7 +714,7 @@ public abstract class CoreReaderFragment extends BaseFragment } private void updateTitle() { - actionBar.setTitle(getValidTitle(zimReaderContainer.getZimFileTitle()) + " (FRAGMENT)"); + actionBar.setTitle(getValidTitle(zimReaderContainer.getZimFileTitle())); } private String getValidTitle(String zimFileTitle) {