gello: revamp add/edit bookmark UI
Change-Id: I24f3fc03a4c9c3b07b7d1a983927b31eab74a8f4
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 61706e7..2f774cf 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -1,20 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!--
+ Copyright (C) 2015 The CyanogenMod Project
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<!-- BS -->
<LinearLayout android:id="@+id/crumb_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -46,182 +51,216 @@
android:layout_gravity="center_vertical"
android:paddingEnd="8dip" />
</LinearLayout>
- <LinearLayout android:id="@+id/title_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingStart="5dip"
- android:paddingEnd="5dip"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- >
- <TextView android:id="@+id/fake_title"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:gravity="center_vertical"
- android:drawableStart="@drawable/ic_action_bookmark"
- android:text="@string/bookmark_this_page"
- android:textAppearance="?android:attr/textAppearanceMedium" />
- <View android:id="@+id/remove_divider"
- android:layout_width="1dip"
- android:layout_height="match_parent"
- android:background="?android:attr/dividerVertical"
- android:visibility="gone"
- />
- <TextView android:id="@+id/remove"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:gravity="center_vertical"
- android:text="@string/remove"
- android:drawableStart="@drawable/ic_action_trash_normal"
- android:visibility="gone"
- android:textAppearance="?android:attr/textAppearanceMedium" />
- </LinearLayout>
+<!-- /BS -->
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1">
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <TableLayout android:id="@+id/default_view"
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@color/white"
+ android:elevation="0dp" >
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/mynav_primary" >
+
+ <LinearLayout android:id="@+id/actions_download_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:stretchColumns="1"
- android:shrinkColumns="1"
- android:paddingTop="10dip"
- android:paddingStart="20dip"
- android:paddingEnd="20dip" >
- <TableRow android:layout_marginBottom="10dip">
- <TextView
- android:id="@+id/titleText"
+ android:orientation="vertical"
+ android:paddingStart="16dp"
+ android:paddingTop="16dp" >
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/name"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:orientation="horizontal" >
+ <ImageButton
+ android:id="@+id/book_cancel"
+ style="?android:attr/buttonBarButtonStyle"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:src="@drawable/ic_action_back"/>
+ <ImageButton
+ android:id="@+id/remove"
+ style="?android:attr/buttonBarButtonStyle"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:gravity="end"
+ android:visibility="gone"
+ android:src="@drawable/ic_action_close"/>
+ </LinearLayout>
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:src="@color/mynav_primary"/>
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="26dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="32dp">
+ <EditText
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textCapSentences|textNoSuggestions"
+ android:selectAllOnFocus="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="32dp"
+ android:textColor="@color/white"
+ android:hint="@string/download_name_hint"
+ android:textColorHint="@color/icon_white" />
+ </LinearLayout>
- <EditText
- android:id="@+id/title"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginStart="20dip"
- android:inputType="textCapSentences|textNoSuggestions"
- android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceMedium" />
- </TableRow>
+ </LinearLayout>
- <TableRow
- android:layout_marginBottom="10dip"
- android:id="@+id/row_address">
- <TextView
- android:id="@+id/addressText"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/location"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <EditText
- android:id="@+id/address"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginStart="20dip"
- android:hint="@string/http"
- android:inputType="textUri"
- android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceMedium" />
- </TableRow>
- <TableRow android:layout_marginBottom="10dip"
- android:id="@+id/row_account">
- <TextView
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/account"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <Spinner
- android:id="@+id/accounts"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginStart="20dip"
- android:spinnerMode="dropdown"
- />
- </TableRow>
- <TableRow android:layout_marginBottom="10dip">
- <TextView
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/containing_folder"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <view class="com.android.browser.addbookmark.FolderSpinner"
- android:id="@+id/folder"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginStart="20dip"
- android:spinnerMode="dropdown"
- />
- </TableRow>
- </TableLayout>
- </ScrollView>
-
- <LinearLayout android:id="@+id/folder_selector"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:visibility="gone"
- >
-
- <view class="com.android.browser.AddBookmarkPage$CustomListView"
- android:id="@+id/list"
- android:layout_marginStart="16dip"
- android:layout_marginEnd="16dip"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
- <TextView
- android:id="@+id/empty"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_marginStart="16dip"
- android:layout_marginTop="16dip"
- android:text="@string/no_subfolders"
- android:contentDescription="@string/no_subfolders"
- android:textStyle="italic"
- android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
- </FrameLayout>
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:paddingTop="32dp">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:gravity="end"
- style="?android:attr/buttonBarStyle">
- <Button android:id="@+id/delete"
- android:visibility="gone"
- android:text="@string/remove_bookmark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="?android:attr/buttonBarButtonStyle" />
- <Button android:id="@+id/cancel"
- android:text="@string/cancel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="?android:attr/buttonBarButtonStyle" />
- <Button android:id="@+id/OK"
- android:text="@string/ok"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="?android:attr/buttonBarButtonStyle" />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:elevation="5dp" >
+
+ <LinearLayout
+ android:id="@+id/default_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:paddingTop="8dp"
+ android:orientation="vertical" >
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="72dp"
+ android:orientation="horizontal"
+ android:layout_marginBottom="8dp"
+ android:layout_gravity="center">
+ <ImageView
+ android:layout_height="@dimen/download_icon_size"
+ android:layout_width="@dimen/download_icon_size"
+ android:src="@drawable/ic_download_address"
+ android:layout_gravity="center"/>
+ <EditText
+ android:id="@+id/address"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center"
+ android:layout_alignParentEnd="true"
+ android:hint="@string/http"
+ android:inputType="textUri"
+ android:textColor="@color/black"
+ android:paddingStart="16dp"
+ android:paddingBottom="16dp"
+ android:textSize="18sp" />
+ </LinearLayout>
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="72dp"
+ android:orientation="horizontal"
+ android:layout_marginBottom="8dp"
+ android:layout_gravity="center"
+ android:visibility="gone">
+ <ImageView
+ android:layout_height="@dimen/download_icon_size"
+ android:layout_width="@dimen/download_icon_size"
+ android:src="@android:color/transparent"/>
+ <LinearLayout android:id="@+id/row_account"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingStart="16dp"
+ android:paddingBottom="16dp">
+ <Spinner
+ android:id="@+id/accounts"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:spinnerMode="dropdown"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/download_text_hint"
+ android:text="@string/account"
+ android:textSize="@dimen/download_text_hint" />
+ </LinearLayout>
+ </LinearLayout>
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="8dp"
+ android:layout_gravity="center">
+ <ImageView
+ android:layout_height="@dimen/download_icon_size"
+ android:layout_width="@dimen/download_icon_size"
+ android:src="@drawable/ic_download_path"/>
+ <view class="com.android.browser.addbookmark.FolderSpinner"
+ android:id="@+id/folder"
+ android:textSize="24dp"
+ android:paddingTop="8dp"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:spinnerMode="dropdown"/>
+ </LinearLayout>
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="72dp"
+ android:orientation="horizontal"
+ android:layout_marginBottom="8dp"
+ android:layout_gravity="center"
+ android:visibility="gone">
+ <ImageView
+ android:layout_height="@dimen/download_icon_size"
+ android:layout_width="@dimen/download_icon_size"
+ android:src="@android:color/transparent"/>
+ <LinearLayout android:id="@+id/folder_selector"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingStart="16dp"
+ android:paddingBottom="16dp">
+ <view class="com.android.browser.AddBookmarkPage$CustomListView"
+ android:id="@+id/list"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+ <TextView
+ android:id="@+id/empty"
+ android:visibility="gone"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/download_text_hint"
+ android:text="@string/no_subfolders"
+ android:contentDescription="@string/no_subfolders"
+ android:textSize="@dimen/download_text_hint" />
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+ </ScrollView>
+ </FrameLayout>
</LinearLayout>
-</merge>
+ <!-- Download FAB -->
+ <LinearLayout style="?android:attr/buttonBarStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_gravity="top|end"
+ android:paddingTop="152dp"
+ android:paddingEnd="16dp">
+ <FrameLayout android:id="@+id/floating_action_button_container"
+ style="@style/floating_action_button"
+ android:background="@drawable/fab_accent_mynav">
+ <ImageButton
+ android:id="@+id/OK"
+ style="@style/floating_action_button_image"
+ android:background="@drawable/floating_action_button_mynav"
+ android:src="@drawable/ic_download_ok" />
+ </FrameLayout>
+ </LinearLayout>
+</FrameLayout>
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index 8a45375..374f51c 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -89,7 +89,7 @@
android:orientation="vertical" >
<LinearLayout android:layout_width="match_parent"
- android:layout_height="72dp"
+ android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="8dp"
android:layout_gravity="center">
@@ -114,63 +114,65 @@
</LinearLayout>
<LinearLayout android:layout_width="match_parent"
- android:layout_height="72dp"
+ android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="8dp"
android:layout_gravity="center">
<ImageView
android:layout_height="@dimen/download_icon_size"
android:layout_width="@dimen/download_icon_size"
- android:src="@drawable/ic_download_size"/>
+ android:src="@drawable/ic_download_size"
+ android:gravity="center"/>
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingBottom="16dp">
<TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:text="@string/download_size_hint"
+ android:textSize="18sp" />
+ <TextView
android:id="@+id/download_estimate_size_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/download_filesize"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/black"
- android:textSize="18sp" />
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
android:textColor="@color/download_text_hint"
- android:text="@string/download_size_hint"
android:textSize="@dimen/download_text_hint" />
</LinearLayout>
</LinearLayout>
<LinearLayout android:layout_width="match_parent"
- android:layout_height="72dp"
+ android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center">
<ImageView
android:layout_height="@dimen/download_icon_size"
android:layout_width="@dimen/download_icon_size"
- android:src="@drawable/ic_download_eta"/>
+ android:src="@drawable/ic_download_eta"
+ android:gravity="center"/>
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingStart="16dp">
<TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/download_eta_hint"
+ android:textColor="@color/black"
+ android:textSize="18sp" />
+ <TextView
android:id="@+id/download_estimate_time_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/download_timeneeded"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/black"
- android:textSize="18sp" />
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/download_eta_hint"
android:textColor="@color/download_text_hint"
android:textSize="@dimen/download_text_hint" />
</LinearLayout>