UI improvements

This commit is contained in:
Yuri Revich 2015-12-01 20:16:55 +03:00
parent c62fc05f8b
commit 0f7c20d015
17 changed files with 113 additions and 50 deletions

View File

@ -5,6 +5,7 @@ import com.squareup.okhttp.Response;
import org.jsoup.nodes.Document;
import java.net.URI;
import java.util.List;
import eu.kanade.mangafeed.data.database.models.Chapter;
@ -80,6 +81,14 @@ public abstract class BaseSource {
// Get the URL of the first page that contains a source image and the page list
protected String overrideChapterUrl(String defaultPageUrl) {
if(defaultPageUrl.startsWith("http")){
try {
URI uri = new URI(defaultPageUrl);
defaultPageUrl = uri.getPath() + "?" + uri.getQuery();
}catch (Exception ignored){
return defaultPageUrl;
}
}
return defaultPageUrl;
}

View File

@ -49,6 +49,7 @@ public class CatalogueAdapter extends ArrayAdapter<Manga> {
@Bind(R.id.title) TextView title;
@Bind(R.id.author) TextView author;
@Bind(R.id.thumbnail) ImageView thumbnail;
@Bind(R.id.favorite_sticker) ImageView favorite_sticker;
CatalogueFragment fragment;
@ -73,6 +74,12 @@ public class CatalogueAdapter extends ArrayAdapter<Manga> {
} else {
thumbnail.setImageResource(android.R.color.transparent);
}
if(manga.favorite){
favorite_sticker.setVisibility(View.VISIBLE);
}else{
favorite_sticker.setVisibility(View.INVISIBLE);
}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 449 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 807 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

View File

@ -19,6 +19,7 @@
android:layout_height="fill_parent"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:descendantFocusability="blocksDescendants"
tools:listitem="@layout/item_chapter">
</android.support.v7.widget.RecyclerView>
@ -37,10 +38,68 @@
android:theme="@style/ThemeOverlay.AppTheme.Dark"
app:popupTheme="@style/AppTheme.Popup">
<android.support.v7.widget.ActionMenuView
android:id="@+id/bottom_menu"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical">
<ImageView
android:id="@+id/action_sort_up"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize"/>
android:layout_height="fill_parent"
android:layout_gravity="center"
android:src="@drawable/ic_expand_less_white_36dp"
android:title="@string/action_sort_up"
android:visible="true"/>
<ImageView
android:id="@+id/action_sort_down"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/ic_expand_more_white_36dp"
android:title="@string/action_sort_down"
android:visible="true"
/>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_margin="4dp"
android:background="@color/white"/>
<CheckBox
android:id="@+id/action_show_unread"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:checkable="true"
android:text="@string/action_show_unread"
android:title="@string/action_show_unread"/>
<CheckBox
android:id="@+id/action_show_downloaded"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:checkable="true"
android:text="@string/action_show_downloaded"
android:title="@string/action_show_downloaded"/>
</LinearLayout>
<ImageView
android:id="@+id/action_next_unread"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_alignParentRight="true"
android:src="@drawable/ic_play_arrow_white_36dp"
android:title="@string/action_next_unread"
android:visible="true"/>
</RelativeLayout>
</android.support.v7.widget.Toolbar>

View File

@ -29,15 +29,27 @@
android:textSize="12sp"
android:visibility="gone"/>
<ImageView
android:id="@+id/favorite_sticker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/thumbnail"
android:layout_alignRight="@+id/thumbnail"
android:layout_alignTop="@+id/thumbnail"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:src="@drawable/ic_action_favorite"
android:visibility="invisible"/>
<LinearLayout
android:id="@+id/footerLinearLayout"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/white"
android:orientation="vertical"
android:layout_alignBottom="@+id/thumbnail"
android:layout_alignLeft="@+id/unreadText"
android:layout_alignStart="@+id/unreadText">
android:layout_alignStart="@+id/unreadText"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:id="@+id/title"
@ -50,11 +62,10 @@
android:paddingRight="8dp"
android:textColor="@color/primary_text"
android:textSize="13sp"
tools:text="Sample name"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="Sample name"/>
<TextView
tools:text="Sample name"
android:id="@+id/author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -64,7 +75,8 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textColor="@color/hint_text"
android:textSize="13sp" />
android:textSize="13sp"
tools:text="Sample name"/>
</LinearLayout>

View File

@ -64,7 +64,8 @@
android:layout_above="@+id/relativeLayout"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"/>
android:layout_alignParentTop="true"
android:layout_marginRight="30dp"/>
<RelativeLayout
android:id="@+id/chapter_menu"
@ -72,10 +73,10 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:gravity="center|end"
android:layout_alignRight="@+id/chapter_title"
android:layout_alignEnd="@+id/chapter_title"
android:layout_alignBottom="@+id/relativeLayout"
android:paddingBottom="18dp">
android:paddingBottom="18dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"

View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_sort_up"
android:title="@string/action_sort_up"
android:icon="@drawable/ic_expand_less_white_36dp"
android:visible="true"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_sort_down"
android:title="@string/action_sort_down"
android:icon="@drawable/ic_expand_more_white_36dp"
android:visible="true"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_show_unread"
android:checkable="true"
android:title="@string/action_show_unread"
android:text="@string/action_show_unread"
app:actionViewClass="android.widget.CheckBox"
app:showAsAction="ifRoom|withText" />
</menu>

View File

@ -21,10 +21,12 @@
<string name="action_edit">Edit</string>
<string name="action_sort_up">Sort up</string>
<string name="action_sort_down">Sort down</string>
<string name="action_show_unread">Show unread</string>
<string name="action_show_unread">Unread</string>
<string name="action_show_downloaded">Downloaded</string>
<string name="action_next_unread">Next unread</string>
<!-- Buttons -->
<string name="button_ok">Ok</string>
<string name="button_ok">OK</string>
<string name="button_cancel">Cancel</string>