gello: revamp download UI
Change-Id: I457c69a8359359fef81593467b31d2dd8fb57fd6
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index 1d42b7d..8a45375 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -1,202 +1,202 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ Copyright (C) 2015 The CyanogenMod Project
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
+ 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
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 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.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:divider="?android:attr/dividerHorizontal"
- android:orientation="vertical"
- android:showDividers="middle" >
- <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/download_settings_title"
- android:layout_width="0dip"
- android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <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:layout_gravity="center_vertical"
- android:gravity="center_vertical"
- android:text="@string/download_settings_title"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:background="@color/accent"
+ android:elevation="5dp">
- </LinearLayout>
-
- <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/download_table_layout"
+ <LinearLayout android:id="@+id/actions_download_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="20dip"
- android:paddingEnd="20dip"
- android:paddingTop="10dip"
- android:shrinkColumns="1"
- android:stretchColumns="1" >
+ android:orientation="vertical"
+ android:paddingStart="16dp"
+ android:paddingTop="16dp">
+ <ImageButton
+ android:id="@+id/download_cancel"
+ style="?android:attr/buttonBarButtonStyle"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:src="@drawable/ic_action_back"/>
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:src="@color/accent"/>
- <TableRow android:layout_marginBottom="10dip" >
-
- <TextView
- android:layout_width="wrap_content"
+ <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:text="@string/download_edit_filename_label"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="18sp" >
- </TextView>
+ android:paddingStart="26dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="32dp">
+ <EditText
+ android:id="@+id/download_filename_edit"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textCapSentences"
+ 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/download_filename_edit"
- android:layout_width="260dip"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:inputType="textCapSentences"
- android:selectAllOnFocus="true"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="18sp" >
- </EditText>
- </TableRow>
+ </LinearLayout>
- <TableRow
- android:layout_marginBottom="10dip" >
+ </LinearLayout>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:text="@string/download_filepath_label"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="18sp" >
- </TextView>
-
- <EditText
- android:id="@+id/download_filepath_selected"
- android:layout_width="260dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:editable="false"
- android:ellipsize="end"
- android:focusableInTouchMode="false"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@android:color/holo_blue_light"
- android:textSize="18sp" >
- </EditText>
- </TableRow>
-
- <TableRow
- android:layout_marginBottom="10dip" >
-
- <TextView
- 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:textSize="18sp" >
- </TextView>
- <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:paddingStart="10dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="18sp" >
- </TextView>
- </TableRow>
-
- <TableRow
- android:layout_marginBottom="10dip" >
-
- <TextView
- 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:textSize="18sp" >
- </TextView>
- <TextView
- android:id="@+id/download_estimate_time_content"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingStart="10dip"
- android:text="@string/download_timeneeded"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="18sp" >
- </TextView>
- </TableRow>
- </TableLayout>
- </ScrollView>
- </FrameLayout>
-
- <LinearLayout
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
-
- <Button
- android:id="@+id/download_cancel"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
android:layout_weight="1"
- android:maxLines="1"
- android:text="@string/cancel" />
+ android:paddingTop="24dp">
- <Button
- android:id="@+id/download_start"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:layout_weight="1"
- android:maxLines="1"
- android:text="@string/ok" />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout
+ android:id="@+id/download_table_layout"
+ 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_path"
+ android:layout_gravity="center"/>
+ <EditText
+ android:id="@+id/download_filepath_selected"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center"
+ android:layout_alignParentEnd="true"
+ android:editable="false"
+ android:focusableInTouchMode="false"
+ 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">
+ <ImageView
+ android:layout_height="@dimen/download_icon_size"
+ android:layout_width="@dimen/download_icon_size"
+ android:src="@drawable/ic_download_size"/>
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingStart="16dp"
+ android:paddingBottom="16dp">
+ <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: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"/>
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="16dp"
+ android:paddingStart="16dp">
+ <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>
+ </LinearLayout>
+ </LinearLayout>
+ </ScrollView>
+ </FrameLayout>
</LinearLayout>
-</LinearLayout>
+ <!-- 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="144dp"
+ android:paddingEnd="16dp">
+ <FrameLayout android:id="@+id/floating_action_button_container"
+ style="@style/floating_action_button"
+ android:background="@drawable/fab_accent">
+ <ImageButton
+ android:id="@+id/download_start"
+ style="@style/floating_action_button_image"
+ android:background="@drawable/floating_action_button"
+ android:src="@drawable/ic_action_download" />
+ </FrameLayout>
+ </LinearLayout>
+
+</FrameLayout>