Fix bottom bar icon colors on themes with light primary color (2108dc04) · Commits · e / os / PdfViewer

app/src/main/java/com/gsnathan/pdfviewer/MainActivity.java

+39 −48

Original line number	Diff line number	Diff line
		@@ -33,8 +33,6 @@ import android.content.SharedPreferences;
		import android.content.pm.PackageManager;
		import android.database.Cursor;
		import android.graphics.Color;
		import android.graphics.PorterDuff;
		import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.Environment;
		import android.os.Handler;
		@@ -77,6 +75,7 @@ import org.androidannotations.annotations.EActivity;
		import org.androidannotations.annotations.NonConfigurationInstance;
		import org.androidannotations.annotations.OnActivityResult;
		import org.androidannotations.annotations.ViewById;
		import org.jetbrains.annotations.NotNull;

		import java.io.File;
		import java.io.FileInputStream;
		@@ -241,9 +240,46 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen
		}
		setTitle(pdfFileName);
		hideProgressDialog();
		setBottomBarListeners();
		handler.post(runnable);
		}

		private void setBottomBarListeners() {
		BottomNavigationView bottomView = (BottomNavigationView) findViewById(R.id.bottom_navigation);
		bottomView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
		@Override
		public boolean onNavigationItemSelected(@NonNull MenuItem item) {
		switch (item.getItemId()) {
		case R.id.pickFile:
		pickFile();
		break;
		case R.id.metaFile:
		if (uri != null)
		getMeta();
		break;
		case R.id.unlockFile:
		if (uri != null)
		unlockPDF();
		break;
		case R.id.shareFile:
		if (uri != null)
		shareFile();
		break;
		case R.id.printFile:
		if (uri != null)
		print(pdfFileName,
		new PdfDocumentAdapter(getApplicationContext()),
		new PrintAttributes.Builder().build());
		break;
		default:
		break;

		}
		return false;
		}
		});
		}

		void setPdfViewConfiguration() {
		pdfView.useBestQuality(prefManager.getBoolean("quality_pref", false));
		pdfView.setMidZoom(2.0f);
		@@ -461,53 +497,8 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen
		}

		@Override
		public boolean onCreateOptionsMenu(Menu menu) {
		public boolean onCreateOptionsMenu(@NotNull Menu menu) {
		getMenuInflater().inflate(R.menu.menu, menu);

		BottomNavigationView bot_view = (BottomNavigationView) findViewById(R.id.bottom_navigation);
		Menu bottomMenu = bot_view.getMenu();

		for (int i = 0; i < bottomMenu.size() - 1; i++) {
		Drawable drawable = bottomMenu.getItem(i).getIcon();
		if (drawable != null) {
		drawable.mutate();
		drawable.setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
		}
		}
		bot_view.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
		@Override
		public boolean onNavigationItemSelected(@NonNull MenuItem item) {

		switch (item.getItemId()) {
		case R.id.pickFile:
		pickFile();
		break;
		case R.id.metaFile:
		if (uri != null)
		getMeta();
		break;
		case R.id.unlockFile:
		if (uri != null)
		unlockPDF();
		break;
		case R.id.shareFile:
		if (uri != null)
		shareFile();
		break;
		case R.id.printFile:
		if (uri != null)
		print(pdfFileName,
		new PdfDocumentAdapter(getApplicationContext()),
		new PrintAttributes.Builder().build());
		break;
		default:
		break;

		}

		return false;
		}
		});
		return true;
		}

app/src/main/res/layout/activity_main.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,8 +41,8 @@ tools:context="com.gsnathan.pdfviewer.MainActivity">
		android:layout_gravity="bottom"
		android:background="?android:attr/colorPrimary"
		android:minHeight="?android:attr/actionBarSize"
		app:itemIconTint="@color/colorWhite"
		app:itemTextColor="@color/colorWhite"
		app:itemIconTint="?menuIconColor"
		app:itemTextColor="?menuIconColor"
		app:labelVisibilityMode="unlabeled"
		app:menu="@menu/fab_menu" />