r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Color mode dynamically lightens colors that are too dark to see

Browse Source
This commit is contained in:
Anthony Restaino 2015-03-25 20:51:29 -04:00
parent 0a4f650869
commit ecdf533188
1 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/acr/browser/lightning/BrowserActivity.java
View File

@ -1186,7 +1186,6 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl
} }
mCurrentView = view; mCurrentView = view;
mCurrentView.setForegroundTab(true); mCurrentView.setForegroundTab(true);
mCurrentView.requestFocus();
if (mCurrentView.getWebView() != null) { if (mCurrentView.getWebView() != null) {
updateUrl(mCurrentView.getUrl(), true); updateUrl(mCurrentView.getUrl(), true);
updateProgress(mCurrentView.getProgress()); updateProgress(mCurrentView.getProgress());
@ -1196,6 +1195,7 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl
} }
mBrowserFrame.addView(mCurrentView.getWebView(), mMatchParent); mBrowserFrame.addView(mCurrentView.getWebView(), mMatchParent);
mCurrentView.requestFocus();
mCurrentView.onResume(); mCurrentView.onResume();
// Use a delayed handler to make the transition smooth // Use a delayed handler to make the transition smooth
@ -1444,7 +1444,7 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl
} else { } else {
if (mCurrentView != null) { if (mCurrentView != null) {
Log.d(Constants.TAG, "onBackPressed"); Log.d(Constants.TAG, "onBackPressed");
if (!mCurrentView.getWebView().hasFocus()) { if (mSearch.hasFocus()) {
mCurrentView.requestFocus(); mCurrentView.requestFocus();
} else if (mCurrentView.canGoBack()) { } else if (mCurrentView.canGoBack()) {
if (!mCurrentView.isShown()) { if (!mCurrentView.isShown()) {
@ -1456,7 +1456,7 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl
deleteTab(mDrawerListLeft.getCheckedItemPosition()); deleteTab(mDrawerListLeft.getCheckedItemPosition());
} }
} else { } else {
Log.e(Constants.TAG, "So madness. Much confusion. Why happen."); Log.e(Constants.TAG, "This shouldn't happen ever");
super.onBackPressed(); super.onBackPressed();
} }
} }
@ -1673,31 +1673,71 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl
@Override @Override
public void onGenerated(Palette palette) { public void onGenerated(Palette palette) {
// TODO Auto-generated method stub
int color = 0xff000000 | palette.getVibrantColor(mContext.getResources() int color = 0xff000000 | palette.getVibrantColor(mContext.getResources()
.getColor(R.color.primary_color)); .getColor(R.color.primary_color));
int finalColor; // Lighten up the dark color if it is
// too dark
if (isColorTooDark(color)) {
finalColor = mixTwoColors(
mContext.getResources().getColor(R.color.primary_color), color,
0.25f);
} else {
finalColor = color;
}
ColorDrawable draw = (ColorDrawable) mPageLayout.getBackground(); ColorDrawable draw = (ColorDrawable) mPageLayout.getBackground();
ValueAnimator anim = ValueAnimator.ofObject(new ArgbEvaluator(), ValueAnimator anim = ValueAnimator.ofObject(new ArgbEvaluator(),
draw.getColor(), color); draw.getColor(), finalColor);
anim.addUpdateListener(new AnimatorUpdateListener() { anim.addUpdateListener(new AnimatorUpdateListener() {
@Override @Override
public void onAnimationUpdate(ValueAnimator animation) { public void onAnimationUpdate(ValueAnimator animation) {
mPageLayout.setBackgroundColor((Integer) animation int color = (Integer) animation.getAnimatedValue();
.getAnimatedValue()); mPageLayout.setBackgroundColor(color);
mToolbarLayout.setBackgroundColor((Integer) animation mToolbarLayout.setBackgroundColor(color);
.getAnimatedValue());
} }
}); });
mToolbarLayout.setBackgroundColor(color);
mPageLayout.setBackgroundColor(color); mToolbarLayout.setBackgroundColor(finalColor);
mPageLayout.setBackgroundColor(finalColor);
anim.setDuration(300); anim.setDuration(300);
anim.start(); anim.start();
} }
}); });
} }
public static boolean isColorTooDark(int color) {
final byte RED_CHANNEL = 16;
final byte GREEN_CHANNEL = 8;
final byte BLUE_CHANNEL = 0;
int r = ((int) ((float) (color >> RED_CHANNEL & 0xff) * 0.3f)) & 0xff;
int g = ((int) ((float) (color >> GREEN_CHANNEL & 0xff) * 0.59)) & 0xff;
int b = ((int) ((float) (color >> BLUE_CHANNEL & 0xff) * 0.11)) & 0xff;
int gr = (r + g + b) & 0xff;
int gray = gr + (gr << GREEN_CHANNEL) + (gr << RED_CHANNEL);
return gray < 0x727272;
}
public static int mixTwoColors(int color1, int color2, float amount) {
final byte ALPHA_CHANNEL = 24;
final byte RED_CHANNEL = 16;
final byte GREEN_CHANNEL = 8;
final byte BLUE_CHANNEL = 0;
final float inverseAmount = 1.0f - amount;
int r = ((int) (((float) (color1 >> RED_CHANNEL & 0xff) * amount) + ((float) (color2 >> RED_CHANNEL & 0xff) * inverseAmount))) & 0xff;
int g = ((int) (((float) (color1 >> GREEN_CHANNEL & 0xff) * amount) + ((float) (color2 >> GREEN_CHANNEL & 0xff) * inverseAmount))) & 0xff;
int b = ((int) (((float) (color1 & 0xff) * amount) + ((float) (color2 & 0xff) * inverseAmount))) & 0xff;
return 0xff << ALPHA_CHANNEL | r << RED_CHANNEL | g << GREEN_CHANNEL | b << BLUE_CHANNEL;
}
public class BookmarkViewAdapter extends ArrayAdapter<HistoryItem> { public class BookmarkViewAdapter extends ArrayAdapter<HistoryItem> {
Context context; Context context;