diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
49 files changed, 200 insertions, 107 deletions
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png Binary files differnew file mode 100644 index 00000000..d84624ca --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png Binary files differnew file mode 100644 index 00000000..1b4e2ac6 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png Binary files differnew file mode 100644 index 00000000..ec65283b --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png Binary files differnew file mode 100644 index 00000000..d877db05 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png Binary files differnew file mode 100644 index 00000000..68945759 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png Binary files differnew file mode 100644 index 00000000..b3ecbf00 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png Binary files differnew file mode 100644 index 00000000..7dcdca0e --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png Binary files differnew file mode 100644 index 00000000..37ea9a33 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png Binary files differnew file mode 100644 index 00000000..7b47abd1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png Binary files differnew file mode 100644 index 00000000..d9251d44 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png Binary files differnew file mode 100644 index 00000000..fe3218cf --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png Binary files differnew file mode 100644 index 00000000..5af3c92e --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png Binary files differnew file mode 100644 index 00000000..53ff92a2 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png Binary files differnew file mode 100644 index 00000000..0f15737f --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png Binary files differnew file mode 100644 index 00000000..33d96f00 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png Binary files differnew file mode 100644 index 00000000..8c1ea784 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png Binary files differnew file mode 100644 index 00000000..33b01737 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png Binary files differnew file mode 100644 index 00000000..ec479dbf --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png Binary files differnew file mode 100644 index 00000000..c2ec115e --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png Binary files differnew file mode 100644 index 00000000..02183b60 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png Binary files differnew file mode 100644 index 00000000..7b51ffcc --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png Binary files differnew file mode 100644 index 00000000..f55069c1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png Binary files differnew file mode 100644 index 00000000..dd732d55 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png Binary files differnew file mode 100644 index 00000000..f8d6b481 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png Binary files differnew file mode 100644 index 00000000..ef0c2a10 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png Binary files differnew file mode 100644 index 00000000..7dd24dcd --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png Binary files differnew file mode 100644 index 00000000..26cffdf5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png Binary files differnew file mode 100644 index 00000000..bd78a122 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png Binary files differnew file mode 100644 index 00000000..0d020b1f --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png Binary files differnew file mode 100644 index 00000000..7a750aa4 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png diff --git a/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml b/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml index 8027faf4..11a5c334 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0.5" - android:text="Update categories" /> + android:text="@string/update_categories" /> <Button style="?android:attr/buttonBarButtonStyle" diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index d39cdad0..6779a950 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -2,6 +2,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="120dp" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:weightSum="1" android:clickable="false"> @@ -24,10 +25,10 @@ android:layout_height="wrap_content" android:src="@drawable/ic_settings" android:id="@+id/drawer_settings_btn" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:clickable="true" android:layout_marginBottom="16dp" - android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" android:transitionName="SETTINGS_REVEAL" android:background="@drawable/ripple" /> @@ -45,9 +46,9 @@ android:id="@+id/drawer_header_login" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" + android:layout_marginStart="16dp" android:textColor="@android:color/primary_text_dark" - android:text="test" + tools:text="test" android:textSize="14sp" android:textStyle="bold" @@ -58,9 +59,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/primary_text_dark" - android:layout_marginLeft="16dp" + android:layout_marginStart="16dp" android:layout_marginTop="5dp" - android:text="example.org" + tools:text="example.org" android:textSize="14sp" android:textStyle="normal" diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index c54955de..bb263237 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -29,7 +29,7 @@ android:gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingLeft="35dp" + android:paddingStart="35dp" android:singleLine="true" android:text=".." android:paddingBottom="2dp" diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 64491f2c..7a10bc23 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -28,10 +29,12 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:layout_weight="1" - android:ellipsize="end" - android:paddingLeft="35dp" + android:ellipsize="middle" + android:paddingStart="35dp" + android:paddingEnd="16dp" android:singleLine="true" - android:text="Feed" + tools:text="Feed title" + android:textAlignment="viewStart" android:paddingBottom="2dp" android:textColor="?feedlistTextColor" android:textSize="14sp" /> @@ -42,9 +45,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" + android:textAlignment="viewEnd" android:singleLine="true" - android:text="3200" - android:layout_marginLeft="16dp" + tools:text="3200" android:textColor="?unreadCounterColor" android:textSize="14sp" /> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index 9e14e56e..d5b6cb3c 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -30,10 +31,12 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:layout_weight="1" - android:ellipsize="end" - android:paddingLeft="35dp" + android:ellipsize="middle" + android:paddingStart="35dp" + android:paddingEnd="16dp" android:singleLine="true" - android:text="Feed" + tools:text="Feed title" + android:textAlignment="viewStart" android:paddingBottom="2dp" android:textColor="?feedlistSelectedTextColor" android:textSize="14sp" /> @@ -44,9 +47,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" + android:textAlignment="viewEnd" android:singleLine="true" - android:text="3200" - android:layout_marginLeft="16dp" + tools:text="3200" android:textColor="?unreadCounterColor" android:textSize="14sp" /> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml index 86875240..f9f377f6 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -29,9 +30,11 @@ android:gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingLeft="35dp" + android:paddingStart="35dp" + android:paddingEnd="16dp" android:singleLine="true" - android:text="Feed" + tools:text="Unread only" + android:textAlignment="viewStart" android:paddingBottom="2dp" android:textColor="?feedlistTextColor" android:textSize="14sp" /> @@ -40,7 +43,6 @@ android:id="@+id/row_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_marginLeft="16dp" /> + android:layout_weight="0"/> </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 0dd14149..013b898c 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -1,5 +1,6 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/article_fragment" android:layout_width="fill_parent" android:layout_height="match_parent" @@ -42,8 +43,24 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_marginEnd="8dp" + android:textAlignment="viewStart" + tools:text="Unreasonably long article title blah blah blah blah blah blah" android:textColor="?articleHeaderTextColor" - android:textSize="18sp" /> + android:textSize="18sp" + android:layout_marginRight="8dp" + android:gravity="start" /> + + <ImageView + android:id="@+id/score" + android:layout_width="wrap_content" + android:layout_height="24dp" + android:layout_weight="0" + android:background="@drawable/ripple" + android:clickable="true" + android:layout_marginLeft="8dp" + android:src="?ic_action_trending_flat" + android:layout_gravity="center_vertical|end" /> <ImageView android:id="@+id/attachments" @@ -54,7 +71,7 @@ android:layout_marginLeft="8dp" android:clickable="true" android:src="?ic_attachment_vert" - android:layout_gravity="center_vertical|right" /> + android:layout_gravity="center_vertical|end" /> <ImageView android:id="@+id/share" @@ -62,17 +79,18 @@ android:layout_width="wrap_content" android:layout_height="24dp" android:layout_weight="0" - android:layout_marginLeft="8dp" android:clickable="true" android:src="?ic_share" - android:layout_gravity="center_vertical|right" /> + android:layout_gravity="center_vertical|end" /> </LinearLayout> <TextView android:id="@+id/comments" + tools:text="comments" android:background="@drawable/ripple" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textAlignment="viewStart" android:layout_weight="1" android:fontFamily="sans-serif-light" android:paddingTop="8dp" @@ -87,10 +105,12 @@ <TextView android:id="@+id/tags" - android:layout_width="wrap_content" + tools:text="alpha, beta, gamma" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="1" + android:layout_weight="0.7" android:ellipsize="middle" + android:textAlignment="viewStart" android:singleLine="true" android:fontFamily="sans-serif-light" android:textColor="?headlineSecondaryTextColor" @@ -98,11 +118,12 @@ <TextView android:id="@+id/date" - android:layout_width="wrap_content" + tools:text="Jan 01, 1970" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="0" - android:gravity="right" - android:layout_marginLeft="10dp" + android:layout_weight="0.3" + android:gravity="" + android:textAlignment="viewEnd" android:fontFamily="sans-serif-light" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?headlineSecondaryTextColor" @@ -135,6 +156,7 @@ <TextView android:id="@+id/note" + tools:text="Article note (if any...)" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 97684a94..2e997e2c 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -3,8 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/headlines_row" android:layout_width="wrap_content" - android:layout_height="wrap_content" - tools:ignore="HardcodedText"> + android:layout_height="wrap_content"> <TableLayout android:layout_width="fill_parent" @@ -83,19 +82,19 @@ <TextView android:id="@+id/title" - android:background="@drawable/ripple" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_span="2" + android:background="@drawable/ripple" + android:ellipsize="end" + android:textAlignment="viewStart" android:gravity="center_vertical" + android:maxLines="3" android:paddingBottom="8dp" android:singleLine="false" - android:text="Sample entry title" android:textColor="?headlineExcerptTextColor" android:textSize="18sp" android:textStyle="normal" - android:maxLines="3" - android:ellipsize="end" /> + tools:text="Sample entry title" /> <LinearLayout android:layout_width="match_parent" @@ -109,11 +108,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.5" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" + android:textAlignment="viewStart" android:singleLine="true" - android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> @@ -124,9 +124,10 @@ android:layout_weight="0.5" android:ellipsize="none" android:fontFamily="sans-serif-light" - android:gravity="right|center_vertical" + android:gravity="center_vertical" + android:textAlignment="viewEnd" android:singleLine="true" - android:text="Jan 01, 12:00, 1970" + tools:text="Jan 01, 12:00, 1970" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> @@ -140,7 +141,7 @@ android:id="@+id/flavor_video_kind" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left|bottom" + android:layout_gravity="start|bottom" android:scaleType="fitXY" android:src="@drawable/ic_play_circle" android:visibility="visible" @@ -150,7 +151,7 @@ android:elevation="4dp" android:tint="?colorAccent" android:layout_marginBottom="8dp" - android:layout_marginLeft="8dp" /> + android:layout_marginStart="8dp" /> <ImageView android:id="@+id/gallery_overflow" @@ -162,10 +163,11 @@ android:paddingLeft="4dp" android:paddingRight="4dp" android:src="@drawable/ic_dots_vertical_circle" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:elevation="4dp" android:tint="?colorAccent" - android:layout_marginBottom="10dp" /> + android:layout_marginBottom="10dp" + tools:targetApi="lollipop" /> </FrameLayout> </TableRow> @@ -180,10 +182,11 @@ android:layout_height="match_parent" android:layout_span="2" android:ellipsize="end" + android:textAlignment="viewStart" android:lineSpacingExtra="2sp" android:maxLines="5" android:padding="16dp" - android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." + tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:textColor="?headlineExcerptTextColor" android:textSize="13sp" /> </TableRow> @@ -213,16 +216,28 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_weight="1" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" android:singleLine="true" - android:text="by Author" + tools:text="by Author" + android:textAlignment="viewStart" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" android:textStyle="italic" /> <ImageView + android:id="@+id/score" + android:layout_width="wrap_content" + android:layout_height="24dp" + android:layout_weight="0" + android:background="@drawable/ripple" + android:clickable="true" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:src="?ic_action_trending_flat" /> + + <ImageView android:id="@+id/attachments" android:layout_width="wrap_content" android:layout_height="24dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml index 30f86ff0..d139313e 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -13,7 +13,8 @@ android:layout_marginRight="16dp" android:layout_gravity="center_vertical|left" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginEnd="16dp"> <ImageView android:clickable="true" @@ -43,9 +44,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" + android:textAlignment="viewStart" android:maxLines="2" android:ellipsize="end" - android:text="Sample entry title" + tools:text="Sample entry title" android:textColor="?headlineExcerptTextColor" android:textSize="18sp" android:layout_span="2" /> @@ -53,10 +55,11 @@ <TextView android:id="@+id/excerpt" android:maxLines="2" + android:textAlignment="viewStart" android:ellipsize="end" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." + tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:textColor="?headlineExcerptTextColor" android:textSize="13sp" android:layout_span="2" @@ -71,11 +74,12 @@ android:id="@+id/feed_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" android:singleLine="true" - android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + android:textAlignment="viewStart" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" @@ -100,7 +104,7 @@ android:singleLine="true" android:ellipsize="none" android:layout_weight="1" - android:text="Jan 01" + tools:text="Jan 01" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> @@ -110,7 +114,7 @@ android:id="@+id/marked" android:background="@drawable/ripple" android:layout_width="24dp" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:layout_height="24dp" android:layout_weight="0" android:clickable="true" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml index 0f0805aa..2e449dbb 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -12,9 +12,10 @@ <FrameLayout android:layout_marginRight="16dp" - android:layout_gravity="center_vertical|left" + android:layout_gravity="center_vertical|start" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginEnd="16dp"> <ImageView android:clickable="true" @@ -44,9 +45,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" + android:textAlignment="viewStart" android:maxLines="2" android:ellipsize="end" - android:text="Sample entry title" + tools:text="Sample entry title" android:textColor="?headlineSelectedTextColor" android:textSize="18sp" android:layout_span="2" /> @@ -54,10 +56,11 @@ <TextView android:id="@+id/excerpt" android:maxLines="2" + android:textAlignment="viewStart" android:ellipsize="end" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." + tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:textColor="?headlineSelectedExcerptTextColor" android:textSize="13sp" android:layout_span="2" @@ -72,11 +75,12 @@ android:id="@+id/feed_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" android:singleLine="true" - android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + tools:text="Example Feed" + android:textAlignment="viewStart" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" @@ -101,18 +105,18 @@ android:singleLine="true" android:ellipsize="none" android:layout_weight="1" - android:text="Jan 01" + tools:text="Jan 01" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" /> <ImageView + android:id="@+id/marked" android:tint="?headlineFooterColor" android:background="@drawable/ripple" - android:id="@+id/marked" android:layout_width="24dp" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:layout_height="24dp" android:layout_weight="0" android:clickable="true" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml index 070a22e0..024eb7cf 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml @@ -12,9 +12,10 @@ <FrameLayout android:layout_marginRight="8dp" - android:layout_gravity="center_vertical|left" + android:layout_gravity="center_vertical|start" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginEnd="8dp"> <ImageView android:clickable="true" @@ -42,9 +43,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" + android:textAlignment="viewStart" android:maxLines="2" android:ellipsize="end" - android:text="Sample entry title" + tools:text="Sample entry title" android:textColor="?headlineSelectedTextColor" android:textStyle="bold" android:textSize="18sp" @@ -53,10 +55,11 @@ <TextView android:id="@+id/excerpt" android:maxLines="2" + android:textAlignment="viewStart" android:ellipsize="end" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." + tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:textColor="?headlineSelectedExcerptTextColor" android:textSize="13sp" android:layout_span="2" @@ -71,11 +74,12 @@ android:id="@+id/feed_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" android:singleLine="true" - android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + tools:text="Example Feed" + android:textAlignment="viewStart" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" @@ -100,7 +104,7 @@ android:singleLine="true" android:ellipsize="none" android:layout_weight="1" - android:text="Jan 01" + tools:text="Jan 01" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" /> @@ -111,7 +115,7 @@ android:background="@drawable/ripple" android:tint="?headlineFooterColor" android:layout_width="24dp" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:layout_height="24dp" android:layout_weight="0" android:clickable="true" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index d44e016a..ba70bb89 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -4,8 +4,7 @@ android:id="@+id/headlines_row" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?headlineUnreadBackground" - tools:ignore="HardcodedText"> + android:background="?headlineUnreadBackground"> <TableLayout android:layout_width="fill_parent" @@ -14,7 +13,6 @@ android:shrinkColumns="0,1" android:stretchColumns="0,1"> - <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -84,19 +82,20 @@ <TextView android:id="@+id/title" - android:background="@drawable/ripple" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_span="2" + android:background="@drawable/ripple" + android:ellipsize="end" android:gravity="center_vertical" + android:maxLines="3" android:paddingBottom="8dp" android:singleLine="false" - android:text="Sample entry title" + android:textAlignment="viewStart" android:textColor="?headlineUnreadTextColor" android:textSize="18sp" android:textStyle="bold" - android:ellipsize="end" - android:maxLines="3" /> + tools:text="Sample entry title" /> <LinearLayout android:layout_width="match_parent" @@ -110,11 +109,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.5" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" + android:textAlignment="viewStart" android:singleLine="true" - android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + tools:text="Example Feed" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> @@ -125,9 +125,10 @@ android:layout_weight="0.5" android:ellipsize="none" android:fontFamily="sans-serif-light" - android:gravity="right|center_vertical" + android:gravity="center_vertical" + android:textAlignment="viewEnd" android:singleLine="true" - android:text="Jan 01, 12:00, 1970" + tools:text="Jan 01, 12:00, 1970" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> @@ -141,7 +142,7 @@ android:id="@+id/flavor_video_kind" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|left" + android:layout_gravity="bottom|start" android:scaleType="fitXY" android:src="@drawable/ic_play_circle" android:visibility="visible" @@ -149,7 +150,7 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:tint="?colorAccent" - android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" android:layout_marginBottom="8dp" /> <ImageView @@ -162,9 +163,11 @@ android:paddingLeft="4dp" android:paddingRight="4dp" android:src="@drawable/ic_dots_vertical_circle" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" + android:elevation="4dp" android:tint="?colorAccent" - android:layout_marginBottom="10dp" /> + android:layout_marginBottom="10dp" + tools:targetApi="lollipop" /> </FrameLayout> </TableRow> @@ -179,10 +182,11 @@ android:layout_height="match_parent" android:layout_span="2" android:ellipsize="end" + android:textAlignment="viewStart" android:lineSpacingExtra="2sp" android:maxLines="5" android:padding="16dp" - android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." + tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:textColor="?headlineExcerptTextColor" android:textSize="13sp" /> </TableRow> @@ -212,16 +216,28 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_weight="1" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" android:singleLine="true" - android:text="by Author" + tools:text="by Author" + android:textAlignment="viewStart" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" android:textStyle="italic" /> <ImageView + android:id="@+id/score" + android:layout_width="wrap_content" + android:layout_height="24dp" + android:layout_weight="0" + android:background="@drawable/ripple" + android:clickable="true" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:src="?ic_action_trending_flat" /> + + <ImageView android:id="@+id/attachments" android:layout_width="wrap_content" android:layout_height="24dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml index 08eacd31..e440188f 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml @@ -12,9 +12,10 @@ <FrameLayout android:layout_marginRight="16dp" - android:layout_gravity="center_vertical|left" + android:layout_gravity="center_vertical|start" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginEnd="16dp"> <ImageView android:clickable="true" @@ -44,9 +45,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" + android:textAlignment="viewStart" android:maxLines="2" android:ellipsize="end" - android:text="Sample entry title" + tools:text="Sample entry title" android:textColor="?headlineUnreadTextColor" android:textStyle="bold" android:textSize="18sp" @@ -55,10 +57,11 @@ <TextView android:id="@+id/excerpt" android:maxLines="2" + android:textAlignment="viewStart" android:ellipsize="end" android:layout_width="match_parent" android:layout_height="match_parent" - android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." + tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:textColor="?headlineExcerptTextColor" android:textSize="13sp" android:layout_span="2" @@ -73,11 +76,12 @@ android:id="@+id/feed_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:ellipsize="end" + android:ellipsize="middle" android:fontFamily="sans-serif-light" android:gravity="center_vertical" android:singleLine="true" - android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" + android:textAlignment="viewStart" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" android:layout_weight="0.5" @@ -102,7 +106,7 @@ android:singleLine="true" android:ellipsize="none" android:layout_weight="1" - android:text="Jan 01" + tools:text="Jan 01" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> @@ -112,7 +116,7 @@ android:id="@+id/marked" android:background="@drawable/ripple" android:layout_width="24dp" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:layout_height="24dp" android:layout_weight="0" android:clickable="true" diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml index 7c5c9465..df66fe75 100755 --- a/org.fox.ttrss/src/main/res/menu/activity_main.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml @@ -77,12 +77,6 @@ </group> - <item - android:id="@+id/donate" - android:orderInCategory="899" - app:showAsAction="" - android:title="@string/trial_purchase"/> - <!-- <item android:orderInCategory="999" android:id="@+id/preferences" diff --git a/org.fox.ttrss/src/main/res/values-ja/strings.xml b/org.fox.ttrss/src/main/res/values-ja/strings.xml index 423ff592..ce0d508f 100755 --- a/org.fox.ttrss/src/main/res/values-ja/strings.xml +++ b/org.fox.ttrss/src/main/res/values-ja/strings.xml @@ -133,7 +133,7 @@ <string name="trial_expired_message">Tiny Tiny RSSを継続して使用する場合はTiny Tiny RSS Unlockerを購入してください。</string> <string name="theme_sepia">セピア</string> <string name="theme_amber">アンバー</string> - <string name="reading">Reading</string> + <string name="reading">読む</string> <string name="offline_articles_to_download">ダウンロードする記事数</string> <string name="offline_articles_to_download_long">オフラインモードにする際にダウンロードする記事数(新しい記事から)</string> <string name="pref_headlines_show_content_long">記事内容をヘッドライン一覧に表示する</string> @@ -202,6 +202,10 @@ <string name="headlines_sort_articles_title">記事の並び替え</string> <string name="fresh_articles">新着記事</string> <string name="feed_all_articles">全ての記事</string> + <string name="feed_starred_articles">スター付きの記事</string> + <string name="feed_published_articles">配信した記事</string> + <string name="feed_archived_articles">アーカイブした記事</string> + <string name="feed_recently_read">最近読んだ</string> <string name="prefs_enable_fab">FABを有効にする</string> <string name="prefs_enable_fab_long">フローティングアクションボタンを表示する</string> <string name="prefs_open_fresh_on_startup">起動時に新着記事を表示する</string> @@ -218,4 +222,8 @@ <string name="prefs_widget_show_fresh">新着記事数を表示</string> <string name="prefs_widget_show_fresh_summary">全未読記事数の代わりに新着記事数を表示する</string> <string name="prefs_widget">ウィジェット</string> + <string name="prefs_network_settings">その他の設定…</string> + <string name="prefs_opening_links">リンクを開く</string> + <string name="open_with">で開く…</string> + <string name="headlines">ヘッドライン</string> </resources> diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml index e9b143df..3c15a0fd 100644 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ b/org.fox.ttrss/src/main/res/values-night/style.xml @@ -57,6 +57,9 @@ <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle</item> <item name="ic_attachment">@drawable/ic_attachment</item> <item name="ic_attachment_vert">@drawable/ic_attachment_vert</item> + <item name="ic_action_trending_up">@drawable/ic_action_trending_up</item> + <item name="ic_action_trending_flat">@drawable/ic_action_trending_flat</item> + <item name="ic_action_trending_down">@drawable/ic_action_trending_down</item> <item name="drawer_header">@drawable/drawer_header_dark</item> </style> diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index cc0f84b6..93892545 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -53,4 +53,7 @@ <attr name="drawer_header" format="reference" /> <attr name="ic_restore" format="reference" /> <attr name="ic_inbox" format="reference" /> + <attr name="ic_action_trending_up" format="reference" /> + <attr name="ic_action_trending_flat" format="reference" /> + <attr name="ic_action_trending_down" format="reference" /> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index ef0013ea..f4d0119c 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -293,4 +293,8 @@ <string name="img_share_url">Share URL</string> <string name="img_share_image">Share image</string> <string name="img_share_failed_to_load">Failed to load image for sharing</string> + <string name="update_categories">Update categories</string> + <string name="score_for_this_article">Score for this article</string> + <string name="set_score">Set score</string> + <string name="score_invalid">Invalid score</string> </resources> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index ecc13527..033a9492 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -63,6 +63,9 @@ <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle_dark</item> <item name="ic_attachment">@drawable/ic_attachment_dark</item> <item name="ic_attachment_vert">@drawable/ic_attachment_vert_dark</item> + <item name="ic_action_trending_up">@drawable/ic_action_trending_up_dark</item> + <item name="ic_action_trending_flat">@drawable/ic_action_trending_flat_dark</item> + <item name="ic_action_trending_down">@drawable/ic_action_trending_down_dark</item> <item name="drawer_header">@drawable/drawer_header</item> </style> |
