iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unused styles

Browse Source 
partially fix headlines list rendering incorrectly on 5.0 (thanks a lot, google)
This commit is contained in:
Andrew Dolgov 2014-11-13 12:59:40 +03:00
parent 72505dc655
commit 7a9ce35f2e
20 changed files with 33 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -329,6 +329,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
ListView list = (ListView)view.findViewById(R.id.headlines_list);
// thanks google
if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) {
list.setDividerHeight(0);
}
if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
Display display = wm.getDefaultDisplay();

5
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
View File

@ -307,6 +307,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
ListView list = (ListView)view.findViewById(R.id.headlines_list);
// thanks google
if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) {
list.setDividerHeight(0);
}
if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
Display display = wm.getDefaultDisplay();

4
org.fox.ttrss/src/main/res/drawable/paper_sepia.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/paper_sepia_bitmap"
android:tileMode="repeat" />

5
org.fox.ttrss/src/main/res/drawable/shadow.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap
xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/shadow_bitmap"
android:gravity="fill_vertical|right" />

7
org.fox.ttrss/src/main/res/drawable/shadow_feeds.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@color/feeds_light"/>
<item android:drawable="@drawable/shadow"/>
</layer-list>

7
org.fox.ttrss/src/main/res/drawable/shadow_feeds_gray.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@color/feeds_dark_gray"/>
<item android:drawable="@drawable/shadow"/>
</layer-list>

7
org.fox.ttrss/src/main/res/drawable/shadow_feeds_sepia.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@color/feeds_sepia"/>
<item android:drawable="@drawable/shadow"/>
</layer-list>

7
org.fox.ttrss/src/main/res/drawable/shadow_headlines.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- <item android:drawable="@color/headlines_light"/> -->
<item android:drawable="@drawable/shadow"/>
</layer-list>

7
org.fox.ttrss/src/main/res/drawable/shadow_headlines_gray.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@color/feeds_dark_gray"/>
<item android:drawable="@drawable/shadow"/>
</layer-list>

7
org.fox.ttrss/src/main/res/drawable/shadow_headlines_sepia.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/paper_sepia"/>
<item android:drawable="@drawable/shadow"/>
</layer-list>

2
org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
View File

@ -24,7 +24,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.4"
android:background="?feedlistBackground" >
android:background="?headlinesBackground" >
</FrameLayout>
<FrameLayout

5
org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
View File

@ -19,13 +19,14 @@
android:id="@+id/headlines_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?smallScreenBackground"></FrameLayout>
android:background="?headlinesBackground">
</FrameLayout>
<FrameLayout
android:id="@+id/feeds_fragment"
android:layout_width="300dp"
android:layout_gravity="start"
android:background="?smallScreenBackground"
android:background="?feedlistBackground"
android:layout_height="match_parent" >
</FrameLayout>

2
org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml
View File

@ -29,7 +29,7 @@
android:layout_height="match_parent"
android:layout_width="500dp"
android:layout_gravity="start"
android:background="?headlinesBackgroundSolid">
android:background="?headlinesBackground">
</FrameLayout>
</android.support.v4.widget.DrawerLayout>

2
org.fox.ttrss/src/main/res/layout/article_images_pager.xml
View File

