gello: CyanogenMod style [2/2]
- Material dark theme
- Update colors palette
- Card-like tabs
- Updated menu entries
- Reordered settings
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index cd6d22c..078b553 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -31,7 +31,7 @@
android:layout_marginStart="5dip"
android:layout_marginEnd="11dip"
android:focusable="false"
- android:src="@drawable/ic_action_bookmark_checked"
+ android:src="@drawable/ic_action_bookmark"
android:scaleType="fitCenter"
/>
<LinearLayout
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 8c5191f..61706e7 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
- android:drawableStart="@drawable/ic_action_bookmark_checked"
+ android:drawableStart="@drawable/ic_action_bookmark"
android:text="@string/bookmark_this_page"
android:textAppearance="?android:attr/textAppearanceMedium" />
<View android:id="@+id/remove_divider"
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 51109f7..6e75aee 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -17,7 +17,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/TabNavBackgroundColor"
+ android:background="@color/trasparent"
android:orientation="vertical">
<com.android.browser.NavTabScroller
@@ -30,7 +30,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
- android:background="@color/NavigationBarBackground"
+ android:background="@color/trasparent"
android:gravity="end"
android:orientation="horizontal">
@@ -46,14 +46,16 @@
style="@style/NavButtonWide"
android:contentDescription="@string/accessibility_button_newtab"
android:gravity="center_vertical"
- android:src="@drawable/ic_action_add_tab" />
+ android:src="@drawable/ic_action_add_tab"
+ android:visibility="gone" />
<ImageButton
android:id="@+id/newincognitotab"
style="@style/NavButtonWide"
android:contentDescription="@string/accessibility_button_newincognitotab"
android:gravity="center_vertical"
- android:src="@drawable/ic_action_add_incognito" />
+ android:src="@drawable/ic_action_add_incognito"
+ android:visibility="gone" />
</LinearLayout>
<ImageButton
@@ -61,11 +63,11 @@
style="@style/OverflowButton" />
</LinearLayout>
- <!-- Cosmetic shadow (covered by anim_screen during transitions) -->
+ <!-- Cosmetic shadow (covered by anim_screen during transitions) >
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:layout_marginTop="@dimen/toolbar_height"
- android:background="@drawable/deco_cosmetic_topshadow" />
+ android:background="@drawable/deco_cosmetic_topshadow" /-->
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 1fde789..1bf4b8d 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -19,45 +19,45 @@
android:id="@+id/nav_tab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:background="@drawable/nav_tab_title_normal"
- android:focusable="false">
+ android:orientation="vertical">
<LinearLayout
- android:id="@+id/titlebar"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="@dimen/nav_tab_titleheight"
- android:layout_gravity="center_horizontal"
- android:paddingStart="8dip" >
- <TextView
- android:id="@+id/title"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1.0"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:ellipsize="end"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:scrollHorizontally="true"
- android:drawablePadding="8dip" />
-
- <ImageView
- android:id="@+id/closetab"
- style="@style/NavButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:background="@drawable/card"
+ android:elevation="4dp"
+ android:focusable="false">
+ <LinearLayout
+ android:id="@+id/titlebar"
+ android:orientation="vertical"
android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_closetab"
- android:paddingEnd="16dip"
- android:src="@drawable/ic_action_close" />
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:paddingStart="8dp"
+ android:paddingEnd="8dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp">
+ <ImageView
+ android:id="@+id/tab_preview"
+ android:layout_width="@dimen/nav_tab_width"
+ android:layout_height="@dimen/nav_tab_height"
+ android:paddingStart="2dip"
+ android:paddingEnd="2dip"
+ android:focusable="false" />
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/nav_tab_titleheight"
+ android:layout_weight="1.0"
+ android:layout_marginTop="4dp"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textAppearance="?android:attr/textAppearanceSmallInverse" />
+ </LinearLayout>
</LinearLayout>
-
- <!-- Preview Image -->
- <ImageView
- android:id="@+id/tab_preview"
- android:layout_width="@dimen/nav_tab_width"
- android:layout_height="@dimen/nav_tab_height"
- android:paddingStart="2dip"
- android:paddingEnd="2dip"
- android:focusable="false" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:background="@color/trasparent" />
</LinearLayout>
diff --git a/res/layout/swe_preference_list_widget.xml b/res/layout/swe_preference_list_widget.xml
index b7cf7a0..f294ac2 100644
--- a/res/layout/swe_preference_list_widget.xml
+++ b/res/layout/swe_preference_list_widget.xml
@@ -30,4 +30,4 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:background="@drawable/ic_sp_multi_choice" />
\ No newline at end of file
+ android:background="@color/trasparent" />
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 375ba84..b5f865b 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -17,14 +17,16 @@
<com.android.browser.NavigationBarPhone xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/NavigationBarBackground"
- android:orientation="horizontal">
+ android:background="@color/primary"
+ android:orientation="horizontal"
+ android:elevation="8dp">
<LinearLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:gravity="center_vertical"
+ android:paddingStart="4dp"
android:orientation="horizontal">
<ImageView
@@ -36,15 +38,6 @@
android:src="@drawable/ic_deco_incognito_normal"
android:visibility="gone" />
- <ImageView
- android:id="@+id/magnify"
- android:layout_width="44dp"
- android:layout_height="match_parent"
- android:src="@drawable/ic_action_search_normal"
- android:paddingStart="6dp"
- android:paddingEnd="6dp"
- android:visibility="visible" />
-
<com.android.browser.SiteTileView
android:id="@+id/favicon_view"
android:layout_width="44dp"
@@ -53,6 +46,16 @@
android:paddingEnd="6dp"
android:contentDescription="@string/page_info"/>
+ <!-- Cosmetic separator -->
+ <View
+ android:layout_width="1dp"
+ android:layout_height="42dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingEnd="2dp"
+ android:background="#55FAFAFA" />
+
+
<ImageView
android:id="@+id/stop"
style="@style/NavButton"
@@ -62,7 +65,7 @@
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:visibility="gone"
- android:src="@drawable/ic_action_stop" />
+ android:src="@drawable/ic_action_stop_normal_inverted" />
<com.android.browser.UrlInputView
android:id="@+id/url"
@@ -77,6 +80,7 @@
android:focusable="true"
android:hint="@string/search_hint"
android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+ android:theme="@style/Widget.UrlInputView"
android:inputType="textUri"
android:lines="1"
android:paddingStart="4dp"
@@ -120,14 +124,14 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
- android:paddingBottom="3dp"
- android:paddingEnd="2dp"
- android:textColor="#333"
+ android:paddingBottom="1dp"
+ android:paddingEnd="1dp"
+ android:textColor="@color/white"
android:textSize="13dp"
android:textStyle="bold" />
</FrameLayout>
<ImageButton
android:id="@+id/more_browser_settings"
- style="@style/OverflowButton" />
+ style="@style/OverflowButtonInverted" />
</com.android.browser.NavigationBarPhone>