wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1082110 - Polish appearance of new reading list style. r=mcomella

Browse Source
This commit is contained in:
Margaret Leibovic 2014-10-29 15:34:38 -07:00
parent 75735725b7
commit e7f4fa9888
10 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/home/ReadingListRow.java
View File

@ -43,8 +43,6 @@ public class ReadingListRow extends LinearLayout {
LayoutInflater.from(context).inflate(R.layout.reading_list_row_view, this);
setOrientation(LinearLayout.VERTICAL);
resources = context.getResources();
title = (TextView) findViewById(R.id.title);

4
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -360,10 +360,10 @@ size. -->
<!ENTITY reading_list_added "Page added to your Reading List">
<!-- Localization note (reading_list_time_minutes) : This string is used in the "Reading List"
<!-- Localization note (reading_list_time_minutes2) : This string is used in the "Reading List"
panel on the home page to give the user an estimate of how many minutes it will take to
read an article. The word "minute" should be abbreviated if possible. -->
<!ENTITY reading_list_time_minutes "&formatD;min">
<!ENTITY reading_list_time_minutes2 "&formatD; min">
<!ENTITY reading_list_time_over_an_hour "Over an hour">
<!-- Localization note : These strings are used as alternate text for accessibility.

5
mobile/android/base/resources/layout/reading_list_item_row.xml
View File

@ -4,7 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<org.mozilla.gecko.home.ReadingListRow xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Widget.BookmarkItemView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"/>
android:layout_height="@dimen/reading_list_row_height"
android:layout_gravity="center_vertical"/>

33
mobile/android/base/resources/layout/reading_list_row_view.xml
View File

@ -6,29 +6,34 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingLeft="@dimen/reading_list_row_padding_left"
android:paddingRight="@dimen/reading_list_row_padding_right"
android:orientation="vertical"
android:gravity="center_vertical">
<TextView
android:id="@+id/title"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
style="@style/Widget.ReadingListRow.Title" />
<TextView
android:id="@+id/read_time"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/Widget.ReadingListRow.ReadTime" />
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.ReadingListRow.Description" />
</LinearLayout>
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.ReadingListRow.Description" />
android:id="@+id/read_time"
android:layout_width="64dp"
android:layout_height="match_parent"
android:gravity="center"
style="@style/Widget.ReadingListRow.ReadTime" />
</merge>

3
mobile/android/base/resources/values-large-v11/dimens.xml
View File

@ -11,4 +11,7 @@
<dimen name="tabs_counter_size">26sp</dimen>
<dimen name="panel_grid_view_column_width">200dp</dimen>
<dimen name="reading_list_row_height">96dp</dimen>
<dimen name="reading_list_row_padding_right">15dp</dimen>
</resources>

7
mobile/android/base/resources/values-large-v11/styles.xml
View File

@ -132,6 +132,13 @@
<style name="Widget.ReadingListView" parent="Widget.BookmarksListView"/>
<style name="Widget.ReadingListRow.Description">
<item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemDescription</item>
<item name="android:maxLines">2</item>
<item name="android:ellipsize">end</item>
<item name="android:lineSpacingMultiplier">1.3</item>
</style>
<style name="Widget.HomeBanner">
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>

6
mobile/android/base/resources/values-v16/styles.xml
View File

@ -17,12 +17,6 @@
<item name="android:fontFamily">sans-serif-light</item>
</style>
<style name="Widget.ReadingListRow.ReadTime">
<item name="android:textStyle">italic</item>
<item name="android:textColor">#FF9400</item>
<item name="android:fontFamily">sans-serif-condensed</item>
</style>
<style name="OnboardStartTextAppearance.Subtext">
<item name="android:textSize">18sp</item>
<item name="android:fontFamily">sans-serif-light</item>

7
mobile/android/base/resources/values/dimens.xml
View File

@ -61,9 +61,14 @@
<dimen name="new_tablet_site_security_unknown_inset_top">1dp</dimen>
<dimen name="new_tablet_site_security_unknown_inset_bottom">-1dp</dimen>
<!-- Page Row height -->
<!-- Regular page row on about:home -->
<dimen name="page_row_height">64dp</dimen>
<!-- Reading list row on about:home -->
<dimen name="reading_list_row_height">128dp</dimen>
<dimen name="reading_list_row_padding_left">15dp</dimen>
<dimen name="reading_list_row_padding_right">10dp</dimen>
<!-- Remote Tabs static view top padding. Less in landscape on phones. -->
<dimen name="home_remote_tabs_top_padding">48dp</dimen>

4
mobile/android/base/resources/values/styles.xml
View File

@ -137,12 +137,12 @@
<style name="Widget.ReadingListRow.Description">
<item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemDescription</item>
<item name="android:maxLines">4</item>
<item name="android:maxLines">3</item>
<item name="android:ellipsize">end</item>
<item name="android:lineSpacingMultiplier">1.3</item>
</style>
<style name="Widget.ReadingListRow.ReadTime">
<item name="android:textStyle">italic</item>
<item name="android:textColor">@color/text_color_highlight</item>
</style>

2
mobile/android/base/strings.xml.in
View File

@ -294,7 +294,7 @@
<string name="site_settings_no_settings">&site_settings_no_settings;</string>
<string name="reading_list_added">&reading_list_added;</string>
<string name="reading_list_time_minutes">&reading_list_time_minutes;</string>
<string name="reading_list_time_minutes">&reading_list_time_minutes2;</string>
<string name="reading_list_time_over_an_hour">&reading_list_time_over_an_hour;</string>
<string name="page_action_dropmarker_description">&page_action_dropmarker_description;</string>