@ -2,7 +2,7 @@
android:id="@+id/article_images"
android:layout_width="fill_parent"
android:fitsSystemWindows="true"
android:background="?smallScreenBackground"
android:background="?headlinesBackground"
android:layout_height="fill_parent">
/*
android:paddingLeft="@dimen/activity_horizontal_margin"

4
org.fox.ttrss/src/main/res/layout/headlines.xml
View File

@ -12,13 +12,13 @@
android:id="@+id/headlines_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?smallScreenBackground"></FrameLayout>
android:background="?headlinesBackground"></FrameLayout>
<FrameLayout
android:id="@+id/feeds_fragment"
android:layout_width="240dp"
android:layout_gravity="start"
android:background="?smallScreenBackground"
android:background="?feedlistBackground"
android:layout_height="match_parent" >
</FrameLayout>

2
org.fox.ttrss/src/main/res/layout/headlines_articles.xml
View File

@ -16,7 +16,7 @@
android:visibility="gone"
android:layout_height="0dp"
android:layout_width="0dp"
android:background="?headlinesBackgroundSolid">
android:background="?headlinesBackground">
</FrameLayout>
</FrameLayout>

5
org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
View File

@ -13,9 +13,8 @@
android:id="@+id/headlines_list"
android:layout_width="match_parent"
android:layoutAnimation="@anim/layout_headline"
android:dividerHeight="0dp"
android:divider="@null"
android:paddingTop="3dp"
android:dividerHeight="8dp"
android:divider="@android:color/transparent"
android:layout_height="match_parent" >
</ListView>
</android.support.v4.widget.SwipeRefreshLayout>

2
org.fox.ttrss/src/main/res/values/attrs.xml
View File

@ -2,10 +2,8 @@
<resources>
<attr name="ttrssHorizontalDivider" format="reference|color" />
<attr name="feedlistBackground" format="reference|color" />
<attr name="smallScreenBackground" format="reference|color" />
<attr name="unreadCounterColor" format="reference|color" />
<attr name="headlinesBackground" format="reference|color" />
<attr name="headlinesBackgroundSolid" format="reference|color" />
<attr name="articleBackground" format="reference|color" />
<attr name="headlineSelectedBackground" format="reference|color" />
<attr name="headlineUnreadBackground" format="reference|color" />

4
org.fox.ttrss/src/main/res/values/resources.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="feeds_light">#e0e0e0</color>
<!-- <color name="feeds_light">#e0e0e0</color>
<color name="headlines_light">#ffffff</color>
<color name="headlines_sepia">#EAE2DC</color>
<color name="feeds_sepia">#D3C6BA</color>
@ -9,5 +9,5 @@
<color name="unread_counter_background_dark">#63758E</color>
<color name="unread_counter_background_sepia">#C46262</color>
<color name="unread_counter_background_selected_light">#4684ff</color>
<color name="feeds_dark_gray">#1c1d1e</color>
<color name="feeds_dark_gray">#1c1d1e</color> -->
</resources>

28
org.fox.ttrss/src/main/res/values/style.xml
View File

@ -2,12 +2,10 @@
<style name="LightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="statusBarHintColor">?colorPrimary</item>
<item name="smallScreenBackground">#eeeeee</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
<item name="feedlistBackground">#e0e0e0</item>
<item name="unreadCounterColor">#909090</item>
<item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
<item name="headlinesBackgroundSolid">#f0f0f0</item>
<item name="headlinesBackground">#f0f0f0</item>
<item name="articleBackground">@android:color/white</item>
<item name="headlineSelectedBackground">?colorAccent</item>
<item name="headlineUnreadBackground">@android:color/white</item>
@ -39,10 +37,8 @@
</style>
<style name="SepiaTheme" parent="LightTheme">
<item name="smallScreenBackground">@drawable/paper_sepia</item>
<item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
<item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
<item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
<item name="feedlistBackground">#EAE2DC</item>
<item name="headlinesBackground">#EAE2DC</item>
<item name="feedlistTextColor">#35281C</item>
<item name="linkColor">?colorPrimary</item>
@ -57,15 +53,13 @@
<item name="articleNoteBackground">#543800</item>
<item name="headlineNormalBackground">@android:color/black</item>
<item name="smallScreenBackground">@android:color/black</item>
<item name="feedlistBackground">?colorPrimaryDark</item>
<item name="headlinesBackground">@android:color/black</item>
<item name="headlinesBackgroundSolid">@android:color/black</item>
<item name="articleBackground">@android:color/black</item>
<item name="articleHeaderTextColor">?linkColor</item>
<item name="articleTextColor">?colorPrimary</item>
<item name="articleTextColor">#D2B944</item>
<item name="linkColor">?colorAccent</item>
<item name="feedlistTextColor">?linkColor</item>
@ -83,9 +77,9 @@
<item name="iconTintColor">?linkColor</item>
<item name="colorPrimary">#CC9500</item>
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">#A57100</item>
<item name="colorAccent">#FFBF00</item>
<item name="colorAccent">#EACF4C</item>
</style>
<style name="DarkTheme" parent="Theme.AppCompat">
@ -107,12 +101,10 @@
<item name="articleNoteTextColor">@android:color/secondary_text_dark</item>
<item name="articleNoteBackground">#303030</item>
<item name="parentBtnBackground">#101010</item>
<item name="smallScreenBackground">@color/feeds_dark_gray</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">@drawable/shadow_feeds_gray</item>
<item name="headlinesBackground">@drawable/shadow_headlines_gray</item>
<item name="headlinesBackgroundSolid">@color/feeds_dark_gray</item>
<item name="articleBackground">@color/feeds_dark_gray</item>
<item name="feedlistBackground">#1c1d1e</item>
<item name="headlinesBackground">#1c1d1e</item>
<item name="articleBackground">#1c1d1e</item>
<item name="feedsSelectedBackground">?colorPrimaryDark</item>
<item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
<item name="articleHeader">?colorPrimaryDark</item>