diff --git a/bin/EhViewer.apk b/bin/EhViewer.apk index 0e7633511..5a1d125de 100644 Binary files a/bin/EhViewer.apk and b/bin/EhViewer.apk differ diff --git a/bin/R.txt b/bin/R.txt index 282fe0500..ebf90cbcf 100644 --- a/bin/R.txt +++ b/bin/R.txt @@ -98,19 +98,22 @@ int color unknown_bg 0x7f070015 int color western_bg 0x7f07000f int dimen activity_horizontal_margin 0x7f080003 int dimen activity_vertical_margin 0x7f080004 -int dimen button_size 0x7f08000e -int dimen button_small_padding_x 0x7f080010 -int dimen button_small_padding_y 0x7f080011 -int dimen button_small_size 0x7f08000f -int dimen button_tag_padding_x 0x7f080012 -int dimen button_tag_padding_y 0x7f080013 -int dimen detail_subtitle_size 0x7f08000d -int dimen detail_thumb_height 0x7f08000b -int dimen detail_thumb_width 0x7f08000a -int dimen detail_title_size 0x7f08000c -int dimen menu_offset 0x7f080005 +int dimen button_size 0x7f080010 +int dimen button_small_padding_x 0x7f080012 +int dimen button_small_padding_y 0x7f080013 +int dimen button_small_size 0x7f080011 +int dimen button_tag_padding_x 0x7f080014 +int dimen button_tag_padding_y 0x7f080015 +int dimen detail_subtitle_size 0x7f08000f +int dimen detail_thumb_height 0x7f08000d +int dimen detail_thumb_width 0x7f08000c +int dimen detail_title_size 0x7f08000e +int dimen list_thumb_height 0x7f08000b +int dimen list_thumb_width 0x7f08000a +int dimen menu_offset 0x7f080016 int dimen ptr_progress_bar_stroke_width 0x7f080002 -int dimen shadow_width 0x7f080006 +int dimen shadow_width 0x7f080005 +int dimen slidingmenu_offset 0x7f080006 int dimen spb_default_stroke_separator_length 0x7f080000 int dimen spb_default_stroke_width 0x7f080001 int dimen text_large 0x7f080008 @@ -153,7 +156,7 @@ int drawable progress_small 0x7f020021 int drawable sadpanda 0x7f020022 int drawable scrollbar_blue 0x7f020023 int drawable scrollbar_white 0x7f020024 -int drawable shadow_left 0x7f020025 +int drawable shadow 0x7f020025 int drawable spinner_16_inner 0x7f020026 int drawable spinner_16_outer 0x7f020027 int drawable spinner_76_inner 0x7f020028 @@ -166,24 +169,24 @@ int drawable welcome 0x7f02002e int drawable western 0x7f02002f int drawable white_bn_bg 0x7f020030 int id action 0x7f06003f -int id action_download 0x7f06008e -int id action_favourite 0x7f06008d -int id action_jump 0x7f060091 -int id action_refresh 0x7f060090 -int id action_search 0x7f06008f -int id action_settings 0x7f060092 -int id app_start_view 0x7f06008b -int id autoCompleteTextView1 0x7f060087 +int id action_download 0x7f06008f +int id action_favourite 0x7f06008e +int id action_jump 0x7f060092 +int id action_refresh 0x7f060091 +int id action_search 0x7f060090 +int id action_settings 0x7f060093 +int id app_start_view 0x7f06008c +int id autoCompleteTextView1 0x7f060088 int id bottom 0x7f060018 -int id bottom_panel 0x7f060079 +int id bottom_panel 0x7f06007a int id button_artistcg 0x7f060043 int id button_asianporn 0x7f060049 -int id button_check_login 0x7f060071 +int id button_check_login 0x7f060072 int id button_cosplay 0x7f060048 int id button_doujinshi 0x7f060041 int id button_gamecg 0x7f060044 int id button_imageset 0x7f060047 -int id button_login 0x7f060070 +int id button_login 0x7f060071 int id button_manga 0x7f060042 int id button_misc 0x7f06004a int id button_non_h 0x7f060046 @@ -224,44 +227,45 @@ int id detail_title 0x7f06001e int id detail_uploader 0x7f06001f int id detail_wait 0x7f060026 int id download 0x7f06003b -int id drawer_login 0x7f06006a -int id drawer_login_over 0x7f06006b +int id drawer_login 0x7f06006b +int id drawer_login_over 0x7f06006c int id favourite 0x7f060040 int id filter_advance 0x7f06004d int id fitCenter 0x7f060012 int id fitEnd 0x7f060013 int id fitStart 0x7f060011 int id fitXY 0x7f060010 -int id footer_progressBar 0x7f06007d -int id footer_tip_text 0x7f06007e +int id footer_progressBar 0x7f06007e +int id footer_tip_text 0x7f06007f int id fullscreen 0x7f06000c int id gl_root_view 0x7f060059 -int id head_arrowImageView 0x7f060083 -int id head_contentLayout 0x7f060082 -int id head_progressBar 0x7f060084 -int id head_tipsTextView 0x7f060085 -int id header 0x7f06007b -int id header_arrow_image 0x7f06007f -int id header_progressBar 0x7f060080 -int id header_tip_text 0x7f060081 +int id head_arrowImageView 0x7f060084 +int id head_contentLayout 0x7f060083 +int id head_progressBar 0x7f060085 +int id head_tipsTextView 0x7f060086 +int id header 0x7f06007c +int id header_arrow_image 0x7f060080 +int id header_progressBar 0x7f060081 +int id header_tip_text 0x7f060082 int id info 0x7f06003e int id inside 0x7f060004 -int id is_exhentai 0x7f06006c +int id is_exhentai 0x7f06006d int id left 0x7f060009 int id list 0x7f060037 -int id list_button_logout 0x7f060074 +int id list_button_logout 0x7f060075 int id list_jump_edit 0x7f06005c int id list_jump_sum 0x7f06005a int id list_jump_to 0x7f06005b int id list_list 0x7f06005d -int id list_menu_list 0x7f060068 -int id list_menu_login 0x7f060069 +int id list_menu_item_list 0x7f060068 +int id list_menu_login 0x7f06006a +int id list_menu_tag_list 0x7f060069 int id list_no_found 0x7f060061 int id list_refresh 0x7f06005f -int id list_view 0x7f06007c +int id list_view 0x7f06007d int id list_wait_first 0x7f06005e -int id list_wait_login 0x7f060072 -int id list_wait_logout 0x7f060075 +int id list_wait_login 0x7f060073 +int id list_wait_logout 0x7f060076 int id main 0x7f060058 int id manga_detail 0x7f06001c int id manga_detail_normal 0x7f060023 @@ -277,41 +281,41 @@ int id neutral_button 0x7f060039 int id none 0x7f06000d int id outside 0x7f060005 int id page_list 0x7f06002f -int id pager 0x7f06006f -int id paper_list_layout 0x7f060076 -int id paper_list_wait 0x7f060077 -int id password 0x7f06006e +int id pager 0x7f060070 +int id paper_list_layout 0x7f060077 +int id paper_list_wait 0x7f060078 +int id password 0x7f06006f int id positive_button 0x7f06003a int id posted 0x7f060067 -int id preview_button_refresh 0x7f060078 -int id preview_num 0x7f06007a +int id preview_button_refresh 0x7f060079 +int id preview_num 0x7f06007b int id progressBar 0x7f06003d int id ptr_content 0x7f060006 int id ptr_progress 0x7f060008 int id ptr_text 0x7f060007 int id rate 0x7f060065 -int id remove 0x7f060088 +int id remove 0x7f060089 int id right 0x7f06000a int id sadpanda 0x7f060060 int id scroll_view 0x7f060034 -int id search_bar 0x7f060086 +int id search_bar 0x7f060087 int id search_text 0x7f06004b int id selected_view 0x7f06000e -int id set_name_edit 0x7f060089 -int id slidingmenumain 0x7f06008a +int id set_name_edit 0x7f06008a +int id slidingmenumain 0x7f06008b int id spb_interpolator_accelerate 0x7f060000 int id spb_interpolator_acceleratedecelerate 0x7f060002 int id spb_interpolator_decelerate 0x7f060003 int id spb_interpolator_linear 0x7f060001 int id spinner_min_rating 0x7f060057 int id tags_layout 0x7f06002e -int id text_username 0x7f060073 +int id text_username 0x7f060074 int id thumb 0x7f06003c int id title 0x7f060019 int id top 0x7f060017 int id uploader 0x7f060064 -int id username 0x7f06006d -int id wait_message 0x7f06008c +int id username 0x7f06006e +int id wait_message 0x7f06008d int integer spb_default_interpolator 0x7f090001 int integer spb_default_sections_count 0x7f090000 int layout buttons_dialog 0x7f030000 diff --git a/bin/classes.dex b/bin/classes.dex index 889fe9cf4..b23a1dc21 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/dexedLibs/actionbarpulltorefresh-693218d0f75f9fd60d9c03358c106ccd.jar b/bin/dexedLibs/actionbarpulltorefresh-693218d0f75f9fd60d9c03358c106ccd.jar index a4663e9c7..49dd1b2c1 100644 Binary files a/bin/dexedLibs/actionbarpulltorefresh-693218d0f75f9fd60d9c03358c106ccd.jar and b/bin/dexedLibs/actionbarpulltorefresh-693218d0f75f9fd60d9c03358c106ccd.jar differ diff --git a/bin/dexedLibs/slidingmenu-f48f3a4eceb3b9455e8ae38a55377052.jar b/bin/dexedLibs/slidingmenu-f48f3a4eceb3b9455e8ae38a55377052.jar index 1e288024a..c1f5438ec 100644 Binary files a/bin/dexedLibs/slidingmenu-f48f3a4eceb3b9455e8ae38a55377052.jar and b/bin/dexedLibs/slidingmenu-f48f3a4eceb3b9455e8ae38a55377052.jar differ diff --git a/bin/dexedLibs/smoothprogressbar-198a82d6d3a21ca0a938379e1a35c7d8.jar b/bin/dexedLibs/smoothprogressbar-198a82d6d3a21ca0a938379e1a35c7d8.jar index 051cd41dd..45dee513f 100644 Binary files a/bin/dexedLibs/smoothprogressbar-198a82d6d3a21ca0a938379e1a35c7d8.jar and b/bin/dexedLibs/smoothprogressbar-198a82d6d3a21ca0a938379e1a35c7d8.jar differ diff --git a/bin/res/crunch/drawable-xxhdpi/shadow_left.9.png b/bin/res/crunch/drawable-xxhdpi/shadow_left.9.png deleted file mode 100644 index ec2b9774e..000000000 Binary files a/bin/res/crunch/drawable-xxhdpi/shadow_left.9.png and /dev/null differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index d8e2a7bb8..763fdf359 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/res/drawable-xxhdpi/shadow_left.9.png b/res/drawable-xxhdpi/shadow_left.9.png deleted file mode 100644 index e430fa5b5..000000000 Binary files a/res/drawable-xxhdpi/shadow_left.9.png and /dev/null differ diff --git a/res/drawable/shadow.xml b/res/drawable/shadow.xml new file mode 100644 index 000000000..67bb1c57f --- /dev/null +++ b/res/drawable/shadow.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml index 2b3519948..2ac247cf8 100644 --- a/res/layout/list_item.xml +++ b/res/layout/list_item.xml @@ -1,13 +1,13 @@ diff --git a/res/layout/list_menu_list.xml b/res/layout/list_menu_list.xml index 3bb527dd0..2a3a5e5d2 100644 --- a/res/layout/list_menu_list.xml +++ b/res/layout/list_menu_list.xml @@ -1,11 +1,29 @@ - + android:background="@color/main_background" + android:orientation="vertical" > + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml index d9db49045..0ceb4e8df 100644 --- a/res/layout/menu_item.xml +++ b/res/layout/menu_item.xml @@ -2,9 +2,9 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" - android:paddingLeft="18dip" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textColor="@android:color/white" + android:paddingLeft="18dp" + android:minHeight="48dp" + android:textColor="@android:color/black" android:singleLine="true" /> \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index aad4907cb..509e3ea49 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -3,13 +3,16 @@ 16dp 16dp - 150dp 15dp + 200dp 18.0sp 16.0sp 13.0sp + 66.7dp + 100.0dp + 100.0dp 150.0dp diff --git a/res/values/themes.xml b/res/values/themes.xml index 754e50a7e..0446455eb 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -15,6 +15,9 @@ + + + @null