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

conflits

Browse Source
This commit is contained in:
ritvik 2020-08-22 12:47:17 +05:30
parent 2208578c4a
commit 364f9314f2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/WifiDirectManager.kt
View File

@ -98,6 +98,7 @@ class WifiDirectManager @Inject constructor(
// Whether the device is the file sender or not // Whether the device is the file sender or not
var isFileSender = false var isFileSender = false
private set private set
private var hasSenderStartedConnection = false private var hasSenderStartedConnection = false
/* Initialisations for using the WiFi P2P API */ /* Initialisations for using the WiFi P2P API */

6
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.kt
View File

@ -98,9 +98,9 @@ class ZimManageActivity : BaseActivity() {
private fun setUpToolbar() { private fun setUpToolbar() {
val toolbar = findViewById<Toolbar>(R.id.toolbar) val toolbar = findViewById<Toolbar>(R.id.toolbar)
setSupportActionBar(toolbar) setSupportActionBar(toolbar)
supportActionBar!!.setHomeButtonEnabled(true) supportActionBar?.setHomeButtonEnabled(true)
supportActionBar!!.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar!!.setTitle(R.string.library) supportActionBar?.setTitle(R.string.library)
toolbar.setNavigationOnClickListener { onBackPressed() } toolbar.setNavigationOnClickListener { onBackPressed() }
toolbar.setOnClickListener { toolbar.setOnClickListener {
if (manageViewPager.currentItem == 1) if (manageViewPager.currentItem == 1)