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

Removed Comments

Browse Source
This commit is contained in:
s-ayush2903 2020-09-11 02:45:11 +05:30
parent ae75cd1b38
commit 4fb6d60d96
No known key found for this signature in database
GPG Key ID: B4341DD08B2371CB
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
custom/src/main/java/org/kiwix/kiwixmobile/custom/download/CustomDownloadFragment.kt
View File

@ -22,7 +22,6 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable
@ -68,20 +67,9 @@ class CustomDownloadFragment : BaseFragment() {
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View? {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val root = inflater.inflate(R.layout.activity_custom_download, container, false) return inflater.inflate(R.layout.activity_custom_download, container, false)
return root
} }
/**
* Called immediately after [.onCreateView]
* has returned, but before any saved state has been restored in to the view.
* This gives subclasses a chance to initialize themselves once
* they know their view hierarchy has been completely created. The fragment's
* view hierarchy is not however attached to its parent at this point.
* @param view The View returned by [.onCreateView].
* @param savedInstanceState If non-null, this fragment is being re-constructed
* from a previous saved state as given here.
*/
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
val activity = requireActivity() as CoreMainActivity val activity = requireActivity() as CoreMainActivity

13
custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
View File

@ -36,13 +36,11 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.drawerlayout.widget.DrawerLayout import androidx.drawerlayout.widget.DrawerLayout
import org.kiwix.kiwixmobile.core.R2.id.start
import org.kiwix.kiwixmobile.core.base.BaseActivity import org.kiwix.kiwixmobile.core.base.BaseActivity
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super.ShouldCall import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super.ShouldCall
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.navigate import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.navigate
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setupDrawerToggle import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setupDrawerToggle
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.start
import org.kiwix.kiwixmobile.core.main.CoreReaderFragment import org.kiwix.kiwixmobile.core.main.CoreReaderFragment
import org.kiwix.kiwixmobile.core.main.MainMenu import org.kiwix.kiwixmobile.core.main.MainMenu
import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Companion.CONTENT_PREFIX import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Companion.CONTENT_PREFIX
@ -52,7 +50,6 @@ import org.kiwix.kiwixmobile.core.utils.dialog.KiwixDialog
import org.kiwix.kiwixmobile.custom.BuildConfig import org.kiwix.kiwixmobile.custom.BuildConfig
import org.kiwix.kiwixmobile.custom.R import org.kiwix.kiwixmobile.custom.R
import org.kiwix.kiwixmobile.custom.customActivityComponent import org.kiwix.kiwixmobile.custom.customActivityComponent
import org.kiwix.kiwixmobile.custom.download.CustomDownloadFragment
import java.util.Locale import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
@ -136,16 +133,8 @@ class CustomReaderFragment : CoreReaderFragment() {
requestPermissions(arrayOf(READ_EXTERNAL_STORAGE), REQUEST_READ_FOR_OBB) requestPermissions(arrayOf(READ_EXTERNAL_STORAGE), REQUEST_READ_FOR_OBB)
} else { } else {
activity?.finish() activity?.finish()
// trans?.apply { add(R.id.custom_drawer_container, fragment).commit() }
// val manger = activity?.supportFragmentManager
// val trans = manger?.beginTransaction()
// val fragment = CustomDownloadFragment()
// // layoutInflater.inflate(R.layout.activity_custom_download)
// // trans?.apply { add(R.id.custom_drawer_container, fragment).commit() }
// trans?.add(R.id.custom_drawer_container, fragment)
// trans?.commit()
with(activity as AppCompatActivity) { navigate(R.id.customDownloadFragment) } with(activity as AppCompatActivity) { navigate(R.id.customDownloadFragment) }
// activity?.start<CustomDownloadFragment>() // maybe a frag transaction will do the trick?
} }
} }
) )