mirror of
https://github.com/mihonapp/mihon.git
synced 2025-10-29 13:27:57 +01:00
UI improvements
- Manga order by title in library - New chapter list item design - Chapter item popup - Color normalisation to Material Design pallets - Theme and style fixes
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
android:id="@+id/appbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/AppTheme.ActionBar">
|
||||
android:theme="@style/ThemeOverlay.AppTheme.Dark">
|
||||
|
||||
<include
|
||||
android:id="@+id/toolbar"
|
||||
@@ -20,9 +20,10 @@
|
||||
android:id="@+id/tabs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/AppTheme.TabLayout"
|
||||
android:theme="@style/ThemeOverlay.AppTheme.Dark"
|
||||
app:tabGravity="fill"
|
||||
app:tabIndicatorColor="@color/accent" />
|
||||
android:background="@color/colorPrimary"
|
||||
app:tabIndicatorColor="@color/white" />
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
@@ -31,6 +32,6 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0px"
|
||||
android:layout_weight="1"
|
||||
android:background="@android:color/white" />
|
||||
android:background="@color/white" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -13,14 +13,14 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_gravity="center_vertical|center_horizontal"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"/>
|
||||
|
||||
<GridView
|
||||
android:id="@+id/gridView"
|
||||
style="@style/AppTheme.GridView"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:numColumns="2"
|
||||
android:columnWidth="140dp"
|
||||
tools:listitem="@layout/item_catalogue" />
|
||||
|
||||
<ProgressBar
|
||||
@@ -29,6 +29,6 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical|center_horizontal"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
android:id="@+id/gridView"
|
||||
style="@style/AppTheme.GridView"
|
||||
android:choiceMode="multipleChoiceModal"
|
||||
android:numColumns="2"
|
||||
android:columnWidth="140dp"
|
||||
tools:listitem="@layout/item_catalogue" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout 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:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.v4.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipe_refresh"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/appbar_bottom"
|
||||
android:layout_above="@+id/toolbar_bottom"
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
@@ -25,23 +25,23 @@
|
||||
|
||||
</android.support.v4.widget.SwipeRefreshLayout>
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:id="@+id/appbar_bottom"
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar_bottom"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:theme="@style/AppTheme.ActionBar">
|
||||
android:background="@color/colorPrimary"
|
||||
android:elevation="4dp"
|
||||
android:gravity="top|start"
|
||||
android:theme="@style/ThemeOverlay.AppTheme.Dark"
|
||||
app:popupTheme="@style/AppTheme.Popup">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar_bottom"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="@color/colorPrimary"
|
||||
android:elevation="4dp"
|
||||
android:gravity="top|start"
|
||||
android:theme="@style/ThemeOverlay.AppTheme.Dark"
|
||||
app:popupTheme="@style/AppTheme.Popup" />
|
||||
<android.support.v7.widget.ActionMenuView
|
||||
android:id="@+id/bottom_menu"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="?attr/actionBarSize"/>
|
||||
</android.support.v7.widget.Toolbar>
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -20,7 +20,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end"
|
||||
android:background="@color/md_red_300"
|
||||
android:background="@color/manga_unread_bg"
|
||||
android:paddingBottom="1dp"
|
||||
android:paddingLeft="3dp"
|
||||
android:paddingRight="3dp"
|
||||
@@ -59,7 +59,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:ellipsize="middle"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:paddingLeft="8dp"
|
||||
android:paddingRight="8dp"
|
||||
|
||||
@@ -8,10 +8,11 @@
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="20dp"
|
||||
android:layout_height="18dp"
|
||||
android:id="@+id/relativeLayout"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_toLeftOf="@+id/chapter_download_image"
|
||||
android:layout_toStartOf="@+id/chapter_download_image">
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/chapter_pages"
|
||||
@@ -20,7 +21,9 @@
|
||||
android:ellipsize="marquee"
|
||||
android:singleLine="true"
|
||||
android:textSize="12sp"
|
||||
tools:text="Pages: 45" />
|
||||
tools:text="Pages: 45"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/chapter_date"
|
||||
@@ -29,32 +32,54 @@
|
||||
android:ellipsize="marquee"
|
||||
android:singleLine="true"
|
||||
android:textSize="12sp"
|
||||
tools:text="22/02/2016"
|
||||
android:layout_alignParentRight="true" />
|
||||
</RelativeLayout>
|
||||
tools:text="22/02/2016"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/download_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/accent_text"
|
||||
android:text="@string/chapter_downloaded"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/chapter_title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="20sp"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
tools:text="Title"
|
||||
android:layout_toLeftOf="@+id/chapter_download_image"
|
||||
android:layout_toStartOf="@+id/chapter_download_image" />
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_toStartOf="@+id/relativeLayout2"
|
||||
android:layout_toLeftOf="@+id/relativeLayout2"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/chapter_download_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
<RelativeLayout
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="center"
|
||||
android:layout_alignParentRight="true"
|
||||
tools:src="@drawable/ic_file_download_black_48dp"
|
||||
/>
|
||||
android:id="@+id/relativeLayout2"
|
||||
android:layout_above="@+id/relativeLayout">
|
||||
<ImageView
|
||||
android:id="@+id/chapter_menu"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:scaleType="fitXY"
|
||||
android:src="@drawable/ic_more_horiz_black_36dp"
|
||||
android:background="?android:selectableItemBackground"/>
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -13,8 +13,8 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="@color/reader_menu_background"
|
||||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
|
||||
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
|
||||
android:theme="@style/ThemeOverlay.AppTheme.Dark"
|
||||
app:popupTheme="@style/AppTheme.Popup"
|
||||
android:elevation="4dp" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -46,7 +46,9 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:layout_gravity="center_vertical" />
|
||||
android:layout_gravity="center_vertical"
|
||||
android:theme="@style/ThemeOverlay.AppTheme.Dark"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/total_pages"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical" android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#333333"
|
||||
android:background="@color/reader_menu_background"
|
||||
android:paddingRight="10dp"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingTop="5dp"
|
||||
|
||||
Reference in New Issue
Block a user