From 65c07450da89f2b734d4b3350c303902a215f54d Mon Sep 17 00:00:00 2001 From: Yuri Revich Date: Mon, 30 Nov 2015 20:45:45 +0300 Subject: [PATCH] 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 --- .../data/database/DatabaseHelper.java | 5 +- .../ui/manga/chapter/ChaptersFragment.java | 1 + .../ui/manga/chapter/ChaptersHolder.java | 52 +++++++++++++-- .../ui/manga/chapter/ChaptersPresenter.java | 2 +- .../ic_expand_less_white_36dp.png | Bin 0 -> 190 bytes .../ic_expand_more_white_36dp.png | Bin 0 -> 194 bytes .../ic_more_horiz_black_36dp.png | Bin 0 -> 165 bytes .../ic_expand_less_white_36dp.png | Bin 0 -> 156 bytes .../ic_expand_more_white_36dp.png | Bin 0 -> 159 bytes .../ic_more_horiz_black_36dp.png | Bin 0 -> 135 bytes .../ic_more_horiz_black_36dp.png | Bin 0 -> 203 bytes .../ic_expand_less_white_36dp.png | Bin 0 -> 304 bytes .../ic_expand_more_white_36dp.png | Bin 0 -> 305 bytes .../ic_more_horiz_black_36dp.png | Bin 0 -> 278 bytes .../ic_expand_less_white_36dp.png | Bin 0 -> 371 bytes .../ic_expand_more_white_36dp.png | Bin 0 -> 371 bytes .../ic_more_horiz_black_36dp.png | Bin 0 -> 366 bytes .../main/res/layout/activity_manga_detail.xml | 9 +-- .../main/res/layout/fragment_catalogue.xml | 6 +- app/src/main/res/layout/fragment_library.xml | 2 +- .../res/layout/fragment_manga_chapters.xml | 40 ++++++------ app/src/main/res/layout/item_catalogue.xml | 4 +- app/src/main/res/layout/item_chapter.xml | 59 +++++++++++++----- app/src/main/res/layout/reader_menu.xml | 8 ++- app/src/main/res/layout/reader_popup.xml | 2 +- app/src/main/res/menu/chapter_single.xml | 25 ++++++++ app/src/main/res/values/colors.xml | 38 ++++++----- app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/styles.xml | 16 ++--- 29 files changed, 181 insertions(+), 89 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_expand_less_white_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_more_horiz_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_expand_less_white_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_more_horiz_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_more_horiz_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_expand_less_white_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_more_horiz_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_expand_less_white_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_more_horiz_black_36dp.png create mode 100644 app/src/main/res/menu/chapter_single.xml diff --git a/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java b/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java index b05e3c7920..49e579af8e 100644 --- a/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java +++ b/app/src/main/java/eu/kanade/mangafeed/data/database/DatabaseHelper.java @@ -67,14 +67,15 @@ public class DatabaseHelper { private final String favoriteMangasWithUnreadQuery = String.format( "SELECT %1$s.*, COUNT(C.%4$s) AS %5$s FROM %1$s LEFT JOIN " + "(SELECT %4$s FROM %2$s WHERE %6$s = 0) AS C ON %3$s = C.%4$s " + - "WHERE %7$s = 1 GROUP BY %3$s", + "WHERE %7$s = 1 GROUP BY %3$s ORDER BY %1$s.%8$s", MangaTable.TABLE, ChapterTable.TABLE, MangaTable.TABLE + "." + MangaTable.COLUMN_ID, ChapterTable.COLUMN_MANGA_ID, MangaTable.COLUMN_UNREAD, ChapterTable.COLUMN_READ, - MangaTable.COLUMN_FAVORITE + MangaTable.COLUMN_FAVORITE, + MangaTable.COLUMN_TITLE ); public PreparedGetListOfObjects getMangas() { diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java index f40cfc039d..e3b79920ea 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java @@ -6,6 +6,7 @@ import android.support.v4.content.ContextCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.view.ActionMode; import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.PopupMenu; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersHolder.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersHolder.java index 1a2859730c..753680c711 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersHolder.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersHolder.java @@ -2,7 +2,9 @@ package eu.kanade.mangafeed.ui.manga.chapter; import android.content.Context; import android.support.v4.content.ContextCompat; +import android.support.v7.widget.PopupMenu; import android.support.v7.widget.RecyclerView; +import android.view.MenuItem; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -14,14 +16,18 @@ import butterknife.Bind; import butterknife.ButterKnife; import eu.kanade.mangafeed.R; import eu.kanade.mangafeed.data.database.models.Chapter; +import eu.kanade.mangafeed.data.download.DownloadService; +import rx.Observable; public class ChaptersHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { private ChaptersAdapter adapter; + private Chapter item; @Bind(R.id.chapter_title) TextView title; - @Bind(R.id.chapter_download_image) ImageView download_icon; + @Bind(R.id.download_text) TextView downloadText; + @Bind(R.id.chapter_menu) ImageView chapterMenu; @Bind(R.id.chapter_pages) TextView pages; @Bind(R.id.chapter_date) TextView date; @@ -38,9 +44,11 @@ public class ChaptersHolder extends RecyclerView.ViewHolder implements this.adapter = adapter; itemView.setOnClickListener(this); itemView.setOnLongClickListener(this); + chapterMenu.setOnClickListener(v -> v.post(() -> showPopupMenu(v))); } public void onSetValues(Context context, Chapter chapter) { + this.item = chapter; title.setText(chapter.name); if (chapter.read) { @@ -58,10 +66,11 @@ public class ChaptersHolder extends RecyclerView.ViewHolder implements if (chapter.downloaded == Chapter.UNKNOWN) { adapter.getMangaChaptersFragment().getPresenter().checkIsChapterDownloaded(chapter); } - if (chapter.downloaded == Chapter.DOWNLOADED) - download_icon.setImageResource(R.drawable.ic_action_delete_36dp); - else if (chapter.downloaded == Chapter.NOT_DOWNLOADED) - download_icon.setImageResource(R.drawable.ic_file_download_black_36dp); + if (chapter.downloaded == Chapter.DOWNLOADED) { + downloadText.setVisibility(View.VISIBLE); + } else if (chapter.downloaded == Chapter.NOT_DOWNLOADED) { + downloadText.setVisibility(View.INVISIBLE); + } date.setText(sdf.format(new Date(chapter.date_upload))); toggleActivation(); @@ -83,4 +92,37 @@ public class ChaptersHolder extends RecyclerView.ViewHolder implements toggleActivation(); return true; } + + + private void showPopupMenu(View view) { + // Create a PopupMenu, giving it the clicked view for an anchor + PopupMenu popup = new PopupMenu(adapter.getMangaChaptersFragment().getActivity(), view); + + // Inflate our menu resource into the PopupMenu's Menu + popup.getMenuInflater().inflate(R.menu.chapter_single, popup.getMenu()); + + // Set a listener so we are notified if a menu item is clicked + popup.setOnMenuItemClickListener(menuItem -> { + switch (menuItem.getItemId()) { + case R.id.action_mark_as_read: + adapter.getMangaChaptersFragment().getPresenter().markChaptersRead(Observable.just(item), true); + return true; + case R.id.action_mark_as_unread: + adapter.getMangaChaptersFragment().getPresenter().markChaptersRead(Observable.just(item), false); + return true; + case R.id.action_download: + DownloadService.start(adapter.getMangaChaptersFragment().getActivity()); + adapter.getMangaChaptersFragment().getPresenter().downloadChapters(Observable.just(item)); + return true; + case R.id.action_delete: + adapter.getMangaChaptersFragment().getPresenter().deleteChapters(Observable.just(item)); + return true; + } + return false; + }); + + // Finally show the PopupMenu + popup.show(); + } + } diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java index dce7a7d88f..afdde3f9f0 100644 --- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java +++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java @@ -169,7 +169,7 @@ public class ChaptersPresenter extends BasePresenter { public void initSortIcon() { if (getView() != null) { - getView().setSortIcon(sortOrderAToZ);//TODO do we need save order for manga? + getView().setSortIcon(sortOrderAToZ);//TODO manga.chapter_order } } diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_expand_less_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ddd0078f3f3f1777439da1fbb9cd197c8d4c1ad9 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+R!42~~ zi){8NE?>cJoMx=IP)$%!S&KcWd`u#_XJh`}701KmUS2HE0Xm4m)78&qol`;+0MCp?KL7v# literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..82e6ac353d316080f716473d8307c20e3f15123b GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+PEQxdkcif|XYcYl7%;ddDkm(; zJ1imk_-EwHRTBhsMN5B|od4{(Z&84k=F%xu;!#u9@00S?y2>o^XwKra@>?RS4u`ee z)>J7lu#kGcQ+R9Iz9O@8u^PW8autY9>?*Vm_Lph=v?KGeM@WZq5M!TbrOfnQ4mdKI;Vst0Aa97G5`Po literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_more_horiz_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_more_horiz_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..82f5f92219b4f4723198a7bebc1bcdfd5718a4c3 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+98VX=kP61PXASw76eV09?rf}( z=BU;=bn#4{jZ9F)f9XDV3Umv!e{bq>s_2WMeM=*OnFRC*RJKA+C=36*W_m4dca*TU#e*46s3gj_( My85}Sb4q9e019J3UH||9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_expand_less_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dea8988386907cdd1741d2cd17eea26f5fe9cba4 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8vZsq|k0wldT1B8K8nx~6nh)3t!Grn963L*@N3l;iv zOP1E{xw~azkg>u13(wA$Jur5=yhT2_!uGLvT4Jh}T=(&-M#c=cCm(vmsHG`0WkvVO zR;8@{E7_L0m>OBCCJ4O}FyvHCHu5^;GGz*92tQD>-rOAmi>^zlo4*0t$l&Sf=d#Wz Gp$P!|k0wldT1B8K;pQnpsNCo5DQ`TH8h62nNyN*@Y zH21E5d7iaw(!#}lEPP+5h#tx_+AQCEcv*1EB#A%!O&6;8&6yS;WbGHM(J8lFYl_Rl jjWa^z7S5P?_XE=z&5-)vH)0L|O=j?P^>bP0l+XkKBg-x( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_more_horiz_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_more_horiz_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..091a7c62a45e4bf22da9f4e7c4e5d07507230c7d GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawCV9FzhEy=VJ!i|+>>%R$@b=jq z?H-wIEk&yzDaWc1f&hED}5p8Gl7QQ6fF6AsdW$V8)I$mvR vYxeo*R#nW}u_kQsw$E&)UTx3Pz@{_YYby%;(bP0l+XkK@KH>v literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7d0e2c1ccd092423f709a65a9c92102990f2cb72 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq%^@18D>Ar-gYUh~d7WFX=Yxb4zf zkzK1NrCm1gJ;>~`kn?B6rumlUhh6+FHzlQSpRD3J35qmhobA8lZd&&>cT?2jyBnhx z*=~qh`1f#DquHS@zu5_{%l0O?Etfvm*G0XX{0>_hQC;!X zMp1rYp<4uRcwJL@yZq0r+=SjsyFSI=bPJpH(%AGK)dGRqarew{X(hg^{{Pqr8MubQgARdX{l$ zjpQt&>`BYcMtKG&tzEEkqu3>pNbZbPVBw}^=cE=+Js`DU>Y-N`y^=~ZmTt7$A{6O@ c0zzv16aM_N*L`5A3Je1VPgg&ebxsLQ01v2nbpQYW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_more_horiz_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_more_horiz_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d0888688997c47b1a95f3ad588a3c67eec7317cb GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq%^yPhtNAr*{oFWGi6F$%am{A6_K zfudNX%f~5Qa;btJx&Fx{9ZxWs$$LiZIG@%E&U@ECE}nFa8>kTp2(R6G-Phl?nU3IUDUtIznieKCj0AAUE!(u@qM|% zQ{RX6#R^S*AK6#hdFuO$<3MIq-&~+%cwes2)cnvsU8AY*e-yq_5B({%wK;hItY=#H zW8NOP629+~iPfIUo|he3hl8SHudKWrDXq&SisULFv;L{W_p{3)woC#Ed%F6$taD0e F0sy+lZ~CotUEKBLTI_3SicG^e^%{^mWwTQR!)Sp>q z7pK{rF0>TRJv-Ut;yfEp;kRce>s*{@(22d7$+>cR>|glMfto#XVuflb+!ESSESEl6#9Bj*yf^WC6oFtE&m%XR~?qVjMBZB zz9oHyN&Ig1)0=0lD2bf?FYG>6rgDdMAbOJBa1Kk6~-y+W)VZAMXNjJzf1=);T3K0RYtYm)ZaT literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..131cfec4f7e2521466c3bdc5fadedd62cccf7796 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFj{%KIEGZ*dV49_kJ(Vb_23&G zF|z{<-1&7A0$d87CCwtAlzMuzao{l*+>he yo-bCPXmix%lZf!iU>_BKLl}n{;eQ4O2j+Oi@OA&(k6u#)346NwxvX%{J*jkJ~=o62APN*=g(VTm6^ci=5VI zoq1ieXvXt}j{P&EN>A0CH>$Y4*2=Zdh@XGf=FH2Q#WPcn=H4zj^(KsWSN3Ji&l|EX z?DJiI=JhH^eO@c(8i&?**KJ?2&E@|)X%P6#&%M|C?VW7%@42D;_t#fu7tQ^tzh5N$=bf#= u`IB?sZ90GY_S@pwpMCyXeMRvlkkfGg%olh5pfDaykc_9RpUXO@geCy|AfccD literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_manga_detail.xml b/app/src/main/res/layout/activity_manga_detail.xml index 000c851c5f..bf7fd3409e 100644 --- a/app/src/main/res/layout/activity_manga_detail.xml +++ b/app/src/main/res/layout/activity_manga_detail.xml @@ -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"> + android:background="@color/colorPrimary" + app:tabIndicatorColor="@color/white" /> @@ -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" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_catalogue.xml b/app/src/main/res/layout/fragment_catalogue.xml index ab96b51004..7ae149d6a0 100644 --- a/app/src/main/res/layout/fragment_catalogue.xml +++ b/app/src/main/res/layout/fragment_catalogue.xml @@ -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"/> + android:visibility="gone"/> diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 24220562a7..7739f760e4 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_manga_chapters.xml b/app/src/main/res/layout/fragment_manga_chapters.xml index 0f0b7cad01..ae5666a547 100644 --- a/app/src/main/res/layout/fragment_manga_chapters.xml +++ b/app/src/main/res/layout/fragment_manga_chapters.xml @@ -1,16 +1,16 @@ + 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:background="@color/colorPrimary" + android:elevation="4dp" + android:gravity="top|start" + android:theme="@style/ThemeOverlay.AppTheme.Dark" + app:popupTheme="@style/AppTheme.Popup"> - + + - \ No newline at end of file diff --git a/app/src/main/res/layout/item_catalogue.xml b/app/src/main/res/layout/item_catalogue.xml index 0ca68a74cc..6b0c9f9a7a 100644 --- a/app/src/main/res/layout/item_catalogue.xml +++ b/app/src/main/res/layout/item_catalogue.xml @@ -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" diff --git a/app/src/main/res/layout/item_chapter.xml b/app/src/main/res/layout/item_chapter.xml index e8179b77ca..74632faae6 100644 --- a/app/src/main/res/layout/item_chapter.xml +++ b/app/src/main/res/layout/item_chapter.xml @@ -8,10 +8,11 @@ + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> + tools:text="Pages: 45" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true"/> - + tools:text="22/02/2016"/> + + + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_toStartOf="@+id/relativeLayout2" + android:layout_toLeftOf="@+id/relativeLayout2"/> - + android:id="@+id/relativeLayout2" + android:layout_above="@+id/relativeLayout"> + + \ No newline at end of file diff --git a/app/src/main/res/layout/reader_menu.xml b/app/src/main/res/layout/reader_menu.xml index 25c311af84..17c79589a0 100644 --- a/app/src/main/res/layout/reader_menu.xml +++ b/app/src/main/res/layout/reader_menu.xml @@ -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" /> + android:layout_gravity="center_vertical" + android:theme="@style/ThemeOverlay.AppTheme.Dark" + /> + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7817216308..52e1beee21 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,34 +1,32 @@ - #FFEA00 - #607D8B - #455A64 - #263238 - #CFD8DC + @color/md_blue_A400 + @color/md_blue_grey_500 + @color/md_blue_grey_700 + @color/md_blue_grey_900 + @color/md_blue_grey_100 - #ECEFF1 + @color/md_blue_grey_50 @color/colorPrimary @color/colorPrimaryDark @color/colorPrimaryLight - #CFD8DC - - #FFFFFF - #DD000000 - #8B000000 - #64000000 - - #FFFFFF + @color/md_light_dividers + @color/md_white_1000 + @color/md_light_primary_text + @color/md_light_secondary + @color/md_light_disabled + @color/md_green_900 @color/colorPrimaryLight - #FAFAFA - #D7D7D7 - #D4D4D4 - #E9E9E9 - #E8E8E8 + @color/colorAccent + + @color/md_grey_50 + @color/md_light_dividers + @color/md_grey_300 #AAE9E9E9 - #333333 + @color/colorPrimarySuperDark \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7ca3fe7a07..19994301ce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,7 @@ Chapters Selected: %1$d No title + DOWNLOADED Downloading… diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d6316b51e6..a63e25d9c0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,21 +17,17 @@ - - - - - @@ -84,6 +80,6 @@