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

Fix Bug #905: Launch activity (night-mode) inverts colour of icons

Browse Source
This commit is contained in:
Aditya Sood 2019-01-18 18:22:20 +05:30 committed by Isaac Hutt
parent 7a3d5f8471
commit 3160ad64ad
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/kiwix/kiwixmobile/main/BooksAdapter.java
View File

@ -1,6 +1,11 @@
/**
* Adapter class for book-items list displayed in the home page webview
* Use LibraryAdapter for list items in the downloads library
* */
package org.kiwix.kiwixmobile.main; package org.kiwix.kiwixmobile.main;
import android.content.Context; import android.content.Context;
import android.graphics.ColorMatrixColorFilter;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.Log; import android.util.Log;
@ -10,9 +15,11 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import org.kiwix.kiwixmobile.KiwixApplication;
import org.kiwix.kiwixmobile.R; import org.kiwix.kiwixmobile.R;
import org.kiwix.kiwixmobile.library.LibraryAdapter; import org.kiwix.kiwixmobile.library.LibraryAdapter;
import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity; import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;
import org.kiwix.kiwixmobile.utils.SharedPreferenceUtil;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.List; import java.util.List;
@ -28,6 +35,7 @@ public class BooksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
private static int TYPE_ITEM = 1; private static int TYPE_ITEM = 1;
private List<LibraryNetworkEntity.Book> books; private List<LibraryNetworkEntity.Book> books;
private OnItemClickListener itemClickListener; private OnItemClickListener itemClickListener;
private final SharedPreferenceUtil sharedPreferenceUtil = new SharedPreferenceUtil(KiwixApplication.getInstance());
interface OnItemClickListener { interface OnItemClickListener {
void openFile(String url); void openFile(String url);
@ -59,9 +67,13 @@ public class BooksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
item.date.setText(book.getDate()); item.date.setText(book.getDate());
item.description.setText(book.getDescription()); item.description.setText(book.getDescription());
item.size.setText(createGbString(book.getSize())); item.size.setText(createGbString(book.getSize()));
item.articleCount.setText(getArticleCountString(item.articleCount.getContext(), item.articleCount.setText(getArticleCountString(item.articleCount.getContext(), book.getArticleCount()));
book.getArticleCount()));
item.icon.setImageBitmap(LibraryAdapter.createBitmapFromEncodedString(book.getFavicon(), item.icon.getContext())); item.icon.setImageBitmap(LibraryAdapter.createBitmapFromEncodedString(book.getFavicon(), item.icon.getContext()));
if(sharedPreferenceUtil.nightMode()) { ////Fix Bug #905: Launch activity (night-mode) inverts colour of icons
item.icon.getDrawable().mutate().setColorFilter(new ColorMatrixColorFilter(KiwixWebView.getNightModeColors()));
}
item.itemView.setOnClickListener(v -> itemClickListener.openFile(book.file.getPath())); item.itemView.setOnClickListener(v -> itemClickListener.openFile(book.file.getPath()));
if (book.file.getPath().contains("nopic")) { if (book.file.getPath().contains("nopic")) {
item.pictureLabel.setVisibility(View.GONE); item.pictureLabel.setVisibility(View.GONE);

4
app/src/main/java/org/kiwix/kiwixmobile/main/KiwixWebView.java
View File

@ -96,6 +96,10 @@ public class KiwixWebView extends WebView {
setLayerType(View.LAYER_TYPE_HARDWARE, paint); setLayerType(View.LAYER_TYPE_HARDWARE, paint);
} }
public static float[] getNightModeColors() {
return NIGHT_MODE_COLORS;
}
@Override @Override
public boolean performLongClick() { public boolean performLongClick() {
HitTestResult result = getHitTestResult(); HitTestResult result = getHitTestResult();

1
gradle.properties
View File

@ -1,4 +1,3 @@
android.enableD8=true android.enableD8=true
android.enableD8.desugaring=true android.enableD8.desugaring=true
org.gradle.configureondemand=false
org.gradle.jvmargs=-Xmx4096m org.gradle.jvmargs=-Xmx4096m