kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 03:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1647 from kiwix/release/3.1.2

Browse Source 
Release/3.1.2
This commit is contained in:
Seán Mac Gillicuddy 2019-12-16 15:41:26 +00:00 committed by GitHub
commit 2140797473
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -11,7 +11,7 @@ apply(from = rootProject.file("jacoco.gradle"))
ext {
set("versionMajor", 3)
set("versionMinor", 1)
set("versionPatch", 1)
set("versionPatch", 2)
}
fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}"

12
core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseActivity.kt
View File

@ -17,6 +17,8 @@
*/
package org.kiwix.kiwixmobile.core.base
import android.content.res.Configuration
import android.os.Build
import android.os.Bundle
import androidx.annotation.LayoutRes
import androidx.appcompat.app.AppCompatActivity
@ -49,6 +51,16 @@ abstract class BaseActivity : AppCompatActivity() {
unbinder = ButterKnife.bind(this)
}
// TODO https://issuetracker.google.com/issues/141132133 remove this once appcompat has been fixed
override fun applyOverrideConfiguration(overrideConfiguration: Configuration?) {
if (Build.VERSION.SDK_INT in Build.VERSION_CODES.LOLLIPOP..Build.VERSION_CODES.N_MR1 &&
(resources.configuration.uiMode == applicationContext.resources.configuration.uiMode)
) {
return
}
super.applyOverrideConfiguration(overrideConfiguration)
}
override fun onDestroy() {
super.onDestroy()
unbinder?.unbind()

20
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
View File

@ -494,16 +494,18 @@ public abstract class CoreMainActivity extends BaseActivity
}
protected void hideTabSwitcher() {
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setDisplayShowTitleEnabled(true);
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setDisplayShowTitleEnabled(true);
drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
closeAllTabsButton.setImageDrawable(
ContextCompat.getDrawable(this, R.drawable.ic_close_black_24dp));
tabSwitcherRoot.setVisibility(View.GONE);
progressBar.setVisibility(View.VISIBLE);
contentFrame.setVisibility(View.VISIBLE);
mainMenu.showWebViewOptions(!urlIsInvalid());
drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
closeAllTabsButton.setImageDrawable(
ContextCompat.getDrawable(this, R.drawable.ic_close_black_24dp));
tabSwitcherRoot.setVisibility(View.GONE);
progressBar.setVisibility(View.VISIBLE);
contentFrame.setVisibility(View.VISIBLE);
mainMenu.showWebViewOptions(!urlIsInvalid());
}
}
@OnClick(R2.id.bottom_toolbar_arrow_back)

4
core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchActivity.java
View File

@ -346,6 +346,8 @@ public class SearchActivity extends BaseActivity
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString(EXTRA_SEARCH_TEXT, searchView.getQuery().toString());
if (searchView != null && searchView.getQuery() != null) {
outState.putString(EXTRA_SEARCH_TEXT, searchView.getQuery().toString());
}
}
}