Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/239159
Change subject: NavigationView: reloaded.
......................................................................
NavigationView: reloaded.
- Updated colors and icons for NavigationView.
- Most of the new icons come directly from the Material Design set.
Therefore I didn't add the SVG for those icons, since they come
pre-generated from Google. I also kept the names of the icons, so that
we can easily reference them in the Material set.
- Moved the Login action into the header view.
- Moved the Logout action into a secondary menu group inside the
NavigationView. Moving it out of the More menu will make the More menu
more easily renameable to Settings.
Bug: T110684
Change-Id: I6326e50e978e42fd9a41024ad361afbbeb2f5b63
---
M app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/settings/SettingsActivity.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
A app/src/main/res/color/nav_item_selector_dark.xml
A app/src/main/res/color/nav_item_selector_light.xml
D app/src/main/res/drawable-hdpi/bookmark_white.png
D app/src/main/res/drawable-hdpi/clock_white.png
D app/src/main/res/drawable-hdpi/dice_white.png
D app/src/main/res/drawable-hdpi/gear_white.png
A app/src/main/res/drawable-hdpi/ic_arrow_drop_down_white_24dp.png
A app/src/main/res/drawable-hdpi/ic_arrow_drop_up_white_24dp.png
A app/src/main/res/drawable-hdpi/ic_dice.png
A app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png
A app/src/main/res/drawable-hdpi/ic_explore_black_24dp.png
A app/src/main/res/drawable-hdpi/ic_history_black_24dp.png
A app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
D app/src/main/res/drawable-hdpi/ic_today.png
A app/src/main/res/drawable-hdpi/ic_turned_in_black_24dp.png
A app/src/main/res/drawable-hdpi/ic_wb_sunny_black_24dp.png
A app/src/main/res/drawable-hdpi/w_nav_mark.png
D app/src/main/res/drawable-ldrtl-hdpi/bookmark_white.png
D app/src/main/res/drawable-ldrtl-hdpi/clock_white.png
D app/src/main/res/drawable-ldrtl-hdpi/dice_white.png
D app/src/main/res/drawable-ldrtl-hdpi/gear_white.png
D app/src/main/res/drawable-ldrtl-hdpi/ic_today.png
D app/src/main/res/drawable-ldrtl-mdpi/bookmark_white.png
D app/src/main/res/drawable-ldrtl-mdpi/clock_white.png
D app/src/main/res/drawable-ldrtl-mdpi/dice_white.png
D app/src/main/res/drawable-ldrtl-mdpi/gear_white.png
D app/src/main/res/drawable-ldrtl-mdpi/ic_today.png
D app/src/main/res/drawable-ldrtl-xhdpi/bookmark_white.png
D app/src/main/res/drawable-ldrtl-xhdpi/clock_white.png
D app/src/main/res/drawable-ldrtl-xhdpi/dice_white.png
D app/src/main/res/drawable-ldrtl-xhdpi/gear_white.png
D app/src/main/res/drawable-ldrtl-xhdpi/ic_today.png
D app/src/main/res/drawable-ldrtl-xxhdpi/bookmark_white.png
D app/src/main/res/drawable-ldrtl-xxhdpi/clock_white.png
D app/src/main/res/drawable-ldrtl-xxhdpi/dice_white.png
D app/src/main/res/drawable-ldrtl-xxhdpi/gear_white.png
D app/src/main/res/drawable-ldrtl-xxhdpi/ic_today.png
D app/src/main/res/drawable-mdpi/bookmark_white.png
D app/src/main/res/drawable-mdpi/clock_white.png
D app/src/main/res/drawable-mdpi/dice_white.png
D app/src/main/res/drawable-mdpi/gear_white.png
A app/src/main/res/drawable-mdpi/ic_arrow_drop_down_white_24dp.png
A app/src/main/res/drawable-mdpi/ic_arrow_drop_up_white_24dp.png
A app/src/main/res/drawable-mdpi/ic_dice.png
A app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png
A app/src/main/res/drawable-mdpi/ic_explore_black_24dp.png
A app/src/main/res/drawable-mdpi/ic_history_black_24dp.png
A app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
D app/src/main/res/drawable-mdpi/ic_today.png
A app/src/main/res/drawable-mdpi/ic_turned_in_black_24dp.png
A app/src/main/res/drawable-mdpi/ic_wb_sunny_black_24dp.png
A app/src/main/res/drawable-mdpi/w_nav_mark.png
D app/src/main/res/drawable-v21/nav_item_background.xml
D app/src/main/res/drawable-xhdpi/bookmark_white.png
D app/src/main/res/drawable-xhdpi/clock_white.png
D app/src/main/res/drawable-xhdpi/dice_white.png
D app/src/main/res/drawable-xhdpi/gear_white.png
A app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_white_24dp.png
A app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_white_24dp.png
A app/src/main/res/drawable-xhdpi/ic_dice.png
A app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png
A app/src/main/res/drawable-xhdpi/ic_explore_black_24dp.png
A app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png
A app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
D app/src/main/res/drawable-xhdpi/ic_today.png
A app/src/main/res/drawable-xhdpi/ic_turned_in_black_24dp.png
A app/src/main/res/drawable-xhdpi/ic_wb_sunny_black_24dp.png
A app/src/main/res/drawable-xhdpi/w_nav_mark.png
D app/src/main/res/drawable-xxhdpi/bookmark_white.png
D app/src/main/res/drawable-xxhdpi/clock_white.png
D app/src/main/res/drawable-xxhdpi/dice_white.png
D app/src/main/res/drawable-xxhdpi/gear_white.png
A app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_dice.png
A app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_explore_black_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
D app/src/main/res/drawable-xxhdpi/ic_today.png
A app/src/main/res/drawable-xxhdpi/ic_turned_in_black_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_wb_sunny_black_24dp.png
A app/src/main/res/drawable-xxhdpi/w_nav_mark.png
A app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_white_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_white_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_explore_black_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_turned_in_black_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_wb_sunny_black_24dp.png
D app/src/main/res/drawable/nav_item_background.xml
M app/src/main/res/layout/activity_page.xml
M app/src/main/res/layout/dialog_reference.xml
M app/src/main/res/layout/dialog_themechooser.xml
M app/src/main/res/layout/inflate_header_nav_drawer.xml
M app/src/main/res/layout/item_nearby_entry.xml
M app/src/main/res/menu/menu_nav_drawer.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
M app/src/main/res/xml/preferences.xml
A icon-svgs/128/w_nav_mark.noflip.svg
D icon-svgs/24/bookmark_white.svg
D icon-svgs/24/clock_white.svg
D icon-svgs/24/dice_white.svg
D icon-svgs/24/gear_white.svg
A icon-svgs/24/ic_dice.noflip.svg
D icon-svgs/32/ic_today.svg
116 files changed, 345 insertions(+), 338 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/59/239159/1
diff --git a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
index 2ae65db..7876e99 100644
--- a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
+++ b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
@@ -8,6 +8,9 @@
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
@@ -26,26 +29,27 @@
public class NavDrawerHelper {
- private static final int[] NAV_DRAWER_ACTION_ITEMS_LOGGED_IN_ONLY = {
- R.id.nav_item_username
- };
-
private final WikipediaApp app = WikipediaApp.getInstance();
- private final PageActivity page;
- private MenuItem usernameContainer;
- private MenuItem loginContainer;
- private MenuItem[] loggedInOnyActionViews = new
MenuItem[NAV_DRAWER_ACTION_ITEMS_LOGGED_IN_ONLY.length];
+ private final PageActivity activity;
private NavMenuFunnel funnel;
+ private TextView accountNameView;
+ private ImageView accountNameArrow;
+ private boolean accountToggle;
- public NavDrawerHelper(@NonNull PageActivity page) {
+ public NavDrawerHelper(@NonNull PageActivity activity) {
this.funnel = new NavMenuFunnel();
- this.page = page;
- page.getSupportFragmentManager().addOnBackStackChangedListener(new
FragmentManager.OnBackStackChangedListener() {
- @Override
- public void onBackStackChanged() {
-
updateItemSelection(NavDrawerHelper.this.page.getTopFragment());
- }
- });
+ this.activity = activity;
+ activity.getSupportFragmentManager()
+ .addOnBackStackChangedListener(new
FragmentManager.OnBackStackChangedListener() {
+ @Override
+ public void onBackStackChanged() {
+
updateItemSelection(NavDrawerHelper.this.activity.getTopFragment());
+ }
+ });
+ accountNameView = (TextView)
activity.getNavDrawer().findViewById(R.id.nav_account_text);
+ accountNameArrow = (ImageView)
activity.getNavDrawer().findViewById(R.id.nav_account_arrow);
+
setLoginOnClick(activity.getNavDrawer().findViewById(R.id.nav_account_container));
+ updateMenuGroupToggle();
}
public NavMenuFunnel getFunnel() {
@@ -53,17 +57,10 @@
}
public void setupDynamicNavDrawerItems() {
- for (int i = 0; i < NAV_DRAWER_ACTION_ITEMS_LOGGED_IN_ONLY.length;
i++) {
- loggedInOnyActionViews[i] =
page.getNavMenu().findItem(NAV_DRAWER_ACTION_ITEMS_LOGGED_IN_ONLY[i]);
- }
-
- if (usernameContainer == null) {
- usernameContainer =
page.getNavMenu().findItem(R.id.nav_item_username);
- loginContainer = page.getNavMenu().findItem(R.id.nav_item_login);
- }
-
updateLoginButtonStatus();
updateWikipediaZeroStatus();
+ accountToggle = false;
+ updateMenuGroupToggle();
}
public NavigationView.OnNavigationItemSelectedListener getNewListener() {
@@ -72,31 +69,30 @@
public boolean onNavigationItemSelected(MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.nav_item_today:
- page.displayMainPageInCurrentTab();
+ activity.displayMainPageInCurrentTab();
funnel.logToday();
break;
case R.id.nav_item_history:
- page.pushFragment(new HistoryFragment());
+ activity.pushFragment(new HistoryFragment());
funnel.logHistory();
break;
case R.id.nav_item_saved_pages:
- page.pushFragment(new SavedPagesFragment());
+ activity.pushFragment(new SavedPagesFragment());
funnel.logSavedPages();
break;
case R.id.nav_item_nearby:
- page.pushFragment(new NearbyFragment());
+ activity.pushFragment(new NearbyFragment());
funnel.logNearby();
break;
case R.id.nav_item_more:
launchSettingsActivity();
funnel.logMore();
break;
- case R.id.nav_item_login:
- launchLoginActivity();
- funnel.logLogin();
+ case R.id.nav_item_logout:
+ logout();
break;
case R.id.nav_item_random:
- page.getRandomHandler().doVisitRandomArticle();
+ activity.getRandomHandler().doVisitRandomArticle();
funnel.logRandom();
break;
default:
@@ -104,24 +100,24 @@
}
clearItemHighlighting();
menuItem.setChecked(true);
- page.setNavItemSelected(true);
+ activity.setNavItemSelected(true);
return true;
}
};
}
public RandomHandler getNewRandomHandler() {
- return new
RandomHandler(page.getNavMenu().findItem(R.id.nav_item_random),
+ return new
RandomHandler(activity.getNavMenu().findItem(R.id.nav_item_random),
new RandomHandler.RandomListener() {
@Override
public void onRandomPageReceived(@Nullable PageTitle
title) {
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_RANDOM);
- page.displayNewPage(title, historyEntry,
PageActivity.TabPosition.CURRENT_TAB, true);
+ activity.displayNewPage(title, historyEntry,
PageActivity.TabPosition.CURRENT_TAB, true);
}
@Override
public void onRandomPageFailed(Throwable caught) {
- FeedbackUtil.showError(page.getContentView(), caught);
+ FeedbackUtil.showError(activity.getContentView(),
caught);
}
});
}
@@ -138,15 +134,42 @@
// Special case: don't highlight today if it's not the main page.
if (id != R.id.nav_item_today || isMainPage()) {
- MenuItem menuItem = page.getNavMenu().findItem(id);
+ MenuItem menuItem = activity.getNavMenu().findItem(id);
menuItem.setChecked(true);
}
}
+ private void toggleAccountMenu() {
+ accountToggle = !accountToggle;
+ updateMenuGroupToggle();
+ }
+
+ private void updateMenuGroupToggle() {
+ activity.getNavMenu().setGroupVisible(R.id.group_main, !accountToggle);
+ activity.getNavMenu().setGroupVisible(R.id.group_user, accountToggle);
+ accountNameArrow.setImageDrawable(accountToggle
+ ?
activity.getResources().getDrawable(R.drawable.ic_arrow_drop_up_white_24dp)
+ :
activity.getResources().getDrawable(R.drawable.ic_arrow_drop_down_white_24dp));
+ }
+
+ private void setLoginOnClick(View view) {
+ view.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (app.getUserInfoStorage().isLoggedIn()) {
+ toggleAccountMenu();
+ } else {
+ launchLoginActivity();
+ funnel.logLogin();
+ }
+ }
+ });
+ }
+
private boolean isMainPage() {
- return page.getCurPageFragment() != null
- && page.getCurPageFragment().getPage() != null
- && page.getCurPageFragment().getPage().isMainPage();
+ return activity.getCurPageFragment() != null
+ && activity.getCurPageFragment().getPage() != null
+ && activity.getCurPageFragment().getPage().isMainPage();
}
@Nullable @IdRes private Integer fragmentToMenuId(Fragment fragment) {
@@ -167,16 +190,9 @@
*/
private void updateLoginButtonStatus() {
if (app.getUserInfoStorage().isLoggedIn()) {
- loginContainer.setVisible(false);
- for (MenuItem loggedInOnyActionView : loggedInOnyActionViews) {
- loggedInOnyActionView.setVisible(true);
- }
-
usernameContainer.setTitle(app.getUserInfoStorage().getUser().getUsername());
+
accountNameView.setText(app.getUserInfoStorage().getUser().getUsername());
} else {
- loginContainer.setVisible(true);
- for (MenuItem loggedInOnyActionView : loggedInOnyActionViews) {
- loggedInOnyActionView.setVisible(false);
- }
+
accountNameView.setText(app.getResources().getString(R.string.nav_item_login));
}
}
@@ -184,7 +200,7 @@
* Add Wikipedia Zero entry to nav menu if W0 is active.
*/
private void updateWikipediaZeroStatus() {
- MenuItem wikipediaZeroText =
page.getNavMenu().findItem(R.id.nav_item_zero);
+ MenuItem wikipediaZeroText =
activity.getNavMenu().findItem(R.id.nav_item_zero);
if (app.getWikipediaZeroHandler().isZeroEnabled()) {
wikipediaZeroText.setTitle(app.getWikipediaZeroHandler().getCarrierMessage().getMsg());
wikipediaZeroText.setVisible(true);
@@ -197,21 +213,29 @@
* Un-highlight all nav menu entries.
*/
private void clearItemHighlighting() {
- for (int i = 0; i < page.getNavMenu().size(); i++) {
- page.getNavMenu().getItem(i).setChecked(false);
+ for (int i = 0; i < activity.getNavMenu().size(); i++) {
+ activity.getNavMenu().getItem(i).setChecked(false);
}
}
private void launchSettingsActivity() {
- page.closeNavDrawer();
- page.startActivityForResult(new Intent().setClass(app,
ApiUtil.hasHoneyComb() ? SettingsActivity.class : SettingsActivityGB.class),
+ activity.closeNavDrawer();
+ activity.startActivityForResult(new Intent().setClass(app,
ApiUtil.hasHoneyComb() ? SettingsActivity.class : SettingsActivityGB.class),
SettingsActivity.ACTIVITY_REQUEST_SHOW_SETTINGS);
}
private void launchLoginActivity() {
- page.closeNavDrawer();
- page.startActivityForResult(new Intent(app, LoginActivity.class)
+ activity.closeNavDrawer();
+ activity.startActivityForResult(new Intent(app, LoginActivity.class)
.putExtra(LoginActivity.LOGIN_REQUEST_SOURCE,
LoginFunnel.SOURCE_NAV),
LoginActivity.REQUEST_LOGIN);
}
+
+ private void logout() {
+ app.getEditTokenStorage().clearAllTokens();
+ app.getCookieManager().clearAllCookies();
+ app.getUserInfoStorage().clearUser();
+ activity.closeNavDrawer();
+ FeedbackUtil.showMessage(activity, R.string.toast_logout_complete);
+ }
}
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index d51ec10..e24226f 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -358,6 +358,7 @@
if (isCabOpen()) {
currentActionMode.finish();
}
+ updateNavDrawerSelection(getTopFragment());
navDrawerHelper.getFunnel().logOpen();
}
@@ -1007,8 +1008,6 @@
private void handleSettingsActivityResult(int resultCode) {
if (languageChanged(resultCode)) {
loadNewLanguageMainPage();
- } else if (logoutSelected(resultCode)) {
- logout();
}
}
@@ -1038,10 +1037,6 @@
return resultCode == SettingsActivity.ACTIVITY_RESULT_LANGUAGE_CHANGED;
}
- private boolean logoutSelected(int resultCode) {
- return resultCode == SettingsActivity.ACTIVITY_RESULT_LOGOUT;
- }
-
/**
* Reload the main page in the new language, after delaying for one second
in order to:
* (1) Make sure that onStart in PageActivity gets called, thus
registering the activity for the bus.
@@ -1068,13 +1063,5 @@
new ComponentName(this, WidgetProviderFeaturedPage.class));
widgetIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
sendBroadcast(widgetIntent);
- }
-
- private void logout() {
- app.getEditTokenStorage().clearAllTokens();
- app.getCookieManager().clearAllCookies();
- app.getUserInfoStorage().clearUser();
- FeedbackUtil.showMessage(this, R.string.toast_logout_complete);
- navDrawerHelper.setupDynamicNavDrawerItems();
}
}
diff --git a/app/src/main/java/org/wikipedia/settings/SettingsActivity.java
b/app/src/main/java/org/wikipedia/settings/SettingsActivity.java
index 46072b0..6054711 100644
--- a/app/src/main/java/org/wikipedia/settings/SettingsActivity.java
+++ b/app/src/main/java/org/wikipedia/settings/SettingsActivity.java
@@ -5,7 +5,6 @@
public class SettingsActivity extends
PlatformSingleFragmentActivity<SettingsFragment> {
public static final int ACTIVITY_REQUEST_SHOW_SETTINGS = 1;
public static final int ACTIVITY_RESULT_LANGUAGE_CHANGED = 1;
- public static final int ACTIVITY_RESULT_LOGOUT = 2;
@Override
public SettingsFragment createFragment() {
diff --git
a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
index 2fd5621..b7041d9 100644
--- a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
+++ b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
@@ -65,20 +65,6 @@
}
});
- Preference logoutPref = findPreference(R.string.preference_key_logout);
- if (!WikipediaApp.getInstance().getUserInfoStorage().isLoggedIn()) {
- logoutPref.setEnabled(false);
-
logoutPref.setSummary(getString(R.string.preference_summary_notloggedin));
- }
- logoutPref.setOnPreferenceClickListener(new
Preference.OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- activity.setResult(SettingsActivity.ACTIVITY_RESULT_LOGOUT);
- activity.finish();
- return true;
- }
- });
-
if (!BuildConfig.APPLICATION_ID.equals("org.wikipedia")) {
overridePackageName();
}
diff --git a/app/src/main/res/color/nav_item_selector_dark.xml
b/app/src/main/res/color/nav_item_selector_dark.xml
new file mode 100644
index 0000000..4e59b19
--- /dev/null
+++ b/app/src/main/res/color/nav_item_selector_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android";>
+ <item android:color="@color/blue_progressive" android:state_checked="true"
/>
+ <item android:color="@color/nav_text_dark" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/nav_item_selector_light.xml
b/app/src/main/res/color/nav_item_selector_light.xml
new file mode 100644
index 0000000..b07f1d8
--- /dev/null
+++ b/app/src/main/res/color/nav_item_selector_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android";>
+ <item android:color="@color/blue_progressive" android:state_checked="true"
/>
+ <item android:color="@color/nav_text_light" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/bookmark_white.png
b/app/src/main/res/drawable-hdpi/bookmark_white.png
deleted file mode 100644
index 726878a..0000000
--- a/app/src/main/res/drawable-hdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/clock_white.png
b/app/src/main/res/drawable-hdpi/clock_white.png
deleted file mode 100644
index 4ee687e..0000000
--- a/app/src/main/res/drawable-hdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/dice_white.png
b/app/src/main/res/drawable-hdpi/dice_white.png
deleted file mode 100644
index 8431e8f..0000000
--- a/app/src/main/res/drawable-hdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/gear_white.png
b/app/src/main/res/drawable-hdpi/gear_white.png
deleted file mode 100644
index c47cc2f..0000000
--- a/app/src/main/res/drawable-hdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_drop_down_white_24dp.png
b/app/src/main/res/drawable-hdpi/ic_arrow_drop_down_white_24dp.png
new file mode 100644
index 0000000..4c6076d
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_drop_down_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_drop_up_white_24dp.png
b/app/src/main/res/drawable-hdpi/ic_arrow_drop_up_white_24dp.png
new file mode 100644
index 0000000..2854c1c
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_drop_up_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_dice.png
b/app/src/main/res/drawable-hdpi/ic_dice.png
new file mode 100644
index 0000000..b4911e2
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_dice.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png
b/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png
new file mode 100644
index 0000000..ad0f63e
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_explore_black_24dp.png
b/app/src/main/res/drawable-hdpi/ic_explore_black_24dp.png
new file mode 100644
index 0000000..f4bc5ac
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_explore_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png
b/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png
new file mode 100644
index 0000000..b74e289
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000..acf1ddf
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_today.png
b/app/src/main/res/drawable-hdpi/ic_today.png
deleted file mode 100644
index 35ea6c9..0000000
--- a/app/src/main/res/drawable-hdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_turned_in_black_24dp.png
b/app/src/main/res/drawable-hdpi/ic_turned_in_black_24dp.png
new file mode 100644
index 0000000..7ad39da
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_turned_in_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_wb_sunny_black_24dp.png
b/app/src/main/res/drawable-hdpi/ic_wb_sunny_black_24dp.png
new file mode 100644
index 0000000..ba7eb43
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_wb_sunny_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/w_nav_mark.png
b/app/src/main/res/drawable-hdpi/w_nav_mark.png
new file mode 100644
index 0000000..59710a5
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/bookmark_white.png
b/app/src/main/res/drawable-ldrtl-hdpi/bookmark_white.png
deleted file mode 100644
index 1eff360..0000000
--- a/app/src/main/res/drawable-ldrtl-hdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/clock_white.png
b/app/src/main/res/drawable-ldrtl-hdpi/clock_white.png
deleted file mode 100644
index 8decb03..0000000
--- a/app/src/main/res/drawable-ldrtl-hdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/dice_white.png
b/app/src/main/res/drawable-ldrtl-hdpi/dice_white.png
deleted file mode 100644
index e2e0457..0000000
--- a/app/src/main/res/drawable-ldrtl-hdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/gear_white.png
b/app/src/main/res/drawable-ldrtl-hdpi/gear_white.png
deleted file mode 100644
index bff4170..0000000
--- a/app/src/main/res/drawable-ldrtl-hdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/ic_today.png
b/app/src/main/res/drawable-ldrtl-hdpi/ic_today.png
deleted file mode 100644
index 7e56f29..0000000
--- a/app/src/main/res/drawable-ldrtl-hdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/bookmark_white.png
b/app/src/main/res/drawable-ldrtl-mdpi/bookmark_white.png
deleted file mode 100644
index 3867442..0000000
--- a/app/src/main/res/drawable-ldrtl-mdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/clock_white.png
b/app/src/main/res/drawable-ldrtl-mdpi/clock_white.png
deleted file mode 100644
index 080733b..0000000
--- a/app/src/main/res/drawable-ldrtl-mdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/dice_white.png
b/app/src/main/res/drawable-ldrtl-mdpi/dice_white.png
deleted file mode 100644
index 9e7e8ef..0000000
--- a/app/src/main/res/drawable-ldrtl-mdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/gear_white.png
b/app/src/main/res/drawable-ldrtl-mdpi/gear_white.png
deleted file mode 100644
index 13621cd..0000000
--- a/app/src/main/res/drawable-ldrtl-mdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/ic_today.png
b/app/src/main/res/drawable-ldrtl-mdpi/ic_today.png
deleted file mode 100644
index e7ef47c..0000000
--- a/app/src/main/res/drawable-ldrtl-mdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/bookmark_white.png
b/app/src/main/res/drawable-ldrtl-xhdpi/bookmark_white.png
deleted file mode 100644
index 990ab45..0000000
--- a/app/src/main/res/drawable-ldrtl-xhdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/clock_white.png
b/app/src/main/res/drawable-ldrtl-xhdpi/clock_white.png
deleted file mode 100644
index 8976a36..0000000
--- a/app/src/main/res/drawable-ldrtl-xhdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/dice_white.png
b/app/src/main/res/drawable-ldrtl-xhdpi/dice_white.png
deleted file mode 100644
index 44eaa33..0000000
--- a/app/src/main/res/drawable-ldrtl-xhdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/gear_white.png
b/app/src/main/res/drawable-ldrtl-xhdpi/gear_white.png
deleted file mode 100644
index 3a67d0c..0000000
--- a/app/src/main/res/drawable-ldrtl-xhdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/ic_today.png
b/app/src/main/res/drawable-ldrtl-xhdpi/ic_today.png
deleted file mode 100644
index d683690..0000000
--- a/app/src/main/res/drawable-ldrtl-xhdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/bookmark_white.png
b/app/src/main/res/drawable-ldrtl-xxhdpi/bookmark_white.png
deleted file mode 100644
index ce14b75..0000000
--- a/app/src/main/res/drawable-ldrtl-xxhdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/clock_white.png
b/app/src/main/res/drawable-ldrtl-xxhdpi/clock_white.png
deleted file mode 100644
index 4561ea9..0000000
--- a/app/src/main/res/drawable-ldrtl-xxhdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/dice_white.png
b/app/src/main/res/drawable-ldrtl-xxhdpi/dice_white.png
deleted file mode 100644
index efdf6a0..0000000
--- a/app/src/main/res/drawable-ldrtl-xxhdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/gear_white.png
b/app/src/main/res/drawable-ldrtl-xxhdpi/gear_white.png
deleted file mode 100644
index 7b4dddc..0000000
--- a/app/src/main/res/drawable-ldrtl-xxhdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_today.png
b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_today.png
deleted file mode 100644
index b33cb6d..0000000
--- a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/bookmark_white.png
b/app/src/main/res/drawable-mdpi/bookmark_white.png
deleted file mode 100644
index 179e665..0000000
--- a/app/src/main/res/drawable-mdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/clock_white.png
b/app/src/main/res/drawable-mdpi/clock_white.png
deleted file mode 100644
index c83491b..0000000
--- a/app/src/main/res/drawable-mdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/dice_white.png
b/app/src/main/res/drawable-mdpi/dice_white.png
deleted file mode 100644
index 8e60ea3..0000000
--- a/app/src/main/res/drawable-mdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/gear_white.png
b/app/src/main/res/drawable-mdpi/gear_white.png
deleted file mode 100644
index e5f0e11..0000000
--- a/app/src/main/res/drawable-mdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_drop_down_white_24dp.png
b/app/src/main/res/drawable-mdpi/ic_arrow_drop_down_white_24dp.png
new file mode 100644
index 0000000..4046a74
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_drop_down_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_drop_up_white_24dp.png
b/app/src/main/res/drawable-mdpi/ic_arrow_drop_up_white_24dp.png
new file mode 100644
index 0000000..1677136
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_drop_up_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_dice.png
b/app/src/main/res/drawable-mdpi/ic_dice.png
new file mode 100644
index 0000000..973332b
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_dice.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png
b/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png
new file mode 100644
index 0000000..dee407b
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_explore_black_24dp.png
b/app/src/main/res/drawable-mdpi/ic_explore_black_24dp.png
new file mode 100644
index 0000000..3c9da64
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_explore_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png
b/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png
new file mode 100644
index 0000000..e77a077
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000..c59419c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_today.png
b/app/src/main/res/drawable-mdpi/ic_today.png
deleted file mode 100644
index 04464b0..0000000
--- a/app/src/main/res/drawable-mdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_turned_in_black_24dp.png
b/app/src/main/res/drawable-mdpi/ic_turned_in_black_24dp.png
new file mode 100644
index 0000000..0a10c24
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_turned_in_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_wb_sunny_black_24dp.png
b/app/src/main/res/drawable-mdpi/ic_wb_sunny_black_24dp.png
new file mode 100644
index 0000000..7e681cd
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_wb_sunny_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/w_nav_mark.png
b/app/src/main/res/drawable-mdpi/w_nav_mark.png
new file mode 100644
index 0000000..a5e1fe3
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/main/res/drawable-v21/nav_item_background.xml
b/app/src/main/res/drawable-v21/nav_item_background.xml
deleted file mode 100644
index 40601e2..0000000
--- a/app/src/main/res/drawable-v21/nav_item_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android";
- android:color="@color/nav_item_highlight">
- <item>
- <selector xmlns:android="http://schemas.android.com/apk/res/android";>
- <item android:state_checked="true"
android:drawable="@color/nav_item_highlight" />
- <item android:state_pressed="true"
android:drawable="@color/nav_background" />
- <item android:drawable="@android:color/transparent" />
- </selector>
- </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/bookmark_white.png
b/app/src/main/res/drawable-xhdpi/bookmark_white.png
deleted file mode 100644
index b2698f1..0000000
--- a/app/src/main/res/drawable-xhdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/clock_white.png
b/app/src/main/res/drawable-xhdpi/clock_white.png
deleted file mode 100644
index b7ac85a..0000000
--- a/app/src/main/res/drawable-xhdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/dice_white.png
b/app/src/main/res/drawable-xhdpi/dice_white.png
deleted file mode 100644
index 7d6c1b1..0000000
--- a/app/src/main/res/drawable-xhdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/gear_white.png
b/app/src/main/res/drawable-xhdpi/gear_white.png
deleted file mode 100644
index 5f61f5b..0000000
--- a/app/src/main/res/drawable-xhdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_white_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_white_24dp.png
new file mode 100644
index 0000000..da239e4
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_white_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_white_24dp.png
new file mode 100644
index 0000000..709805d
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_up_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_dice.png
b/app/src/main/res/drawable-xhdpi/ic_dice.png
new file mode 100644
index 0000000..576a26e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_dice.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png
new file mode 100644
index 0000000..5a536d5
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_explore_black_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_explore_black_24dp.png
new file mode 100644
index 0000000..2dbd112
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_explore_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png
new file mode 100644
index 0000000..8e44d94
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000..e84e188
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_today.png
b/app/src/main/res/drawable-xhdpi/ic_today.png
deleted file mode 100644
index a8e562b..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_turned_in_black_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_turned_in_black_24dp.png
new file mode 100644
index 0000000..5d71bf2
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_turned_in_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_wb_sunny_black_24dp.png
b/app/src/main/res/drawable-xhdpi/ic_wb_sunny_black_24dp.png
new file mode 100644
index 0000000..8bc18c7
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_wb_sunny_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/w_nav_mark.png
b/app/src/main/res/drawable-xhdpi/w_nav_mark.png
new file mode 100644
index 0000000..42c6211
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/w_nav_mark.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/bookmark_white.png
b/app/src/main/res/drawable-xxhdpi/bookmark_white.png
deleted file mode 100644
index 92ddd3d..0000000
--- a/app/src/main/res/drawable-xxhdpi/bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/clock_white.png
b/app/src/main/res/drawable-xxhdpi/clock_white.png
deleted file mode 100644
index 7dc2644..0000000
--- a/app/src/main/res/drawable-xxhdpi/clock_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/dice_white.png
b/app/src/main/res/drawable-xxhdpi/dice_white.png
deleted file mode 100644
index ddf53ea..0000000
--- a/app/src/main/res/drawable-xxhdpi/dice_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/gear_white.png
b/app/src/main/res/drawable-xxhdpi/gear_white.png
deleted file mode 100644
index b7dc378..0000000
--- a/app/src/main/res/drawable-xxhdpi/gear_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white_24dp.png
new file mode 100644
index 0000000..c19c19d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white_24dp.png
new file mode 100644
index 0000000..c2b9642
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_up_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_dice.png
b/app/src/main/res/drawable-xxhdpi/ic_dice.png
new file mode 100644
index 0000000..6a498f1
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_dice.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png
new file mode 100644
index 0000000..53b79d4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_explore_black_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_explore_black_24dp.png
new file mode 100644
index 0000000..11d4c89
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_explore_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png
new file mode 100644
index 0000000..18519ee
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000..3023ff8
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_today.png
b/app/src/main/res/drawable-xxhdpi/ic_today.png
deleted file mode 100644
index df2b45b..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_today.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_turned_in_black_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_turned_in_black_24dp.png
new file mode 100644
index 0000000..2189be3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_turned_in_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_wb_sunny_black_24dp.png
b/app/src/main/res/drawable-xxhdpi/ic_wb_sunny_black_24dp.png
new file mode 100644
index 0000000..7143e7d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_wb_sunny_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/w_nav_mark.png
b/app/src/main/res/drawable-xxhdpi/w_nav_mark.png
new file mode 100644
index 0000000..da903c3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/w_nav_mark.png
Binary files differ
diff --git
a/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_white_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_white_24dp.png
new file mode 100644
index 0000000..452e502
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_white_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_white_24dp.png
new file mode 100644
index 0000000..3d1b812
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_up_white_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png
new file mode 100644
index 0000000..e30632b
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_explore_black_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_explore_black_24dp.png
new file mode 100644
index 0000000..684d282
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_explore_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png
new file mode 100644
index 0000000..8a19815
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000..476d5c9
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_turned_in_black_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_turned_in_black_24dp.png
new file mode 100644
index 0000000..2b90acd
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_turned_in_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_wb_sunny_black_24dp.png
b/app/src/main/res/drawable-xxxhdpi/ic_wb_sunny_black_24dp.png
new file mode 100644
index 0000000..df5443e
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_wb_sunny_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable/nav_item_background.xml
b/app/src/main/res/drawable/nav_item_background.xml
deleted file mode 100644
index b66d346..0000000
--- a/app/src/main/res/drawable/nav_item_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android";>
- <item android:state_checked="true"
android:drawable="@color/nav_item_highlight" />
- <item android:state_pressed="true"
android:drawable="@color/nav_item_highlight" />
- <item android:drawable="@android:color/transparent" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_page.xml
b/app/src/main/res/layout/activity_page.xml
index bfe7e12..d62e1ed 100644
--- a/app/src/main/res/layout/activity_page.xml
+++ b/app/src/main/res/layout/activity_page.xml
@@ -171,11 +171,10 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
- android:background="@color/nav_background"
+ android:background="?attr/nav_background_color"
app:menu="@menu/menu_nav_drawer"
- app:itemBackground="@drawable/nav_item_background"
- app:itemTextColor="@color/nav_text"
- app:itemIconTint="@color/nav_text"
+ app:itemTextColor="?attr/nav_item_color"
+ app:itemIconTint="?attr/nav_item_color"
app:headerLayout="@layout/inflate_header_nav_drawer"/>
</org.wikipedia.views.WikiDrawerLayout>
diff --git a/app/src/main/res/layout/dialog_reference.xml
b/app/src/main/res/layout/dialog_reference.xml
index 37abf35..24c612a 100644
--- a/app/src/main/res/layout/dialog_reference.xml
+++ b/app/src/main/res/layout/dialog_reference.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/nav_background"
+ android:background="@color/ref_background"
android:orientation="vertical">
<View android:layout_width="match_parent" android:layout_height="0.5dp"
android:background="@color/nav_border" />
diff --git a/app/src/main/res/layout/dialog_themechooser.xml
b/app/src/main/res/layout/dialog_themechooser.xml
index 838ae61..16160c9 100644
--- a/app/src/main/res/layout/dialog_themechooser.xml
+++ b/app/src/main/res/layout/dialog_themechooser.xml
@@ -9,7 +9,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/nav_background">
+ android:background="@color/ref_background">
<View android:layout_width="match_parent"
android:layout_height="0.5dp" android:background="@color/nav_border" />
diff --git a/app/src/main/res/layout/inflate_header_nav_drawer.xml
b/app/src/main/res/layout/inflate_header_nav_drawer.xml
index 935a6f9..cdf67c4 100644
--- a/app/src/main/res/layout/inflate_header_nav_drawer.xml
+++ b/app/src/main/res/layout/inflate_header_nav_drawer.xml
@@ -1,11 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:tools="http://schemas.android.com/tools";
+ android:layout_width="match_parent"
+ android:layout_height="150dp"
+ android:background="@color/blue_progressive">
+ <ImageView
+ android:layout_width="72dp"
+ android:layout_height="72dp"
+ android:layout_margin="16dp"
+ android:src="@drawable/w_nav_mark"
+ android:contentDescription="@null" />
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android";
- android:layout_width="175dp"
- android:layout_height="wrap_content"
- android:paddingLeft="12dp"
- android:paddingRight="12dp"
- android:paddingTop="42dp"
- android:paddingBottom="24dp"
- android:src="@drawable/nav_drawer_wordmark"
- android:contentDescription="@null" />
\ No newline at end of file
+ <LinearLayout
+ android:id="@+id/nav_account_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|end"
+ android:clickable="true"
+ android:background="?attr/selectableItemBackground">
+ <TextView
+ android:id="@+id/nav_account_text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_gravity="center_vertical"
+ android:textColor="@android:color/white"
+ android:textStyle="bold"
+ tools:text="Sample account name"/>
+ <ImageView
+ android:id="@+id/nav_account_arrow"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_margin="4dp"
+ android:scaleType="center"
+ android:src="@drawable/ic_arrow_drop_down_white_24dp"
+ android:tint="@android:color/white"
+ android:contentDescription="@null" />
+ </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_nearby_entry.xml
b/app/src/main/res/layout/item_nearby_entry.xml
index cdc60c6..8f6be6b 100644
--- a/app/src/main/res/layout/item_nearby_entry.xml
+++ b/app/src/main/res/layout/item_nearby_entry.xml
@@ -63,7 +63,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:background="@drawable/button_shape_gray_highlight"
- android:textColor="@color/nav_text"
+ android:textColor="@android:color/white"
tools:text="4.2 km"
/>
</LinearLayout>
diff --git a/app/src/main/res/menu/menu_nav_drawer.xml
b/app/src/main/res/menu/menu_nav_drawer.xml
index f78b0eb..a7482c2 100644
--- a/app/src/main/res/menu/menu_nav_drawer.xml
+++ b/app/src/main/res/menu/menu_nav_drawer.xml
@@ -2,39 +2,38 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:tools="http://schemas.android.com/tools";>
- <item android:id="@+id/nav_item_login"
- android:title="@string/nav_item_login"
- android:icon="@drawable/face_sleep_white"
- />
- <item android:id="@+id/nav_item_username"
- android:icon="@drawable/face_smile_white"
- android:title=""
- tools:title="Sample user name"
- />
- <item android:id="@+id/nav_item_today"
- android:title="@string/nav_item_today"
- android:icon="@drawable/ic_today"
- android:checkable="true"
- />
- <item android:id="@+id/nav_item_history"
- android:title="@string/nav_item_history"
- android:icon="@drawable/clock_white"
- android:checkable="true"
- />
- <item android:id="@+id/nav_item_saved_pages"
- android:title="@string/nav_item_saved_pages"
- android:icon="@drawable/bookmark_white"
- android:checkable="true"
- />
- <item android:id="@+id/nav_item_nearby"
- android:title="@string/nav_item_nearby"
- android:icon="@drawable/ic_place_dark"
- android:checkable="true"
- />
- <item android:id="@+id/nav_item_random"
- android:title="@string/nav_item_random"
- android:icon="@drawable/dice_white"
- />
+ <group android:id="@+id/group_main">
+ <item android:id="@+id/nav_item_today"
+ android:title="@string/nav_item_today"
+ android:icon="@drawable/ic_wb_sunny_black_24dp"
+ android:checkable="true"
+ />
+ <item android:id="@+id/nav_item_history"
+ android:title="@string/nav_item_history"
+ android:icon="@drawable/ic_history_black_24dp"
+ android:checkable="true"
+ />
+ <item android:id="@+id/nav_item_saved_pages"
+ android:title="@string/nav_item_saved_pages"
+ android:icon="@drawable/ic_turned_in_black_24dp"
+ android:checkable="true"
+ />
+ <item android:id="@+id/nav_item_nearby"
+ android:title="@string/nav_item_nearby"
+ android:icon="@drawable/ic_explore_black_24dp"
+ android:checkable="true"
+ />
+ <item android:id="@+id/nav_item_random"
+ android:title="@string/nav_item_random"
+ android:icon="@drawable/ic_dice"
+ />
+ </group>
+ <group android:id="@+id/group_user">
+ <item android:id="@+id/nav_item_logout"
+ android:title="@string/preference_title_logout"
+ android:icon="@drawable/ic_exit_to_app_black_24dp"
+ />
+ </group>
<group android:id="@+id/group_zero">
<item android:id="@+id/nav_item_zero"
android:title=""
@@ -44,6 +43,6 @@
<group android:id="@+id/group_more">
<item android:id="@+id/nav_item_more"
android:title="@string/more_item_preferences"
- android:icon="@drawable/gear_white" />
+ android:icon="@drawable/ic_settings_black_24dp" />
</group>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml
b/app/src/main/res/values/attrs.xml
index 00b9a8a..203a71f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -23,6 +23,8 @@
<attr name="link_preview_toolbar_color" format="reference"/>
<attr name="link_preview_background_color" format="reference"/>
<attr name="link_preview_text_color" format="reference"/>
+ <attr name="nav_background_color" format="reference"/>
+ <attr name="nav_item_color" format="reference"/>
<declare-styleable name="CabSearchView">
<attr name="cabEnabled" format="boolean" />
diff --git a/app/src/main/res/values/colors.xml
b/app/src/main/res/values/colors.xml
index e88170c..66e6894 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="nav_background">#ff0C0C0C</color>
- <color name="nav_text">#ffffffff</color>
- <color name="nav_item_highlight">#ff404040</color>
+ <color name="ref_background">#ff0C0C0C</color>
<color name="nav_border">#ff505050</color>
<color name="license_text_light">#A0A0A0</color>
<color name="actionbar_disabled">#A0A0A0</color>
@@ -54,6 +52,8 @@
<color name="link_preview_background_light">#f0f0f0</color>
<color name="link_preview_text_light">#505050</color>
<color
name="link_preview_button_background_highlight">@color/ripple_material_light</color>
+ <color name="nav_background_light">#fff0f0f0</color>
+ <color name="nav_text_light">#ff303030</color>
<color name="link_dark">#ff2B6FB2</color>
<color name="button_dark">#ff2B6FB2</color>
@@ -73,6 +73,8 @@
<color name="link_preview_toolbar_dark">#606060</color>
<color name="link_preview_background_dark">#303030</color>
<color name="link_preview_text_dark">#d0d0d0</color>
+ <color name="nav_background_dark">#ff303030</color>
+ <color name="nav_text_dark">#ffd0d0d0</color>
<color name="list_item_highlight">#60808080</color>
<color name="list_item_selected">#20808080</color>
diff --git a/app/src/main/res/values/preference_keys.xml
b/app/src/main/res/values/preference_keys.xml
index e01857e..dc84df0 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -10,7 +10,6 @@
<string
name="preference_key_eventlogging_opt_in">eventlogging_opt_in</string>
<string name="preference_key_version">app_version</string>
<string name="preference_key_feedback">send_feedback</string>
- <string name="preference_key_logout">log_out</string>
<string
name="preference_key_reading_app_install_id">readingAppInstallID</string>
<string
name="preference_key_text_size_multiplier">textSizeMultiplier</string>
<string name="preference_key_color_theme">colorTheme</string>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 4b1871c..50880ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,7 @@
<string name="title_captcha">Enter CAPTCHA</string>
<string name="edit_section_captcha_reload">Tap CAPTCHA to reload</string>
<string name="edit_saved_page_refresh">This saved page may be out of date,
and must be refreshed for editing to be enabled. Would you like to refresh the
page?</string>
- <string name="nav_item_login">Log in</string>
+ <string name="nav_item_login">Log in to Wikipedia</string>
<string name="login_username_hint">Username</string>
<string name="login_password_hint">Password</string>
<string name="login_password_show_check">Display password</string>
diff --git a/app/src/main/res/values/styles_dark.xml
b/app/src/main/res/values/styles_dark.xml
index c79c2f1..cec2256 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -38,6 +38,8 @@
<item
name="link_preview_toolbar_color">@color/link_preview_toolbar_dark</item>
<item
name="link_preview_background_color">@color/link_preview_background_dark</item>
<item
name="link_preview_text_color">@color/link_preview_text_dark</item>
+ <item name="nav_background_color">@color/nav_background_dark</item>
+ <item name="nav_item_color">@color/nav_item_selector_dark</item>
</style>
<style name="NoTitleDark" parent="@style/Theme.Dark">
diff --git a/app/src/main/res/values/styles_light.xml
b/app/src/main/res/values/styles_light.xml
index 66b3bb9..1359a7c 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -38,6 +38,8 @@
<item
name="link_preview_toolbar_color">@color/link_preview_toolbar_light</item>
<item
name="link_preview_background_color">@color/link_preview_background_light</item>
<item
name="link_preview_text_color">@color/link_preview_text_light</item>
+ <item name="nav_background_color">@color/nav_background_light</item>
+ <item name="nav_item_color">@color/nav_item_selector_light</item>
</style>
</resources>
diff --git a/app/src/main/res/xml/preferences.xml
b/app/src/main/res/xml/preferences.xml
index 3c1967d..2dedbb8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -18,10 +18,6 @@
android:title="@string/preference_title_show_images"
android:summary="@string/preference_summary_show_images"
/>
- <org.wikipedia.settings.PreferenceMultiLine
- android:key="@string/preference_key_logout"
- android:title="@string/preference_title_logout"
- android:summary="@string/preference_summary_logout"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/zero_wikipedia_zero_heading">
<org.wikipedia.settings.CheckBoxPreferenceMultiLine
diff --git a/icon-svgs/128/w_nav_mark.noflip.svg
b/icon-svgs/128/w_nav_mark.noflip.svg
new file mode 100644
index 0000000..435f783
--- /dev/null
+++ b/icon-svgs/128/w_nav_mark.noflip.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:sketch="http://www.bohemiancoding.com/sketch/ns";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="19.594877"
+ height="19.594877"
+ viewBox="0 0 19.594877 19.594877"
+ version="1.1"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="w_nav_mark.svg">
+ <metadata
+ id="metadata17">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Imported Layers</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1380"
+ inkscape:window-height="949"
+ id="namedview15"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="16.166667"
+ inkscape:cx="11.210965"
+ inkscape:cy="11.378065"
+ inkscape:window-x="279"
+ inkscape:window-y="51"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2" />
+ <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch
-->
+ <title
+ id="title4">Imported Layers</title>
+ <desc
+ id="desc6">Created with Sketch.</desc>
+ <defs
+ id="defs8" />
+ <circle
+
style="fill:#000000;fill-opacity:0.1254902;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path4145"
+ cx="9.7974386"
+ cy="9.7974386"
+ r="9.7974386"
+ inkscape:export-xdpi="918.60742"
+ inkscape:export-ydpi="918.60742" />
+ <g
+ id="Page-1"
+ sketch:type="MSPage"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1"
+ transform="matrix(0.34900212,0,0,0.34900212,3.3639446,6.5479281)">
+ <g
+ id="Logged-in"
+ sketch:type="MSArtboardGroup"
+ transform="translate(-31,-65)"
+ style="fill:#ffffff">
+ <g
+ id="drawer-bg-+-account-switcher"
+ sketch:type="MSLayerGroup"
+ transform="translate(1,0)"
+ style="fill:#ffffff">
+ <g
+ id="account-switcher"
+ sketch:type="MSShapeGroup"
+ style="fill:#ffffff">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 65.952522,66.384345 c 0,0.133431 -0.03924,-0.756696
-0.117809,-0.646824 -0.07857,0.102054 -0.164974,0.15699 -0.26713,0.15699
-0.785635,0.0785 -1.437809,0.329618 -1.932731,0.761393 -0.502852,0.431671
-1.021356,1.255818 -1.555617,2.464519 L 53.916,87.486829 c -0.05499,0.172627
-0.204313,0.259045 -0.447861,0.259045 -0.196382,0 -0.337878,-0.08631
-0.447861,-0.259045 l -4.572626,-9.55212 -5.264035,9.559939 c
-0.109982,0.172627 -0.259304,0.259044 -0.447861,0.259044 -0.235721,0
-0.392869,-0.08631 -0.463512,-0.259044 L 34.25833,69.128241 c
-0.502852,-1.138128 -1.029286,-1.938716 -1.587026,-2.386024 -0.550017,-0.45523
-1.327826,-0.729911 -2.317774,-0.839783 -0.0864,0 -0.164974,-0.04712
-0.243547,-0.133431 C 30.031409,65.682689 30,65.572817 30,65.462945 c
0,-0.29824 0.0864,-0.447412 0.259304,-0.447412 0.714992,0 1.461392,0.03138
2.2392,0.09423 0.722818,0.06275 1.4064,0.09424 2.042713,0.09424 0.65207,0
1.422053,-0.03138 2.302018,-0.09424 0.92713,-0.06275 1.752104,-0.09423
2.466991,-0.09423 0.1728,0 0.259304,0.149172 0.259304,0.447412 0,0.298239
-0.05499,0.447411 -0.157147,0.447411 -0.714992,0.05494 -1.280661,0.235486
-1.689183,0.541544 -0.408522,0.306058 -0.612835,0.714275 -0.612835,1.216623
0,0.259044 0.0864,0.572921 0.259305,0.957578 l 6.623269,14.94431
3.763409,-7.09542 -3.504105,-7.338723 c -0.628591,-1.310755 -1.147095,-2.158461
-1.555617,-2.535196 -0.408522,-0.376735 -1.021356,-0.61222 -1.838504,-0.698534
-0.07857,0 -0.149322,-0.04712 -0.212139,-0.133431 -0.07075,-0.08631
-0.102157,-0.196186 -0.102157,-0.306058 0,-0.29824 0.07075,-0.447412
0.227896,-0.447412 0.714991,0 1.367061,0.03138 1.964243,0.09424
0.573496,0.06275 1.186331,0.09424 1.838505,0.09424 0.636417,0 1.312069,-0.03138
2.02706,-0.09424 0.738574,-0.06275 1.461392,-0.09424 2.176279,-0.09424 0.1728,0
0.259304,0.149172 0.259304,0.447412 0,0.29824 -0.04716,0.447412
-0.157148,0.447412 -1.429982,0.09424 -2.144869,0.502348 -2.144869,1.216622
0,0.321799 0.164974,0.816329 0.495026,1.483486 l 2.317774,4.701474
2.302017,-4.30118 c 0.322122,-0.604402 0.47927,-1.122387 0.47927,-1.538422
0,-0.981137 -0.714992,-1.499122 -2.14487,-1.569799 -0.133565,0
-0.196383,-0.149172 -0.196383,-0.447412 0,-0.109872 0.03141,-0.211926
0.09433,-0.306058 C 50.145078,65.054936 50.215826,65 50.278643,65 c 0.510679,0
1.13927,0.03138 1.88567,0.09424 0.714991,0.06276 1.304243,0.09424
1.759931,0.09424 0.329947,0 0.817147,-0.03138 1.45346,-0.0785 0.809218,-0.07068
1.4928,-0.109872 2.034887,-0.109872 0.125739,0 0.188557,0.125613
0.188557,0.384553 0,0.337539 -0.117809,0.510166 -0.353531,0.510166
-0.8328,0.08631 -1.500626,0.313981 -2.011304,0.690716 -0.510678,0.376735
-1.13927,1.216623 -1.893496,2.543014 l -3.072,5.674793 4.164105,8.468929
6.144,-14.277154 c 0.212139,-0.517984 0.322121,-1.004696 0.322121,-1.436367
0,-1.043892 -0.714991,-1.601176 -2.144869,-1.663931 -0.133565,0
-0.196383,-0.149172 -0.196383,-0.447412 0,-0.29824 0.09433,-0.447412
0.290713,-0.447412 0.518505,0 1.13927,0.03138 1.854157,0.09424 0.66,0.06276
1.217843,0.09424 1.6656,0.09424 0.471443,0 1.01353,-0.03138 1.634191,-0.09424 C
64.648696,65.031482 65.222296,65 65.732974,65 c 0.148904,-2.08e-4
0.219548,0.125405 0.219548,0.384345"
+ id="Imported-Layers"
+ style="fill:#ffffff" />
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/icon-svgs/24/bookmark_white.svg b/icon-svgs/24/bookmark_white.svg
deleted file mode 100644
index 692b510..0000000
--- a/icon-svgs/24/bookmark_white.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 96 96" enable-background="new 0 0 96 96"
xml:space="preserve">
-<path fill="#FFFFFF"
d="M35.4,26.5H20.5l-1-1.4v-12c0-4.3,3.8-7.8,8.1-7.8s7.8,3.5,7.8,7.8V26.5z
M82.5,11.3C82.5,5.1,71.9,0,71.9,0
- H25.5c-6.2,0-12,4.7-12,10.9V30l2.7,2.7h19.1V96l23.2-16l24,16V11.3z"/>
-</svg>
diff --git a/icon-svgs/24/clock_white.svg b/icon-svgs/24/clock_white.svg
deleted file mode 100644
index b5291bc..0000000
--- a/icon-svgs/24/clock_white.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 96 96" enable-background="new 0 0 96 96"
xml:space="preserve">
-<path fill="#FFFFFF"
d="M48,0C21.5,0,0,21.5,0,48s21.5,48,48,48s48-21.5,48-48S74.5,0,48,0z
M65.8,66.3L42,52.5V19.1h9.3v28
- c0,0,8.9,5,14.9,8.7C72.2,59.4,65.8,66.3,65.8,66.3z"/>
-</svg>
diff --git a/icon-svgs/24/dice_white.svg b/icon-svgs/24/dice_white.svg
deleted file mode 100644
index 8f93380..0000000
--- a/icon-svgs/24/dice_white.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 96 96" enable-background="new 0 0 96 96"
xml:space="preserve">
-<path fill="#FFFFFF"
d="M84,0H12C5.4,0,0,5.4,0,12v72c0,6.6,5.4,12,12,12h72c6.6,0,12-5.4,12-12V12C96,5.4,90.6,0,84,0z
M24,12
- c6.6,0,12,5.4,12,12s-5.4,12-12,12s-12-5.4-12-12S17.4,12,24,12z
M24,84c-6.6,0-12-5.4-12-12s5.4-12,12-12s12,5.4,12,12
- S30.6,84,24,84z
M48,60c-6.6,0-12-5.4-12-12s5.4-12,12-12s12,5.4,12,12S54.6,60,48,60z
M72,84c-6.6,0-12-5.4-12-12s5.4-12,12-12
- s12,5.4,12,12S78.6,84,72,84z
M72,36c-6.6,0-12-5.4-12-12s5.4-12,12-12s12,5.4,12,12S78.6,36,72,36z"/>
-</svg>
diff --git a/icon-svgs/24/gear_white.svg b/icon-svgs/24/gear_white.svg
deleted file mode 100644
index 1c89eed..0000000
--- a/icon-svgs/24/gear_white.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 96 96" enable-background="new 0 0 96 96"
xml:space="preserve">
-<path fill="#FFFFFF"
d="M96,56.8V39.2l-10.8-1.8c-0.8-2.9-2-5.7-3.4-8.2l6.3-8.9L75.7,7.8l-8.9,6.3c-2.6-1.4-5.3-2.6-8.2-3.4L56.8,0
-
H39.2l-1.8,10.8c-2.9,0.8-5.7,2-8.2,3.4l-8.9-6.3L7.8,20.3l6.3,8.9c-1.4,2.6-2.6,5.3-3.4,8.3L0,39.2v17.6l10.7,1.8
-
c0.8,2.9,2,5.7,3.4,8.3l-6.3,8.9l12.4,12.4l8.9-6.3c2.6,1.4,5.3,2.6,8.3,3.4L39.2,96h17.6l1.8-10.8c2.9-0.8,5.7-2,8.2-3.4l8.9,6.3
- l12.4-12.4l-6.3-8.9c1.4-2.6,2.6-5.3,3.4-8.3L96,56.8z
M48,66.4c-10.2,0-18.4-8.3-18.4-18.4c0-10.2,8.3-18.4,18.4-18.4
- S66.4,37.8,66.4,48C66.4,58.2,58.2,66.4,48,66.4z"/>
-</svg>
diff --git a/icon-svgs/24/ic_dice.noflip.svg b/icon-svgs/24/ic_dice.noflip.svg
new file mode 100644
index 0000000..180daaf
--- /dev/null
+++ b/icon-svgs/24/ic_dice.noflip.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ fill="#FFFFFF"
+ height="24"
+ viewBox="0 0 24 24"
+ width="24"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="ic_dice.svg">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1015"
+ inkscape:window-height="926"
+ id="namedview8"
+ showgrid="false"
+ inkscape:zoom="9.8333333"
+ inkscape:cx="7.1251404"
+ inkscape:cy="2.9643092"
+ inkscape:window-x="229"
+ inkscape:window-y="14"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2" />
+ <path
+ d="M0 0h24v24H0z"
+ fill="none"
+ id="path4" />
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1"
+ d="m 3.0000003,4.9971751 0,13.9802259 c 0,1.098446 0.8987288,1.997175
1.9971751,1.997175 l 13.9802256,0 c 1.098446,0 1.997175,-0.898729
1.997175,-1.997175 l 0,-13.9802259 C 20.974576,3.8987288 20.075847,3
18.977401,3 L 4.9971754,3 C 3.8987291,3 3.0000003,3.8987288 3.0000003,4.9971751
l 0,0 z M 18.977401,6.9943503 c 0,1.1317325 -0.865443,1.997175
-1.997175,1.997175 -1.131732,0 -1.997175,-0.8654425 -1.997175,-1.997175
0,-1.1317326 0.865443,-1.9971752 1.997175,-1.9971752 1.131732,0
1.997175,0.8654426 1.997175,1.9971752 l 0,0 z m -4.992938,4.9929377 c
0,1.131732 -0.865443,1.997175 -1.997175,1.997175 -1.131732,0
-1.9971749,-0.865443 -1.9971749,-1.997175 0,-1.131732 0.8654429,-1.9971755
1.9971749,-1.9971755 1.131732,0 1.997175,0.8654435 1.997175,1.9971755 l 0,0 z m
-4.9929375,4.992938 c 0,1.131732 -0.8654426,1.997175 -1.9971749,1.997175
-1.1317333,0 -1.9971752,-0.865443 -1.9971752,-1.997175 0,-1.131732
0.8654419,-1.997175 1.9971752,-1.997175 1.1317323,0 1.9971749,0.865443
1.9971749,1.997175 l 0,0 z"
+ id="Shape"
+ inkscape:connector-curvature="0" />
+</svg>
diff --git a/icon-svgs/32/ic_today.svg b/icon-svgs/32/ic_today.svg
deleted file mode 100644
index 3c228b1..0000000
--- a/icon-svgs/32/ic_today.svg
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- width="24px"
- height="24px"
- viewBox="0 0 24 24"
- enable-background="new 0 0 24 24"
- xml:space="preserve"
- inkscape:version="0.48.1 "
- sodipodi:docname="ic_today.svg"><metadata
- id="metadata52"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><defs
- id="defs50" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1196"
- inkscape:window-height="881"
- id="namedview48"
- showgrid="false"
- inkscape:zoom="12.125"
- inkscape:cx="12"
- inkscape:cy="17.517919"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="sun" />
-<g
- id="sun">
- <g
- id="g4"
- style="fill:#ffffff">
- <path
-
d="M11.999,17.391c-2.939,0-5.39-2.452-5.39-5.391c0-2.972,2.418-5.391,5.391-5.391S17.391,9.027,17.391,12
s-2.418,5.391-5.39,5.391"
- id="path6"
- style="fill:#ffffff" />
- </g>
- <g
- id="g8"
- style="fill:#ffffff">
- <g
- id="g10"
- style="fill:#ffffff">
- <path
-
d="M11.214,0.313h0.016c0.86,0,1.557,0.697,1.557,1.557v2.646h-1.572V0.313H11.214z"
- id="path12"
- style="fill:#ffffff" />
- </g>
- <g
- id="g14"
- style="fill:#ffffff">
- <path
-
d="M11.214,19.485h1.572v4.202H12.77c-0.86,0-1.557-0.697-1.557-1.557L11.214,19.485L11.214,19.485z"
- id="path16"
- style="fill:#ffffff" />
- </g>
- </g>
- <g
- id="g18"
- style="fill:#ffffff">
- <g
- id="g20"
- style="fill:#ffffff">
- <path
-
d="M19.694,3.18l0.011,0.011c0.608,0.608,0.608,1.593,0,2.201l-1.871,1.871l-1.112-1.112L19.694,3.18z"
- id="path22"
- style="fill:#ffffff" />
- </g>
- <g
- id="g24"
- style="fill:#ffffff">
- <path
-
d="M6.137,16.737l1.112,1.112L4.278,20.82l-0.011-0.011c-0.608-0.608-0.608-1.593,0-2.201L6.137,16.737z"
- id="path26"
- style="fill:#ffffff" />
- </g>
- </g>
- <g
- id="g28"
- style="fill:#ffffff">
- <g
- id="g30"
- style="fill:#ffffff">
- <path
-
d="M3.161,4.264l0.011-0.011c0.608-0.608,1.593-0.608,2.201,0l1.871,1.871L6.133,7.235L3.161,4.264z"
- id="path32"
- style="fill:#ffffff" />
- </g>
- <g
- id="g34"
- style="fill:#ffffff">
- <path
-
d="M16.718,17.821l1.112-1.112l2.971,2.971l-0.011,0.011c-0.608,0.608-1.593,0.608-2.201,0L16.718,17.821z"
- id="path36"
- style="fill:#ffffff" />
- </g>
- </g>
- <g
- id="g38"
- style="fill:#ffffff">
- <g
- id="g40"
- style="fill:#ffffff">
- <path
-
d="M1.869,11.214h2.645v1.572H0.313V12.77C0.313,11.911,1.01,11.214,1.869,11.214z"
- id="path42"
- style="fill:#ffffff" />
- </g>
- <g
- id="g44"
- style="fill:#ffffff">
- <path
- d="M19.485,11.214h4.202v0.016c0,0.86-0.697,1.557-1.557,1.557h-2.645V11.214z"
- id="path46"
- style="fill:#ffffff" />
- </g>
- </g>
-</g>
-</svg>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/239159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6326e50e978e42fd9a41024ad361afbbeb2f5b63
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
