yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #8 from icanit/master

Browse Source 
Improving chapter menu button layout
This commit is contained in:
inorichi 2015-12-02 09:52:44 +01:00
commit d5a6fac931
2 changed files with 78 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/mangafeed/data/sync/LibraryUpdateService.java
View File

@ -16,8 +16,8 @@ import eu.kanade.mangafeed.App;
import eu.kanade.mangafeed.BuildConfig; import eu.kanade.mangafeed.BuildConfig;
import eu.kanade.mangafeed.R; import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.database.DatabaseHelper; import eu.kanade.mangafeed.data.database.DatabaseHelper;
import eu.kanade.mangafeed.data.source.SourceManager;
import eu.kanade.mangafeed.data.database.models.Manga; import eu.kanade.mangafeed.data.database.models.Manga;
import eu.kanade.mangafeed.data.source.SourceManager;
import eu.kanade.mangafeed.util.AndroidComponentUtil; import eu.kanade.mangafeed.util.AndroidComponentUtil;
import eu.kanade.mangafeed.util.NetworkUtil; import eu.kanade.mangafeed.util.NetworkUtil;
import eu.kanade.mangafeed.util.NotificationUtil; import eu.kanade.mangafeed.util.NotificationUtil;

77
app/src/main/res/layout/item_chapter.xml
View File

@ -3,16 +3,21 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:background="@drawable/selector_chapter_light">
android:background="@drawable/selector_chapter_light"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<RelativeLayout
android:id="@+id/relativeLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="18dp" android:layout_height="18dp"
android:id="@+id/relativeLayout"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true">
@ -21,12 +26,12 @@
android:id="@+id/chapter_pages" android:id="@+id/chapter_pages"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:singleLine="true" android:singleLine="true"
android:textSize="12sp" android:textSize="12sp"
tools:text="Pages: 45" tools:text="Pages: 45"/>
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"/>
<TextView <TextView
android:id="@+id/chapter_date" android:id="@+id/chapter_date"
@ -41,50 +46,56 @@
android:id="@+id/download_text" android:id="@+id/download_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:textSize="12sp" android:layout_alignParentEnd="true"
android:textColor="@color/accent_text"
android:text="@string/chapter_downloaded"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/> android:layout_centerVertical="true"
android:text="@string/chapter_downloaded"
android:textColor="@color/accent_text"
android:textSize="12sp"/>
</RelativeLayout> </RelativeLayout>
<TextView <TextView
android:id="@+id/chapter_title" android:id="@+id/chapter_title"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignWithParentIfMissing="true"
android:gravity="center_vertical"
android:textSize="17sp"
android:ellipsize="end"
android:maxLines="1"
tools:text="Title"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_above="@+id/relativeLayout" android:layout_above="@+id/relativeLayout"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginRight="30dp"/> android:layout_alignWithParentIfMissing="true"
android:layout_marginRight="30dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textSize="17sp"
tools:text="Title"/>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/chapter_menu" android:id="@+id/chapter_menu"
android:layout_width="40dp" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:gravity="center|end" android:gravity="center|end"
android:layout_alignBottom="@+id/relativeLayout"
android:paddingBottom="18dp" android:paddingBottom="18dp"
android:layout_alignParentRight="true" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:layout_alignParentEnd="true"> android:paddingRight="?android:attr/listPreferredItemPaddingRight">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_more_horiz_black_24dp" android:layout_alignParentEnd="false"
android:background="?android:selectableItemBackground"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="false"/> android:layout_alignParentTop="true"
android:background="?android:selectableItemBackground"
android:src="@drawable/ic_more_horiz_black_24dp"
/>
</RelativeLayout> </RelativeLayout>