kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 14:52:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

#2147 renamed KiwixMainFragment -> KiwixReaderFragment and removed (FRAGMENT) title string

Browse Source
This commit is contained in:
HissPirat 2020-06-24 09:47:23 +02:00
parent e0c3ec6186
commit 3d43ad151b
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/detekt_baseline.xml
View File

@ -5,7 +5,7 @@
<ID>EmptyFunctionBlock:None.kt$None${ }</ID>
<ID>EmptyFunctionBlock:SimplePageChangeListener.kt$SimplePageChangeListener${ }</ID>
<ID>EmptyFunctionBlock:ZimHostActivity.kt$ZimHostActivity.&lt;no name provided&gt;${}</ID>
<ID>ForbiddenComment:KiwixMainFragment.kt$KiwixMainFragment$// TODO: Show to user</ID>
<ID>ForbiddenComment:KiwixReaderFragment.kt$KiwixReaderFragment$// TODO: Show to user</ID>
<ID>LongParameterList:ZimManageViewModel.kt$ZimManageViewModel$( booksOnFileSystem: List&lt;BookOnDisk&gt;, activeDownloads: List&lt;DownloadModel&gt;, allLanguages: List&lt;Language&gt;, libraryNetworkEntity: LibraryNetworkEntity, filter: String, fileSystemState: FileSystemState )</ID>
<ID>MagicNumber:LibraryListItem.kt$LibraryListItem.LibraryDownloadItem$1000L</ID>
<ID>MagicNumber:ShareFiles.kt$ShareFiles$24</ID>
@ -44,7 +44,7 @@
<ID>ReturnCount:Fat32Checker.kt$Fat32Checker$private fun canCreate4GbFile(storage: String): Boolean</ID>
<ID>ReturnCount:LanguageActivity.kt$LanguageActivity$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
<ID>TooGenericExceptionCaught:FileWritingFileSystemChecker.kt$FileWritingFileSystemChecker$e: Exception</ID>
<ID>TooGenericExceptionCaught:KiwixMainFragment.kt$KiwixMainFragment$e: Exception</ID>
<ID>TooGenericExceptionCaught:KiwixReaderFragment.kt$KiwixReaderFragment$e: Exception</ID>
<ID>TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() )</ID>
<ID>TooGenericExceptionThrown:LibraryViewHolder.kt$LibraryViewHolder.LibraryBookViewHolder$throw RuntimeException("impossible invalid state: ${item.fileSystemState}")</ID>
<ID>TooGenericExceptionThrown:ZimManageViewModel.kt$ZimManageViewModel$throw RuntimeException("Impossible state")</ID>

4
app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt
View File

@ -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 {

2
app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
View File

@ -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()
}
}

2
app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt → app/src/main/java/org/kiwix/kiwixmobile/main/KiwixReaderFragment.kt
View File

@ -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)

2
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
View File

@ -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) {