Commit c1c2c2a1 authored by Alexandre Perraud's avatar Alexandre Perraud

UI : Simplify colors and themes

parent 76e5af56
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/font_default" />
<item android:state_pressed="true" android:color="@color/font_default" />
<item android:color="@color/font_light" />
<item android:state_selected="true" android:color="@color/grey600" />
<item android:state_pressed="true" android:color="@color/grey600" />
<item android:color="@color/grey600" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/font_default" />
<item android:state_pressed="true" android:color="@color/font_default" />
<item android:color="@color/font_default" />
<item android:state_selected="true" android:color="@color/grey900" />
<item android:state_pressed="true" android:color="@color/grey900" />
<item android:color="@color/grey900" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/darkerorange" />
<item android:state_pressed="true" android:color="@color/darkerorange" />
<item android:color="@color/darkorange" />
<item android:state_selected="true" android:color="@color/orange700" />
<item android:state_pressed="true" android:color="@color/orange700" />
<item android:color="@color/orange500" />
</selector>
\ No newline at end of file
......@@ -2,22 +2,22 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_selected="false">
<shape android:shape="rectangle">
<solid android:color="@color/darkgrey" />
<solid android:color="@color/grey500" />
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/orange" />
<solid android:color="@color/orange300" />
</shape>
</item>
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/darkorange" />
<solid android:color="@color/orange500" />
</shape>
</item>
<item android:state_focused="false" android:state_selected="false">
<shape android:shape="rectangle">
<solid android:color="@color/background_menu" />
<solid android:color="@color/grey300" />
</shape>
</item>
</selector>
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<gradient
android:angle="0"
android:endColor="#00FFFFFF"
android:startColor="@color/black3" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<gradient
android:angle="0"
android:endColor="@color/black3"
android:startColor="#00FFFFFF" />
</shape>
\ No newline at end of file
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="@color/darkorange" />
<solid android:color="@color/orange500" />
<padding
android:bottom="6dp"
......
......@@ -5,6 +5,6 @@
<gradient
android:angle="0"
android:endColor="#00FFFFFF"
android:startColor="@color/background_menu" />
android:startColor="@color/grey300" />
</shape>
\ No newline at end of file
......@@ -4,7 +4,7 @@
<gradient
android:angle="0"
android:endColor="@color/background_menu"
android:endColor="@color/grey300"
android:startColor="#00FFFFFF" />
</shape>
\ No newline at end of file
......@@ -2,13 +2,13 @@
<item android:id="@android:id/background">
<shape>
<solid android:color="@color/background_menu"/>
<solid android:color="@color/grey300"/>
</shape>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="@color/darkorange"/>
<solid android:color="@color/orange500"/>
</shape>
</clip>
</item>
......
......@@ -8,7 +8,7 @@
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="@color/darkorange" />
<solid android:color="@color/orange500" />
</shape>
</clip>
</item>
......
......@@ -18,7 +18,7 @@
android:top="15dp" />
<stroke
android:width="6dp"
android:color="@color/darkorange" />
android:color="@color/orange500" />
<solid android:color="#00000000" />
</shape>
......
......@@ -14,7 +14,7 @@
<stroke
android:width="6dp"
android:color="@color/darkorange" />
android:color="@color/orange500" />
<solid android:color="#00000000" />
</shape>
......
......@@ -3,7 +3,7 @@
android:id="@+id/audio_tips"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent_white"
android:background="?attr/background_audio_tips"
android:gravity="center"
android:orientation="vertical"
android:weightSum="8" >
......
......@@ -3,7 +3,7 @@
android:id="@+id/audio_tips"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent_white"
android:background="?attr/background_audio_tips"
android:gravity="center"
android:orientation="vertical"
android:weightSum="8" >
......@@ -19,7 +19,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="left|center"
android:orientation="vertical" >
......@@ -51,10 +51,10 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="center"
android:orientation="vertical" >
android:orientation="vertical">
<TextView
android:id="@+id/okgotit_button"
......
......@@ -136,7 +136,7 @@
android:maxLength="2"
android:text="00"
android:textSize="20sp"
android:textColor="@color/darkorange"
android:textColor="@color/orange500"
android:background="@android:color/transparent"
android:inputType="number"
android:focusable="true">
......
......@@ -7,7 +7,7 @@
android:clickable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:background="@color/grey1"
android:background="@color/grey850"
tools:targetApi="jelly_bean" >
<ImageView
......
......@@ -5,7 +5,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="@color/grey1"
android:background="@color/grey850"
tools:targetApi="jelly_bean" >
<ImageView
......
......@@ -36,7 +36,7 @@
android:layout_alignParentLeft="true"
android:layout_marginLeft="@dimen/time_margin_sides"
android:textAppearance="@style/TextAppearance.AppCompat.SearchResult.Title"
android:textColor="@color/darkorange"
android:textColor="@color/orange500"
android:textSize="16sp"/>
<TextView
......
......@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#000000">
android:background="@color/black">
<!--
the double FrameLayout is necessary here to do cropping on the bottom right
......
......@@ -36,7 +36,7 @@
android:id="@+id/player_overlay_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_remote"
android:background="@color/grey850"
android:fitsSystemWindows="true" >
<TextView
......
......@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent_gray"
android:background="@color/grey900transparent"
android:clickable="true"
android:onClick="onClickOverlayTips">
......
......@@ -8,7 +8,7 @@
<style name="Theme.VLC.21" parent="Theme.VLC.17">
<item name="android:colorPrimary">@color/orange800</item>
<item name="android:statusBarColor">@color/darkerorange</item>
<item name="android:statusBarColor">@color/orange700</item>
<item name="android:popupMenuStyle">@style/PopupMenuStyle.Light</item>
</style>
<style name="Theme.VLC.Black.21" parent="Theme.VLC.Black.17">
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="item_common_pressed" format="reference|color" />
<attr name="item_common_selected" format="reference|color" />
<attr name="item_footer" format="reference|color" />
<attr name="playlist_item_footer" format="reference|color" />
<attr name="background_default" format="reference|color" />
......@@ -13,7 +11,7 @@
<attr name="background_menu_selected" format="reference|color" />
<attr name="background_header" format="reference|color" />
<attr name="background_player" format="reference|color" />
<attr name="background_playlist" format="reference|color" />
<attr name="background_audio_tips" format="reference|color" />
<attr name="font_default" format="reference|color" />
<attr name="font_light" format="reference|color" />
<attr name="font_actionbar" format="reference|color" />
......@@ -65,8 +63,6 @@
<attr name="mini_player_top_shadow" format="reference" />
<attr name="audio_playlist_shadow" format="reference" />
<attr name="header_fadein_overlay" format="reference" />
<attr name="header_fadeout_overlay" format="reference" />
<attr name="advanced_options_style" format="reference" />
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="item_common_pressed">#e0e0e0</color>
<color name="item_common_selected">#5e5e5e</color>
<color name="item_footer">#e0e0e0</color>
<color name="background_common">#f2f1f0</color>
<color name="background_player">#fafaf9</color>
<color name="background_playlist">#e7e5e2</color>
<color name="background_menu_divider">#d0d0d0</color>
<color name="background_menu">#e0e0e0</color>
<color name="font_default">#222222</color>
<color name="font_light">#777777</color>
<color name="orange">#ffbb33</color>
<color name="blue">#0000ff</color>
<color name="darkorange">#ff8800</color>
<color name="darkerorange">#ff7200</color>
<color name="black">#000001</color>
<color name="white">#FFFFFF</color>
<color name="transparent_gray">#8000</color>
<color name="transparent_white">#dcfafafa</color>
<color name="action_bar_title">#FFFFFF</color>
<color name="darkgrey">#ffa0a0a0</color>
<color name="background_remote">#ff323232</color>
<color name="black1">#0f0f0f</color>
<color name="black2">#222222</color>
<color name="black3">#181818</color>
<color name="grey1">#393939</color>
<color name="grey2">#d0d0d0</color>
<color name="white">#ffffff</color>
<!--
Material color swatches
......
......@@ -25,28 +25,25 @@
<item name="android:expandableListViewStyle">@style/Theme.VLC.List</item>
<item name="android:dropDownListViewStyle">@style/Theme.VLC.List</item>
<item name="item_common_pressed">@color/item_common_pressed</item>
<item name="item_common_selected">@color/item_common_selected</item>
<item name="item_footer">@color/item_footer</item>
<item name="playlist_item_footer">@color/item_footer</item>
<item name="item_footer">@color/grey300</item>
<item name="playlist_item_footer">@color/grey300</item>
<item name="background_default">@color/grey50</item>
<item name="background_default_darker">@color/grey100</item>
<item name="background_actionbar">@color/darkorange</item>
<item name="background_menu_divider">@color/background_menu_divider</item>
<item name="background_actionbar">@color/orange500</item>
<item name="background_menu_divider">@color/grey400</item>
<item name="background_menu">@color/grey200</item>
<item name="background_menu_selected">@color/grey300</item>
<item name="background_player">@color/grey100</item>
<item name="background_playlist">@color/background_playlist</item>
<item name="background_header">@color/background_menu</item>
<item name="audio_browser_separator">@color/darkorange</item>
<item name="playlist_item_drag_shadow">@color/darkorange</item>
<item name="audio_player_header_time">@color/darkorange</item>
<item name="font_default">@color/font_default</item>
<item name="font_light">@color/font_light</item>
<item name="background_header">@color/grey300</item>
<item name="background_audio_tips">@color/grey50transparent</item>
<item name="audio_browser_separator">@color/orange500</item>
<item name="playlist_item_drag_shadow">@color/orange500</item>
<item name="audio_player_header_time">@color/orange500</item>
<item name="font_default">@color/grey900</item>
<item name="font_light">@color/grey600</item>
<item name="font_actionbar">@color/orange200</item>
<item name="font_actionbar_selected">@color/grey50</item>
<item name="list_menu">@color/font_light</item>
<item name="list_menu">@color/grey600</item>
<item name="list_subtitle">@color/list_subtitle</item>
<item name="list_title_last">@color/list_title_last</item>
<item name="list_title">@color/list_title</item>
......@@ -54,8 +51,10 @@
<item name="mini_player_top_shadow">@drawable/mini_player_top_shadow</item>
<item name="audio_playlist_shadow">@drawable/audio_playlist_shadow</item>
<!--
<item name="header_fadein_overlay">@drawable/header_fadein_overlay</item>
<item name="header_fadeout_overlay">@drawable/header_fadeout_overlay</item>
-->
<item name="ic_playlist_normal">@drawable/ic_playlist_normal</item>
<item name="ic_playlist_pressed">@drawable/ic_playlist_pressed</item>
......@@ -102,24 +101,22 @@
<item name="android:expandableListViewStyle">@style/Theme.VLC.List</item>
<item name="android:dropDownListViewStyle">@style/Theme.VLC.List</item>
<item name="item_common_pressed">@color/item_common_pressed</item>
<item name="item_common_selected">@color/item_common_selected</item>
<item name="item_footer">@color/grey1</item>
<item name="playlist_item_footer">@color/grey1</item>
<item name="item_footer">@color/grey700</item>
<item name="playlist_item_footer">@color/grey700</item>
<item name="background_default">@color/grey850</item>
<item name="background_default_darker">@color/grey875</item>
<item name="background_actionbar">@color/grey875</item>
<item name="background_menu_divider">@color/grey1</item>
<item name="background_menu_divider">@color/grey700</item>
<item name="background_menu">@color/grey850</item>
<item name="background_menu_selected">@color/grey800</item>
<item name="background_player">@color/grey850</item>
<item name="background_playlist">@color/black2</item>
<item name="background_header">@color/black3</item>
<item name="audio_browser_separator">@color/darkorange</item>
<item name="playlist_item_drag_shadow">@color/darkorange</item>
<item name="audio_player_header_time">@color/darkorange</item>
<item name="background_header">@color/grey900</item>
<item name="background_audio_tips">@color/grey900transparent</item>
<item name="audio_browser_separator">@color/orange500</item>
<item name="playlist_item_drag_shadow">@color/orange500</item>
<item name="audio_player_header_time">@color/orange500</item>
<item name="font_default">@color/grey50</item>
<item name="font_light">@color/font_light</item>
<item name="font_light">@color/grey600</item>
<item name="font_actionbar">@color/grey600</item>
<item name="font_actionbar_selected">@color/grey200</item>
<item name="list_menu">@color/grey50</item>
......@@ -130,8 +127,10 @@
<item name="mini_player_top_shadow">@null</item>
<item name="audio_playlist_shadow">@null</item>
<!--
<item name="header_fadein_overlay">@drawable/bt_header_fadein_overlay</item>
<item name="header_fadeout_overlay">@drawable/bt_header_fadeout_overlay</item>
-->
<item name="ic_playlist_normal">@drawable/ic_playlist_normal_w</item>
<item name="ic_playlist_pressed">@drawable/ic_playlist_pressed</item>
......@@ -167,15 +166,13 @@
<style name="Theme.VLC.NoTitleBar" parent="Theme.AppCompat.Light">
<item name="android:windowNoTitle">true</item>
<item name="item_common_pressed">@color/item_common_pressed</item>
<item name="item_common_selected">@color/item_common_selected</item>
<item name="item_footer">@color/item_footer</item>
<item name="background_menu_divider">@color/background_menu_divider</item>
<item name="background_menu">@color/background_menu</item>
<item name="background_player">@color/background_player</item>
<item name="font_default">@color/font_default</item>
<item name="font_light">@color/font_light</item>
<item name="android:windowBackground">@color/background_common</item>
<item name="item_footer">@color/grey300</item>
<item name="background_menu_divider">@color/grey400</item>
<item name="background_menu">@color/grey300</item>
<item name="background_player">@color/grey100</item>
<item name="font_default">@color/grey900</item>
<item name="font_light">@color/grey600</item>
<item name="android:windowBackground">@color/grey200</item>
</style>
<style name="Theme.VLC.Player" parent="Theme.VLC.Player.7"/>
......@@ -184,7 +181,6 @@
<item name="android:windowFullscreen">true</item>
<item name="android:windowBackground">@color/black</item>
<item name="windowActionBarOverlay">true</item>
<!-- item name="video_player_overlay">@color/transparent_gray</item-->
<item name="video_player_overlay">@android:color/transparent</item>
<item name="status_bar_overlay">@android:color/transparent</item>
......@@ -196,7 +192,7 @@
</style>
<style name="ActionBar.Text" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/action_bar_title</item>
<item name="android:textColor">@color/white</item>
</style>
<style name="ActionBar.OverflowButton">
......@@ -227,9 +223,9 @@
<style name="Theme.VLC.AdvancedOptionsLight" parent="Theme.VLC.AdvancedOptions">
<item name="android:windowBackground">@drawable/abc_item_background_holo_light</item>
<item name="android:textColor">@color/grey1</item>
<item name="advanced_options_divider">@color/darkgrey</item>
<item name="advanced_options_background">@color/background_menu</item>
<item name="android:textColor">@color/grey850</item>
<item name="advanced_options_divider">@color/grey500</item>
<item name="advanced_options_background">@color/grey300</item>
<item name="ic_speed_normal_style">@drawable/ic_speed_normal</item>
<item name="ic_sleep_normal_style">@drawable/ic_sleep_normal</item>
<item name="ic_jumpto_normal_style">@drawable/ic_jumpto_normal</item>
......@@ -242,8 +238,8 @@
<style name="Theme.VLC.AdvancedOptionsBlack" parent="Theme.VLC.AdvancedOptions">
<item name="android:windowBackground">@drawable/abc_item_background_holo_dark</item>
<item name="android:textColor">@color/white</item>
<item name="advanced_options_divider">@color/grey1</item>
<item name="advanced_options_background">@color/black2</item>
<item name="advanced_options_divider">@color/grey850</item>
<item name="advanced_options_background">@color/grey900</item>
<item name="ic_speed_normal_style">@drawable/ic_speed_normal_w</item>
<item name="ic_sleep_normal_style">@drawable/ic_sleep_normal_w</item>
<item name="ic_jumpto_normal_style">@drawable/ic_jumpto_normal_w</item>
......@@ -255,7 +251,7 @@
<!-- Tips Apearance-->
<style name="TipsFontStyle">
<item name="android:textColor">@color/darkerorange</item>
<item name="android:textColor">@color/orange700</item>
<item name="android:textStyle">bold</item>
</style>
......
......@@ -124,7 +124,7 @@ public class DirectoryViewFragment extends BrowserFragment implements IRefreshab
});
mSwipeRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipeLayout);
mSwipeRefreshLayout.setColorSchemeResources(R.color.darkerorange);
mSwipeRefreshLayout.setColorSchemeResources(R.color.orange700);
mSwipeRefreshLayout.setOnRefreshListener(this);
mListView.setOnScrollListener(new AbsListView.OnScrollListener() {
......
......@@ -86,7 +86,7 @@ public class HistoryFragment extends BrowserFragment implements IRefreshable, Sw
mSwipeRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipeLayout);
mSwipeRefreshLayout.setColorSchemeColors(R.color.darkerorange/*, R.attr.colorPrimary, R.attr.colorPrimaryDark*/);
mSwipeRefreshLayout.setColorSchemeColors(R.color.orange700/*, R.attr.colorPrimary, R.attr.colorPrimaryDark*/);
mSwipeRefreshLayout.setOnRefreshListener(this);
mListView.setOnScrollListener(new AbsListView.OnScrollListener() {
......
......@@ -145,7 +145,7 @@ public class AudioAlbumsSongsFragment extends BrowserFragment implements SwipeRe
mSwipeRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipeLayout);
mSwipeRefreshLayout.setColorSchemeResources(R.color.darkerorange);
mSwipeRefreshLayout.setColorSchemeResources(R.color.orange700);
mSwipeRefreshLayout.setOnRefreshListener(this);
songsList.setOnScrollListener(mScrollListener);
......
......@@ -171,7 +171,7 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
mSwipeRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipeLayout);
mSwipeRefreshLayout.setColorSchemeResources(R.color.darkerorange);
mSwipeRefreshLayout.setColorSchemeResources(R.color.orange700);
mSwipeRefreshLayout.setOnRefreshListener(this);
songsList.setOnScrollListener(mScrollListener);
......
......@@ -101,7 +101,7 @@ public abstract class PickTimeFragment extends DialogFragment implements DialogI
@Override
public void onFocusChange(View v, boolean hasFocus) {
((TextView)v).setTextColor(hasFocus ? getResources().getColor(R.color.darkorange) : mTextColor);
((TextView)v).setTextColor(hasFocus ? getResources().getColor(R.color.orange500) : mTextColor);
}
@Override
......
......@@ -100,7 +100,7 @@ public class NetworkFragment extends BrowserFragment implements IRefreshable, Me
mRecyclerView.setOnScrollListener(mScrollListener);
mSwipeRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipeLayout);
mSwipeRefreshLayout.setColorSchemeResources(R.color.darkerorange);
mSwipeRefreshLayout.setColorSchemeResources(R.color.orange700);
mSwipeRefreshLayout.setOnRefreshListener(this);
return v;
}
......
......@@ -214,7 +214,7 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
public void onFocusChange(View v, boolean hasFocus) {
if (v instanceof TextView)
((TextView) v).setTextColor(v.hasFocus() ?
sInstance.getResources().getColor(R.color.darkorange) : mTextColor);
sInstance.getResources().getColor(R.color.orange500) : mTextColor);
}
};
......
......@@ -141,7 +141,7 @@ public class VideoGridFragment extends BrowserFragment implements ISortable, IVi
mGridView = (GridView) v.findViewById(android.R.id.list);
mSwipeRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipeLayout);
mSwipeRefreshLayout.setColorSchemeResources(R.color.darkerorange);
mSwipeRefreshLayout.setColorSchemeResources(R.color.orange700);
mSwipeRefreshLayout.setOnRefreshListener(this);
mGridView.setOnScrollListener(new AbsListView.OnScrollListener() {
......
......@@ -128,7 +128,7 @@ public class MainTvActivity extends Activity implements IVideoBrowser, OnItemVie
mBrowseFragment.setTitle(getString(R.string.app_name));
mBrowseFragment.setBadgeDrawable(getResources().getDrawable(R.drawable.cone));
// set search icon color
mBrowseFragment.setSearchAffordanceColor(getResources().getColor(R.color.darkorange));
mBrowseFragment.setSearchAffordanceColor(getResources().getColor(R.color.orange500));
// add a listener for selected items
mBrowseFragment.setOnItemViewClickedListener(this);
......
......@@ -85,7 +85,7 @@ public class MediaItemDetailsFragment extends DetailsFragment implements AudioSe
DetailsOverviewRowPresenter rowPresenter =
new DetailsOverviewRowPresenter(new DetailsDescriptionPresenter());
rowPresenter.setBackgroundColor(getResources().getColor(R.color.darkorange));
rowPresenter.setBackgroundColor(getResources().getColor(R.color.orange500));
rowPresenter.setOnActionClickedListener(new OnActionClickedListener() {
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment