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

Moved icon in drawer, removed unnecessary view in tab_list_item

Browse Source
This commit is contained in:
Anthony Restaino 2016-02-12 17:32:34 -05:00
parent 0ab302775c
commit f2d2c8ed5f
2 changed files with 74 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/res/layout/tab_drawer.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/drawerBackground"
android:clickable="true"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/drawerBackground"
android:clickable="true"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/action_new_tab"
android:src="@drawable/ic_action_tabs" />
android:src="@drawable/ic_action_tabs"/>
</FrameLayout>
<TextView
@ -38,7 +38,7 @@
android:maxLines="1"
android:minHeight="?android:attr/listPreferredItemHeight"
android:text="@string/tabs"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
@ -48,7 +48,7 @@
android:layout_weight="1"
android:divider="@null"
android:dividerHeight="0dp"
android:overScrollMode="ifContentScrolls" />
android:overScrollMode="ifContentScrolls"/>
<LinearLayout
android:layout_width="match_parent"
@ -72,24 +72,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/action_back"
android:src="@drawable/ic_action_back" />
</FrameLayout>
<FrameLayout
android:id="@+id/new_tab_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/actionBarItemBackground"
android:clickable="true">
<ImageView
android:id="@+id/icon_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/action_new_tab"
android:src="@drawable/ic_action_plus" />
android:src="@drawable/ic_action_back"/>
</FrameLayout>
<FrameLayout
@ -106,7 +89,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/action_homepage"
android:src="@drawable/ic_action_home" />
android:src="@drawable/ic_action_home"/>
</FrameLayout>
<FrameLayout
@ -123,7 +106,24 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/action_forward"
android:src="@drawable/ic_action_forward" />
android:src="@drawable/ic_action_forward"/>
</FrameLayout>
<FrameLayout
android:id="@+id/new_tab_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/actionBarItemBackground"
android:clickable="true">
<ImageView
android:id="@+id/icon_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/action_new_tab"
android:src="@drawable/ic_action_plus"/>
</FrameLayout>
</LinearLayout>

100
app/src/main/res/layout/tab_list_item.xml
View File

@ -1,61 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tab_item_background"
android:layout_width="match_parent"
android:layout_height="56dp"
android:clickable="true"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout android:id="@+id/tab_item_background"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?attr/listBackground"
android:clickable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/listBackground"
<ImageView
android:id="@+id/faviconTab"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:contentDescription="Favicon"
android:gravity="center_vertical"/>
<TextView
android:id="@+id/textTab"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="1">
android:maxLines="1"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
<FrameLayout
android:id="@+id/deleteAction"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="4dp"
android:background="?attr/actionBarItemBackground"
android:gravity="center">
<ImageView
android:id="@+id/faviconTab"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:contentDescription="Favicon"
android:gravity="center_vertical" />
<TextView
android:id="@+id/textTab"
android:layout_width="0dp"
android:id="@+id/deleteButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:maxLines="1"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItemSmall" />
<FrameLayout
android:id="@+id/deleteAction"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="4dp"
android:background="?attr/actionBarItemBackground"
android:gravity="center">
<ImageView
android:id="@+id/deleteButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="Delete Tab"
android:src="@drawable/ic_action_delete" />
</FrameLayout>
</LinearLayout>
android:layout_gravity="center"
android:contentDescription="Delete Tab"
android:src="@drawable/ic_action_delete"/>
</FrameLayout>
</LinearLayout>