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

Merge pull request #1639 from kiwix/release/3.1.1

Browse Source 
Release/3.1.1
This commit is contained in:
Seán Mac Gillicuddy 2019-12-11 15:01:47 +00:00 committed by GitHub
commit 246ce26352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 15 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", 0)
set("versionPatch", 1)
}
fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}"

1
app/src/main/AndroidManifest.xml
View File

@ -3,6 +3,7 @@
package="org.kiwix.kiwixmobile">
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<application
android:name=".KiwixApp"

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

@ -128,7 +128,6 @@ import static org.kiwix.kiwixmobile.core.utils.Constants.EXTRA_ZIM_FILE;
import static org.kiwix.kiwixmobile.core.utils.Constants.REQUEST_FILE_SELECT;
import static org.kiwix.kiwixmobile.core.utils.Constants.REQUEST_HISTORY_ITEM_CHOSEN;
import static org.kiwix.kiwixmobile.core.utils.Constants.REQUEST_PREFERENCES;
import static org.kiwix.kiwixmobile.core.utils.Constants.REQUEST_READ_STORAGE_PERMISSION;
import static org.kiwix.kiwixmobile.core.utils.Constants.REQUEST_STORAGE_PERMISSION;
import static org.kiwix.kiwixmobile.core.utils.Constants.REQUEST_WRITE_STORAGE_PERMISSION_ADD_NOTE;
import static org.kiwix.kiwixmobile.core.utils.Constants.RESULT_HISTORY_CLEARED;
@ -1090,15 +1089,9 @@ public abstract class CoreMainActivity extends BaseActivity
if (file != null) {
openZimFile(file);
}
}
break;
}
case REQUEST_READ_STORAGE_PERMISSION: {
if (grantResults.length > 0
&& grantResults[0] == PERMISSION_GRANTED) {
scanStorageForZims();
} else {
}
else {
Snackbar.make(snackbarRoot, R.string.request_storage, Snackbar.LENGTH_LONG)
.setAction(R.string.menu_settings, view -> {
Intent intent = new Intent();

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

@ -27,8 +27,6 @@ public final class Constants {
public static final int REQUEST_STORAGE_PERMISSION = 1;
public static final int REQUEST_READ_STORAGE_PERMISSION = 2;
public static final int REQUEST_WRITE_STORAGE_PERMISSION_ADD_NOTE = 3;
public static final int REQUEST_HISTORY_ITEM_CHOSEN = 99;

4
core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BooksOnDiskViewHolder.kt
View File

@ -19,8 +19,6 @@
package org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import kotlinx.android.synthetic.main.header_language.header_language
import kotlinx.android.synthetic.main.item_book.itemBookCheckbox
import kotlinx.android.synthetic.main.item_book.item_book_article_count
@ -71,7 +69,7 @@ sealed class BookOnDiskViewHolder<in T : BooksOnDiskListItem>(containerView: Vie
item_book_icon.setBitmap(Base64String(book.favicon))
tags.visibility == if (item.tags.isEmpty()) GONE else VISIBLE
tags.visibility = if (item.tags.isEmpty()) View.GONE else View.VISIBLE
tags.render(item.tags)
itemBookCheckbox.isChecked = item.isSelected