Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: alenkacz/Bookfan
base: 88bab68806
...
head fork: alenkacz/Bookfan
compare: 96e4dc7ea0
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 20 files changed
  • 0 commit comments
  • 1 contributor
View
91 gen/com/actionbarsherlock/R.java
@@ -595,14 +595,15 @@ theme attribute (in the form
public static final int abs__bright_foreground_inverse_holo_dark=0x7f060006;
public static final int abs__bright_foreground_inverse_holo_light=0x7f060007;
public static final int abs__holo_blue_light=0x7f060008;
- public static final int abs__primary_text_disable_only_holo_dark=0x7f06000d;
- public static final int abs__primary_text_disable_only_holo_light=0x7f06000e;
- public static final int abs__primary_text_holo_dark=0x7f06000f;
- public static final int abs__primary_text_holo_light=0x7f060010;
+ public static final int abs__primary_text_disable_only_holo_dark=0x7f06000e;
+ public static final int abs__primary_text_disable_only_holo_light=0x7f06000f;
+ public static final int abs__primary_text_holo_dark=0x7f060010;
+ public static final int abs__primary_text_holo_light=0x7f060011;
public static final int actionbar_background_end=0x7f06000a;
public static final int actionbar_background_start=0x7f060009;
- public static final int book_author_color=0x7f06000c;
- public static final int book_heading_color=0x7f06000b;
+ public static final int actionbar_title=0x7f06000b;
+ public static final int book_author_color=0x7f06000d;
+ public static final int book_heading_color=0x7f06000c;
}
public static final class dimen {
/** Default height of an action bar.
@@ -803,10 +804,12 @@ is along the minor axis (that is the screen is portrait). This may
public static final int close=0x7f02005f;
public static final int facebook_icon=0x7f020060;
public static final int facebook_logo=0x7f020061;
- public static final int ic_launcher=0x7f020062;
- public static final int star_empty=0x7f020063;
- public static final int star_full=0x7f020064;
- public static final int star_half=0x7f020065;
+ public static final int ic_action_add=0x7f020062;
+ public static final int ic_action_refresh=0x7f020063;
+ public static final int ic_launcher=0x7f020064;
+ public static final int star_empty=0x7f020065;
+ public static final int star_full=0x7f020066;
+ public static final int star_half=0x7f020067;
}
public static final class id {
public static final int abs__action_bar=0x7f040022;
@@ -838,6 +841,7 @@ is along the minor axis (that is the screen is portrait). This may
public static final int abs__title=0x7f04001b;
public static final int abs__titleDivider=0x7f04001c;
public static final int abs__up=0x7f04000b;
+ public static final int book_author_tv=0x7f04003e;
public static final int book_detail_active_layout=0x7f040027;
public static final int book_detail_add_btn=0x7f040033;
public static final int book_detail_add_cancel_v=0x7f040032;
@@ -853,14 +857,14 @@ is along the minor axis (that is the screen is portrait). This may
public static final int book_detail_shelf_sp=0x7f040031;
public static final int book_detail_shelf_tv=0x7f040030;
public static final int book_detail_shelf_v=0x7f04002f;
- public static final int book_detail_star_1_iv=0x7f04003e;
- public static final int book_detail_star_2_iv=0x7f04003f;
- public static final int book_detail_star_3_iv=0x7f040040;
- public static final int book_detail_star_4_iv=0x7f040041;
- public static final int book_detail_star_5_iv=0x7f040042;
+ public static final int book_detail_star_1_iv=0x7f04003f;
+ public static final int book_detail_star_2_iv=0x7f040040;
+ public static final int book_detail_star_3_iv=0x7f040041;
+ public static final int book_detail_star_4_iv=0x7f040042;
+ public static final int book_detail_star_5_iv=0x7f040043;
public static final int book_detail_year=0x7f04002e;
public static final int book_item_iv=0x7f04003c;
- public static final int book_item_tv=0x7f04003d;
+ public static final int book_name_tv=0x7f04003d;
public static final int books_list_lv=0x7f04003b;
public static final int disableHome=0x7f040009;
public static final int homeAsUp=0x7f040006;
@@ -869,7 +873,8 @@ is along the minor axis (that is the screen is portrait). This may
public static final int login_email=0x7f040037;
public static final int login_fb_btn=0x7f04003a;
public static final int login_password=0x7f040038;
- public static final int menu_add=0x7f040043;
+ public static final int menu_add=0x7f040044;
+ public static final int menu_refresh=0x7f040045;
public static final int normal=0x7f040001;
public static final int showCustom=0x7f040008;
public static final int showHome=0x7f040005;
@@ -945,25 +950,26 @@ is along the minor axis (that is the screen is portrait). This may
*/
public static final int abs__shareactionprovider_share_with_application=0x7f090009;
public static final int app_name=0x7f09000d;
- public static final int book_add_fail=0x7f090022;
- public static final int book_add_pending=0x7f090020;
- public static final int book_add_success=0x7f090021;
- public static final int book_author=0x7f090024;
- public static final int book_detail_add_btn=0x7f09001a;
- public static final int book_detail_add_failed=0x7f09001f;
+ public static final int book_add_fail=0x7f090023;
+ public static final int book_add_pending=0x7f090021;
+ public static final int book_add_success=0x7f090022;
+ public static final int book_author=0x7f090025;
+ public static final int book_detail_add_btn=0x7f09001b;
+ public static final int book_detail_add_failed=0x7f090020;
/** BOOKS DETAIL
*/
- public static final int book_detail_add_label=0x7f090019;
- public static final int book_detail_cancel_btn=0x7f09001b;
- public static final int book_detail_loading_tv=0x7f09001d;
- public static final int book_detail_more_btn=0x7f09001c;
- public static final int book_detail_not_found_tv=0x7f09001e;
- public static final int book_isbn=0x7f090025;
+ public static final int book_detail_add_label=0x7f09001a;
+ public static final int book_detail_cancel_btn=0x7f09001c;
+ public static final int book_detail_loading_tv=0x7f09001e;
+ public static final int book_detail_more_btn=0x7f09001d;
+ public static final int book_detail_not_found_tv=0x7f09001f;
+ public static final int book_isbn=0x7f090026;
+ public static final int book_library_download_pending=0x7f090017;
/** TEMPORARY
*/
- public static final int book_name=0x7f090023;
- public static final int book_not_found=0x7f090018;
- public static final int book_search_pending=0x7f090017;
+ public static final int book_name=0x7f090024;
+ public static final int book_not_found=0x7f090019;
+ public static final int book_search_pending=0x7f090018;
public static final int config_app_id=0x7f09000b;
public static final int config_salt=0x7f09000a;
public static final int hello=0x7f09000c;
@@ -980,14 +986,15 @@ is along the minor axis (that is the screen is portrait). This may
public static final int login_heading=0x7f09000f;
public static final int login_password=0x7f090011;
public static final int login_progress=0x7f090014;
- public static final int menu_save=0x7f090026;
+ public static final int menu_add=0x7f090027;
+ public static final int menu_refresh=0x7f090028;
}
public static final class style {
- public static final int BookScreen=0x7f0a005e;
+ public static final int BookScreen=0x7f0a0064;
public static final int DialogWindowTitle_Sherlock=0x7f0a0033;
public static final int DialogWindowTitle_Sherlock_Light=0x7f0a0034;
- public static final int Heading=0x7f0a005f;
- public static final int LoginScreen=0x7f0a005d;
+ public static final int Heading=0x7f0a0065;
+ public static final int LoginScreen=0x7f0a0063;
public static final int Sherlock___TextAppearance_Small=0x7f0a0047;
public static final int Sherlock___Theme=0x7f0a004a;
public static final int Sherlock___Theme_DarkActionBar=0x7f0a004c;
@@ -1021,9 +1028,15 @@ is along the minor axis (that is the screen is portrait). This may
public static final int TextAppearance_Sherlock_Widget_TextView_SpinnerItem=0x7f0a0043;
public static final int Theme_Bookfan=0x7f0a0058;
public static final int Theme_Bookfan_Actionbar=0x7f0a0059;
- public static final int Theme_Bookfan_Book=0x7f0a005a;
- public static final int Theme_Bookfan_Book_Author=0x7f0a005c;
- public static final int Theme_Bookfan_Book_Heading=0x7f0a005b;
+ public static final int Theme_Bookfan_Actionbar_Title=0x7f0a005a;
+ public static final int Theme_Bookfan_Book=0x7f0a0060;
+ public static final int Theme_Bookfan_Book_Author=0x7f0a0062;
+ public static final int Theme_Bookfan_Book_Heading=0x7f0a0061;
+ public static final int Theme_Bookfan_List=0x7f0a005b;
+ public static final int Theme_Bookfan_List_Author=0x7f0a005f;
+ public static final int Theme_Bookfan_List_Container=0x7f0a005c;
+ public static final int Theme_Bookfan_List_Heading=0x7f0a005e;
+ public static final int Theme_Bookfan_List_Text=0x7f0a005d;
public static final int Theme_Sherlock=0x7f0a004e;
public static final int Theme_Sherlock_Dialog=0x7f0a0056;
public static final int Theme_Sherlock_ForceOverflow=0x7f0a0053;
View
91 gen/com/facebook/android/R.java
@@ -595,14 +595,15 @@ theme attribute (in the form
public static final int abs__bright_foreground_inverse_holo_dark=0x7f060006;
public static final int abs__bright_foreground_inverse_holo_light=0x7f060007;
public static final int abs__holo_blue_light=0x7f060008;
- public static final int abs__primary_text_disable_only_holo_dark=0x7f06000d;
- public static final int abs__primary_text_disable_only_holo_light=0x7f06000e;
- public static final int abs__primary_text_holo_dark=0x7f06000f;
- public static final int abs__primary_text_holo_light=0x7f060010;
+ public static final int abs__primary_text_disable_only_holo_dark=0x7f06000e;
+ public static final int abs__primary_text_disable_only_holo_light=0x7f06000f;
+ public static final int abs__primary_text_holo_dark=0x7f060010;
+ public static final int abs__primary_text_holo_light=0x7f060011;
public static final int actionbar_background_end=0x7f06000a;
public static final int actionbar_background_start=0x7f060009;
- public static final int book_author_color=0x7f06000c;
- public static final int book_heading_color=0x7f06000b;
+ public static final int actionbar_title=0x7f06000b;
+ public static final int book_author_color=0x7f06000d;
+ public static final int book_heading_color=0x7f06000c;
}
public static final class dimen {
/** Default height of an action bar.
@@ -803,10 +804,12 @@ is along the minor axis (that is the screen is portrait). This may
public static final int close=0x7f02005f;
public static final int facebook_icon=0x7f020060;
public static final int facebook_logo=0x7f020061;
- public static final int ic_launcher=0x7f020062;
- public static final int star_empty=0x7f020063;
- public static final int star_full=0x7f020064;
- public static final int star_half=0x7f020065;
+ public static final int ic_action_add=0x7f020062;
+ public static final int ic_action_refresh=0x7f020063;
+ public static final int ic_launcher=0x7f020064;
+ public static final int star_empty=0x7f020065;
+ public static final int star_full=0x7f020066;
+ public static final int star_half=0x7f020067;
}
public static final class id {
public static final int abs__action_bar=0x7f040022;
@@ -838,6 +841,7 @@ is along the minor axis (that is the screen is portrait). This may
public static final int abs__title=0x7f04001b;
public static final int abs__titleDivider=0x7f04001c;
public static final int abs__up=0x7f04000b;
+ public static final int book_author_tv=0x7f04003e;
public static final int book_detail_active_layout=0x7f040027;
public static final int book_detail_add_btn=0x7f040033;
public static final int book_detail_add_cancel_v=0x7f040032;
@@ -853,14 +857,14 @@ is along the minor axis (that is the screen is portrait). This may
public static final int book_detail_shelf_sp=0x7f040031;
public static final int book_detail_shelf_tv=0x7f040030;
public static final int book_detail_shelf_v=0x7f04002f;
- public static final int book_detail_star_1_iv=0x7f04003e;
- public static final int book_detail_star_2_iv=0x7f04003f;
- public static final int book_detail_star_3_iv=0x7f040040;
- public static final int book_detail_star_4_iv=0x7f040041;
- public static final int book_detail_star_5_iv=0x7f040042;
+ public static final int book_detail_star_1_iv=0x7f04003f;
+ public static final int book_detail_star_2_iv=0x7f040040;
+ public static final int book_detail_star_3_iv=0x7f040041;
+ public static final int book_detail_star_4_iv=0x7f040042;
+ public static final int book_detail_star_5_iv=0x7f040043;
public static final int book_detail_year=0x7f04002e;
public static final int book_item_iv=0x7f04003c;
- public static final int book_item_tv=0x7f04003d;
+ public static final int book_name_tv=0x7f04003d;
public static final int books_list_lv=0x7f04003b;
public static final int disableHome=0x7f040009;
public static final int homeAsUp=0x7f040006;
@@ -869,7 +873,8 @@ is along the minor axis (that is the screen is portrait). This may
public static final int login_email=0x7f040037;
public static final int login_fb_btn=0x7f04003a;
public static final int login_password=0x7f040038;
- public static final int menu_add=0x7f040043;
+ public static final int menu_add=0x7f040044;
+ public static final int menu_refresh=0x7f040045;
public static final int normal=0x7f040001;
public static final int showCustom=0x7f040008;
public static final int showHome=0x7f040005;
@@ -945,25 +950,26 @@ is along the minor axis (that is the screen is portrait). This may
*/
public static final int abs__shareactionprovider_share_with_application=0x7f090009;
public static final int app_name=0x7f09000d;
- public static final int book_add_fail=0x7f090022;
- public static final int book_add_pending=0x7f090020;
- public static final int book_add_success=0x7f090021;
- public static final int book_author=0x7f090024;
- public static final int book_detail_add_btn=0x7f09001a;
- public static final int book_detail_add_failed=0x7f09001f;
+ public static final int book_add_fail=0x7f090023;
+ public static final int book_add_pending=0x7f090021;
+ public static final int book_add_success=0x7f090022;
+ public static final int book_author=0x7f090025;
+ public static final int book_detail_add_btn=0x7f09001b;
+ public static final int book_detail_add_failed=0x7f090020;
/** BOOKS DETAIL
*/
- public static final int book_detail_add_label=0x7f090019;
- public static final int book_detail_cancel_btn=0x7f09001b;
- public static final int book_detail_loading_tv=0x7f09001d;
- public static final int book_detail_more_btn=0x7f09001c;
- public static final int book_detail_not_found_tv=0x7f09001e;
- public static final int book_isbn=0x7f090025;
+ public static final int book_detail_add_label=0x7f09001a;
+ public static final int book_detail_cancel_btn=0x7f09001c;
+ public static final int book_detail_loading_tv=0x7f09001e;
+ public static final int book_detail_more_btn=0x7f09001d;
+ public static final int book_detail_not_found_tv=0x7f09001f;
+ public static final int book_isbn=0x7f090026;
+ public static final int book_library_download_pending=0x7f090017;
/** TEMPORARY
*/
- public static final int book_name=0x7f090023;
- public static final int book_not_found=0x7f090018;
- public static final int book_search_pending=0x7f090017;
+ public static final int book_name=0x7f090024;
+ public static final int book_not_found=0x7f090019;
+ public static final int book_search_pending=0x7f090018;
public static final int config_app_id=0x7f09000b;
public static final int config_salt=0x7f09000a;
public static final int hello=0x7f09000c;
@@ -980,14 +986,15 @@ is along the minor axis (that is the screen is portrait). This may
public static final int login_heading=0x7f09000f;
public static final int login_password=0x7f090011;
public static final int login_progress=0x7f090014;
- public static final int menu_save=0x7f090026;
+ public static final int menu_add=0x7f090027;
+ public static final int menu_refresh=0x7f090028;
}
public static final class style {
- public static final int BookScreen=0x7f0a005e;
+ public static final int BookScreen=0x7f0a0064;
public static final int DialogWindowTitle_Sherlock=0x7f0a0033;
public static final int DialogWindowTitle_Sherlock_Light=0x7f0a0034;
- public static final int Heading=0x7f0a005f;
- public static final int LoginScreen=0x7f0a005d;
+ public static final int Heading=0x7f0a0065;
+ public static final int LoginScreen=0x7f0a0063;
public static final int Sherlock___TextAppearance_Small=0x7f0a0047;
public static final int Sherlock___Theme=0x7f0a004a;
public static final int Sherlock___Theme_DarkActionBar=0x7f0a004c;
@@ -1021,9 +1028,15 @@ is along the minor axis (that is the screen is portrait). This may
public static final int TextAppearance_Sherlock_Widget_TextView_SpinnerItem=0x7f0a0043;
public static final int Theme_Bookfan=0x7f0a0058;
public static final int Theme_Bookfan_Actionbar=0x7f0a0059;
- public static final int Theme_Bookfan_Book=0x7f0a005a;
- public static final int Theme_Bookfan_Book_Author=0x7f0a005c;
- public static final int Theme_Bookfan_Book_Heading=0x7f0a005b;
+ public static final int Theme_Bookfan_Actionbar_Title=0x7f0a005a;
+ public static final int Theme_Bookfan_Book=0x7f0a0060;
+ public static final int Theme_Bookfan_Book_Author=0x7f0a0062;
+ public static final int Theme_Bookfan_Book_Heading=0x7f0a0061;
+ public static final int Theme_Bookfan_List=0x7f0a005b;
+ public static final int Theme_Bookfan_List_Author=0x7f0a005f;
+ public static final int Theme_Bookfan_List_Container=0x7f0a005c;
+ public static final int Theme_Bookfan_List_Heading=0x7f0a005e;
+ public static final int Theme_Bookfan_List_Text=0x7f0a005d;
public static final int Theme_Sherlock=0x7f0a004e;
public static final int Theme_Sherlock_Dialog=0x7f0a0056;
public static final int Theme_Sherlock_ForceOverflow=0x7f0a0053;
View
91 gen/cz/alenkacz/bookfan/R.java
@@ -595,14 +595,15 @@ theme attribute (in the form
public static final int abs__bright_foreground_inverse_holo_dark=0x7f060006;
public static final int abs__bright_foreground_inverse_holo_light=0x7f060007;
public static final int abs__holo_blue_light=0x7f060008;
- public static final int abs__primary_text_disable_only_holo_dark=0x7f06000d;
- public static final int abs__primary_text_disable_only_holo_light=0x7f06000e;
- public static final int abs__primary_text_holo_dark=0x7f06000f;
- public static final int abs__primary_text_holo_light=0x7f060010;
+ public static final int abs__primary_text_disable_only_holo_dark=0x7f06000e;
+ public static final int abs__primary_text_disable_only_holo_light=0x7f06000f;
+ public static final int abs__primary_text_holo_dark=0x7f060010;
+ public static final int abs__primary_text_holo_light=0x7f060011;
public static final int actionbar_background_end=0x7f06000a;
public static final int actionbar_background_start=0x7f060009;
- public static final int book_author_color=0x7f06000c;
- public static final int book_heading_color=0x7f06000b;
+ public static final int actionbar_title=0x7f06000b;
+ public static final int book_author_color=0x7f06000d;
+ public static final int book_heading_color=0x7f06000c;
}
public static final class dimen {
/** Default height of an action bar.
@@ -803,10 +804,12 @@ is along the minor axis (that is the screen is portrait). This may
public static final int close=0x7f02005f;
public static final int facebook_icon=0x7f020060;
public static final int facebook_logo=0x7f020061;
- public static final int ic_launcher=0x7f020062;
- public static final int star_empty=0x7f020063;
- public static final int star_full=0x7f020064;
- public static final int star_half=0x7f020065;
+ public static final int ic_action_add=0x7f020062;
+ public static final int ic_action_refresh=0x7f020063;
+ public static final int ic_launcher=0x7f020064;
+ public static final int star_empty=0x7f020065;
+ public static final int star_full=0x7f020066;
+ public static final int star_half=0x7f020067;
}
public static final class id {
public static final int abs__action_bar=0x7f040022;
@@ -838,6 +841,7 @@ is along the minor axis (that is the screen is portrait). This may
public static final int abs__title=0x7f04001b;
public static final int abs__titleDivider=0x7f04001c;
public static final int abs__up=0x7f04000b;
+ public static final int book_author_tv=0x7f04003e;
public static final int book_detail_active_layout=0x7f040027;
public static final int book_detail_add_btn=0x7f040033;
public static final int book_detail_add_cancel_v=0x7f040032;
@@ -853,14 +857,14 @@ is along the minor axis (that is the screen is portrait). This may
public static final int book_detail_shelf_sp=0x7f040031;
public static final int book_detail_shelf_tv=0x7f040030;
public static final int book_detail_shelf_v=0x7f04002f;
- public static final int book_detail_star_1_iv=0x7f04003e;
- public static final int book_detail_star_2_iv=0x7f04003f;
- public static final int book_detail_star_3_iv=0x7f040040;
- public static final int book_detail_star_4_iv=0x7f040041;
- public static final int book_detail_star_5_iv=0x7f040042;
+ public static final int book_detail_star_1_iv=0x7f04003f;
+ public static final int book_detail_star_2_iv=0x7f040040;
+ public static final int book_detail_star_3_iv=0x7f040041;
+ public static final int book_detail_star_4_iv=0x7f040042;
+ public static final int book_detail_star_5_iv=0x7f040043;
public static final int book_detail_year=0x7f04002e;
public static final int book_item_iv=0x7f04003c;
- public static final int book_item_tv=0x7f04003d;
+ public static final int book_name_tv=0x7f04003d;
public static final int books_list_lv=0x7f04003b;
public static final int disableHome=0x7f040009;
public static final int homeAsUp=0x7f040006;
@@ -869,7 +873,8 @@ is along the minor axis (that is the screen is portrait). This may
public static final int login_email=0x7f040037;
public static final int login_fb_btn=0x7f04003a;
public static final int login_password=0x7f040038;
- public static final int menu_add=0x7f040043;
+ public static final int menu_add=0x7f040044;
+ public static final int menu_refresh=0x7f040045;
public static final int normal=0x7f040001;
public static final int showCustom=0x7f040008;
public static final int showHome=0x7f040005;
@@ -945,25 +950,26 @@ is along the minor axis (that is the screen is portrait). This may
*/
public static final int abs__shareactionprovider_share_with_application=0x7f090009;
public static final int app_name=0x7f09000d;
- public static final int book_add_fail=0x7f090022;
- public static final int book_add_pending=0x7f090020;
- public static final int book_add_success=0x7f090021;
- public static final int book_author=0x7f090024;
- public static final int book_detail_add_btn=0x7f09001a;
- public static final int book_detail_add_failed=0x7f09001f;
+ public static final int book_add_fail=0x7f090023;
+ public static final int book_add_pending=0x7f090021;
+ public static final int book_add_success=0x7f090022;
+ public static final int book_author=0x7f090025;
+ public static final int book_detail_add_btn=0x7f09001b;
+ public static final int book_detail_add_failed=0x7f090020;
/** BOOKS DETAIL
*/
- public static final int book_detail_add_label=0x7f090019;
- public static final int book_detail_cancel_btn=0x7f09001b;
- public static final int book_detail_loading_tv=0x7f09001d;
- public static final int book_detail_more_btn=0x7f09001c;
- public static final int book_detail_not_found_tv=0x7f09001e;
- public static final int book_isbn=0x7f090025;
+ public static final int book_detail_add_label=0x7f09001a;
+ public static final int book_detail_cancel_btn=0x7f09001c;
+ public static final int book_detail_loading_tv=0x7f09001e;
+ public static final int book_detail_more_btn=0x7f09001d;
+ public static final int book_detail_not_found_tv=0x7f09001f;
+ public static final int book_isbn=0x7f090026;
+ public static final int book_library_download_pending=0x7f090017;
/** TEMPORARY
*/
- public static final int book_name=0x7f090023;
- public static final int book_not_found=0x7f090018;
- public static final int book_search_pending=0x7f090017;
+ public static final int book_name=0x7f090024;
+ public static final int book_not_found=0x7f090019;
+ public static final int book_search_pending=0x7f090018;
public static final int config_app_id=0x7f09000b;
public static final int config_salt=0x7f09000a;
public static final int hello=0x7f09000c;
@@ -980,14 +986,15 @@ is along the minor axis (that is the screen is portrait). This may
public static final int login_heading=0x7f09000f;
public static final int login_password=0x7f090011;
public static final int login_progress=0x7f090014;
- public static final int menu_save=0x7f090026;
+ public static final int menu_add=0x7f090027;
+ public static final int menu_refresh=0x7f090028;
}
public static final class style {
- public static final int BookScreen=0x7f0a005e;
+ public static final int BookScreen=0x7f0a0064;
public static final int DialogWindowTitle_Sherlock=0x7f0a0033;
public static final int DialogWindowTitle_Sherlock_Light=0x7f0a0034;
- public static final int Heading=0x7f0a005f;
- public static final int LoginScreen=0x7f0a005d;
+ public static final int Heading=0x7f0a0065;
+ public static final int LoginScreen=0x7f0a0063;
public static final int Sherlock___TextAppearance_Small=0x7f0a0047;
public static final int Sherlock___Theme=0x7f0a004a;
public static final int Sherlock___Theme_DarkActionBar=0x7f0a004c;
@@ -1021,9 +1028,15 @@ is along the minor axis (that is the screen is portrait). This may
public static final int TextAppearance_Sherlock_Widget_TextView_SpinnerItem=0x7f0a0043;
public static final int Theme_Bookfan=0x7f0a0058;
public static final int Theme_Bookfan_Actionbar=0x7f0a0059;
- public static final int Theme_Bookfan_Book=0x7f0a005a;
- public static final int Theme_Bookfan_Book_Author=0x7f0a005c;
- public static final int Theme_Bookfan_Book_Heading=0x7f0a005b;
+ public static final int Theme_Bookfan_Actionbar_Title=0x7f0a005a;
+ public static final int Theme_Bookfan_Book=0x7f0a0060;
+ public static final int Theme_Bookfan_Book_Author=0x7f0a0062;
+ public static final int Theme_Bookfan_Book_Heading=0x7f0a0061;
+ public static final int Theme_Bookfan_List=0x7f0a005b;
+ public static final int Theme_Bookfan_List_Author=0x7f0a005f;
+ public static final int Theme_Bookfan_List_Container=0x7f0a005c;
+ public static final int Theme_Bookfan_List_Heading=0x7f0a005e;
+ public static final int Theme_Bookfan_List_Text=0x7f0a005d;
public static final int Theme_Sherlock=0x7f0a004e;
public static final int Theme_Sherlock_Dialog=0x7f0a0056;
public static final int Theme_Sherlock_ForceOverflow=0x7f0a0053;
View
BIN  res/drawable-hdpi/ic_action_add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-hdpi/ic_action_refresh.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
8 res/layout/activity_main_list.xml
@@ -7,12 +7,12 @@
<ListView
android:id="@+id/books_list_lv"
android:layout_height="fill_parent"
- android:layout_width="fill_parent"/>
-
+ android:layout_width="fill_parent"
+ style="@style/Theme.Bookfan.List.Container" />
<TextView
android:id="@+id/android:empty"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:text="@string/list_no_books" />
</LinearLayout>
View
31 res/layout/part_book_item.xml
@@ -6,17 +6,30 @@
<ImageView
android:id="@+id/book_item_iv"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_width="35dip"
+ android:layout_height="70dip"
android:layout_marginRight="6dip"
android:src="@drawable/ic_launcher" />
-
- <TextView
- android:id="@+id/book_item_tv"
+ <LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:text="@string/book_name"
- android:layout_gravity="center"
- android:layout_toRightOf="@id/book_item_iv" />
-
+ android:orientation="vertical"
+ android:layout_toRightOf="@id/book_item_iv"
+ style="@style/Theme.Bookfan.List.Text"
+ android:gravity="center"
+ >
+ <TextView
+ android:id="@+id/book_name_tv"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/book_name"
+ style="@style/Theme.Bookfan.List.Heading"/>
+
+ <TextView
+ android:id="@+id/book_author_tv"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/book_name"
+ style="@style/Theme.Bookfan.List.Author" />
+ </LinearLayout>
</RelativeLayout>
View
9 res/menu/actionbar.xml
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_add"
- android:icon="@drawable/ic_launcher"
- android:title="@string/menu_save"
+ android:icon="@drawable/ic_action_add"
+ android:title="@string/menu_add"
+ android:showAsAction="ifRoom" />
+
+ <item android:id="@+id/menu_refresh"
+ android:icon="@drawable/ic_action_refresh"
+ android:title="@string/menu_refresh"
android:showAsAction="ifRoom" />
</menu>
View
1  res/values/colors.xml
@@ -1,6 +1,7 @@
<resources>
<color name="actionbar_background_start">#272727</color>
<color name="actionbar_background_end">#1A1A1A</color>
+ <color name="actionbar_title">#FFF</color>
<color name="book_heading_color">#DE5941</color>
<color name="book_author_color">#654118</color>
View
5 res/values/strings.xml
@@ -19,6 +19,7 @@
<!-- BOOKS LIST -->
<string name="list_no_books">Žádné knihy, přidej první</string>
+ <string name="book_library_download_pending">Stahuju tvoji knihovnu do telefonu...</string>
<string name="book_search_pending">Hledám tvoji knížku v databázi Bookfanu...</string>
<string name="book_not_found">Tuto knihu jsme v databázi Bookfanu bohužel nenašli...</string>
@@ -39,7 +40,9 @@
<string name="book_name">Název knihy</string>
<string name="book_author">Autor knihy</string>
<string name="book_isbn">ISBN</string>
- <string name="menu_save">Ulozit</string>
+
+ <string name="menu_add">Přidat</string>
+ <string name="menu_refresh">Obnovit</string>
<string-array name="shelf_array">
<item>Přečtené</item>
View
38 res/values/styles.xml
@@ -3,15 +3,45 @@
<style name="Theme.Bookfan" parent="style/Theme.Sherlock.Light">
<item name="actionBarStyle">@style/Theme.Bookfan.Actionbar</item>
+ <item name="android:actionBarStyle">@style/Theme.Bookfan.Actionbar</item>
</style>
<style name="Theme.Bookfan.Actionbar" parent="Widget.Sherlock.ActionBar">
- <item name="background">#664c1e</item>
- <item name="android:background">#664c1e</item>
- <item name="android:backgroundStacked">#664c1e</item>
- <item name="android:textColor">#0084dc</item>
+ <item name="background">#574A3B</item>
+ <item name="android:background">#574A3B</item>
+ <item name="android:titleTextStyle">@style/Theme.Bookfan.Actionbar.Title</item>
+ <item name="android:displayOptions">showTitle</item>
</style>
+ <style name="Theme.Bookfan.Actionbar.Title">
+ <item name="android:textColor">@color/actionbar_title</item>
+ <item name="android:textStyle">bold</item>
+ <item name="android:textSize">16dip</item>
+ </style>
+
+ <style name="Theme.Bookfan.List">
+ <item name="android:textSize">14dip</item>
+ </style>
+
+ <style name="Theme.Bookfan.List.Container">
+ <item name="android:paddingTop">10dip</item>
+ </style>
+
+ <style name="Theme.Bookfan.List.Text">
+ <item name="android:paddingLeft">15dip</item>
+ </style>
+
+ <style name="Theme.Bookfan.List.Heading">
+ <item name="android:textStyle">bold</item>
+ <item name="android:textSize">16dip</item>
+ <item name="android:textColor">@color/book_heading_color</item>
+ </style>
+
+ <style name="Theme.Bookfan.List.Author">
+ <item name="android:textStyle">bold</item>
+ <item name="android:textColor">@color/book_author_color</item>
+ </style>
+
<style name="Theme.Bookfan.Book">
<item name="android:textSize">14dip</item>
</style>
View
17 src/cz/alenkacz/bookfan/activity/BaseActivity.java
@@ -6,6 +6,7 @@
import com.actionbarsherlock.view.MenuItem;
import cz.alenkacz.bookfan.R;
+import cz.alenkacz.bookfan.tools.Constants;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
@@ -33,8 +34,24 @@ public boolean onOptionsItemSelected(MenuItem item) {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
return true;
+ case R.id.menu_add:
+ initScan();
+ return true;
default:
return super.onOptionsItemSelected(item);
}
}
+
+ private void initScan() {
+ /*
+ * Intent intent = new Intent("com.google.zxing.client.android.SCAN");
+ * intent.putExtra("SCAN_MODE", "EAN_13_MODE");
+ * startActivityForResult(intent, 0);
+ */
+
+ // TODO re-enable scanning
+ Intent i = new Intent(getApplicationContext(), BookDetailActivity.class);
+ i.putExtra(Constants.EXTRA_ISBN, "9788024233109");
+ startActivity(i);
+ }
}
View
17 src/cz/alenkacz/bookfan/activity/BookDetailActivity.java
@@ -6,6 +6,7 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
+import com.actionbarsherlock.view.MenuItem;
import com.google.android.imageloader.ImageLoader;
import com.google.gson.Gson;
@@ -60,6 +61,7 @@
private ProgressDialog mBookAddDialog;
private Book mDownloadedBook;
+ private String isbn;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -68,7 +70,7 @@ public void onCreate(Bundle savedInstanceState) {
mImageLoader = ImageLoader.get(this);
mPrefs = getSharedPreferences(Constants.PREFS, MODE_PRIVATE);
- String isbn = getIntent().getStringExtra(Constants.EXTRA_ISBN);
+ isbn = getIntent().getStringExtra(Constants.EXTRA_ISBN);
if(isbn != null) {
mSearchingDialog = ProgressDialog.show(BookDetailActivity.this, "",
@@ -83,6 +85,19 @@ public void onCreate(Bundle savedInstanceState) {
}
}
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_refresh:
+ mSearchingDialog = ProgressDialog.show(BookDetailActivity.this, "",
+ getString(R.string.book_search_pending), true);
+ new BookFindAsyncTask().execute(isbn);
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
private void setupViews() {
mActiveLayout = (View) findViewById(R.id.book_detail_active_layout);
mShelfSp = (Spinner) findViewById(R.id.book_detail_shelf_sp);
View
30 src/cz/alenkacz/bookfan/activity/BooksAdapter.java
@@ -3,22 +3,29 @@
import java.util.ArrayList;
import java.util.List;
+import com.google.android.imageloader.ImageLoader;
+
import cz.alenkacz.bookfan.R;
import cz.alenkacz.bookfan.dto.Book;
+import cz.alenkacz.bookfan.rest.pojo.LibraryBook;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
+import android.widget.ImageView;
import android.widget.TextView;
-public class BooksAdapter extends ArrayAdapter<Book> {
+public class BooksAdapter extends ArrayAdapter<LibraryBook> {
- private List<Book> mItems;
+ private List<LibraryBook> mItems;
+ private ImageLoader mImageLoader;
- public BooksAdapter(Context context, int textViewResourceId, List<Book> items) {
+ public BooksAdapter(Context context, int textViewResourceId, List<LibraryBook> items) {
super(context, textViewResourceId, items);
this.mItems = items;
+
+ mImageLoader = ImageLoader.get(context);
}
@Override
@@ -28,11 +35,22 @@ public View getView(int position, View convertView, ViewGroup parent) {
LayoutInflater vi = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
v = vi.inflate(R.layout.part_book_item, null);
}
- Book book = mItems.get(position);
+ LibraryBook book = mItems.get(position);
if (book != null) {
- TextView tt = (TextView) v.findViewById(R.id.book_item_tv);
+ TextView tt = (TextView) v.findViewById(R.id.book_name_tv);
+ TextView authorTv = (TextView) v.findViewById(R.id.book_author_tv);
+ ImageView iv = (ImageView) v.findViewById(R.id.book_item_iv);
+
if (tt != null) {
- tt.setText(book.name);
+ tt.setText(book.getBOOK_TITLE());
+ }
+
+ if(book.getBOOK_THUMB() != null) {
+ mImageLoader.bind(iv, book.getBOOK_THUMB(), null);
+ }
+
+ if (authorTv != null) {
+ authorTv.setText(book.getPT_FULL_NAME());
}
}
return v;
View
2  src/cz/alenkacz/bookfan/activity/LoginActivity.java
@@ -37,7 +37,7 @@
import android.widget.EditText;
import android.widget.Toast;
-public class LoginActivity extends BaseActivity {
+public class LoginActivity extends SherlockActivity {
private Facebook mFacebook;
private SharedPreferences mPrefs;
View
137 src/cz/alenkacz/bookfan/activity/MainListActivity.java
@@ -15,10 +15,13 @@
import cz.alenkacz.bookfan.R;
import cz.alenkacz.bookfan.dto.Book;
import cz.alenkacz.bookfan.dto.UserLogin;
+import cz.alenkacz.bookfan.rest.pojo.BookSearchContainer;
+import cz.alenkacz.bookfan.rest.pojo.BooksLibraryContainer;
import cz.alenkacz.bookfan.rest.pojo.LoggedUserContainer;
import cz.alenkacz.bookfan.tools.Constants;
import cz.alenkacz.bookfan.tools.Utils;
import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
@@ -32,76 +35,104 @@
import android.widget.Toast;
public class MainListActivity extends BaseActivity {
-
+
private ListView mBooksList;
- private List<Book> mBooks;
-
+ private SharedPreferences mPrefs;
+ private ProgressDialog mDownloadingDialog;
+
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main_list);
-
- initTempList();
+
+ mPrefs = getSharedPreferences(Constants.PREFS, MODE_PRIVATE);
+
setupViews();
}
-
- private void initTempList() {
- mBooks = new ArrayList<Book>();
-
- mBooks.add(new Book("Test knihy"));
- mBooks.add(new Book("Kniha 2"));
- mBooks.add(new Book("Kniha 3"));
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_refresh:
+ downloadBooks();
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
}
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_add:
- initScan();
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
+
private void setupViews() {
mBooksList = (ListView) findViewById(R.id.books_list_lv);
- mBooksList.setAdapter(new BooksAdapter(this, R.layout.part_book_item, mBooks));
-
- mBooksList.setOnItemClickListener(new OnItemClickListener(){
+
+ mBooksList.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
// TODO put some actual code here
- Intent i = new Intent(getApplicationContext(), BookDetailActivity.class);
+ Intent i = new Intent(getApplicationContext(),
+ BookDetailActivity.class);
startActivity(i);
}
-
+
});
}
-
- private void initScan() {
- /*Intent intent = new Intent("com.google.zxing.client.android.SCAN");
- intent.putExtra("SCAN_MODE", "EAN_13_MODE");
- startActivityForResult(intent, 0);*/
-
- // TODO re-enable scanning
- Intent i = new Intent(getApplicationContext(), BookDetailActivity.class);
- i.putExtra(Constants.EXTRA_ISBN, "9788024233109");
- startActivity(i);
+
+ private void downloadBooks() {
+ mDownloadingDialog = ProgressDialog.show(MainListActivity.this, "",
+ getString(R.string.book_library_download_pending), true);
+ new LibraryFetchAsyncTask().execute();
}
-
+
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
- if (requestCode == 0) {
- if (resultCode == RESULT_OK) {
- String contents = intent.getStringExtra("SCAN_RESULT");
-
- Intent i = new Intent(getApplicationContext(), BookDetailActivity.class);
- i.putExtra(Constants.EXTRA_ISBN, contents);
- startActivity(i);
- } else if (resultCode == RESULT_CANCELED) {
- // Handle cancel
- }
- }
+ if (requestCode == 0) {
+ if (resultCode == RESULT_OK) {
+ String contents = intent.getStringExtra("SCAN_RESULT");
+
+ Intent i = new Intent(getApplicationContext(),
+ BookDetailActivity.class);
+ i.putExtra(Constants.EXTRA_ISBN, contents);
+ startActivity(i);
+ } else if (resultCode == RESULT_CANCELED) {
+ // Handle cancel
+ }
+ }
+ }
+
+ private class LibraryFetchAsyncTask extends AsyncTask<Void, Void, String> {
+
+ protected String doInBackground(Void... nothing) {
+ try {
+ String token = mPrefs
+ .getString(Constants.PREFS_LOGIN_TOKEN, "");
+ HttpClient hc = Utils.getDefaultHttpClientWithCookie(mPrefs
+ .getString(Constants.PREFS_LOGIN_TOKEN, ""));
+ HttpGet get = new HttpGet(Utils.getLibraryGetUrl(token));
+
+ HttpResponse resp = hc.execute(get);
+ int status = resp.getStatusLine().getStatusCode();
+ if (status == 200) {
+ InputStream isContent = resp.getEntity().getContent();
+
+ return Utils.inputStreamToString(isContent);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(String result) {
+ mDownloadingDialog.dismiss();
+
+ if (result != null) {
+ BooksLibraryContainer downloaded = new Gson().fromJson(result,
+ BooksLibraryContainer.class);
+ mBooksList.setAdapter(new BooksAdapter(getApplicationContext(),
+ R.layout.part_book_item, downloaded.books));
+ } else {
+
+ }
+ }
}
}
View
7 src/cz/alenkacz/bookfan/rest/pojo/BooksLibraryContainer.java
@@ -0,0 +1,7 @@
+package cz.alenkacz.bookfan.rest.pojo;
+
+import java.util.List;
+
+public class BooksLibraryContainer {
+ public List<LibraryBook> books;
+}
View
36 src/cz/alenkacz/bookfan/rest/pojo/LibraryBook.java
@@ -0,0 +1,36 @@
+package cz.alenkacz.bookfan.rest.pojo;
+
+public class LibraryBook {
+ public String UNI_BOOK_KEY;
+ private String BOOK_TITLE;
+ private String BOOK_URL_ALIAS;
+ private String BOOK_THUMB;
+ private String PT_FULL_NAME;
+
+ public String getBOOK_TITLE() {
+ return BOOK_TITLE;
+ }
+ public void setBOOK_TITLE(String bOOK_TITLE) {
+ BOOK_TITLE = bOOK_TITLE;
+ }
+ public String getBOOK_URL_ALIAS() {
+ return BOOK_URL_ALIAS;
+ }
+ public void setBOOK_URL_ALIAS(String bOOK_URL_ALIAS) {
+ BOOK_URL_ALIAS = bOOK_URL_ALIAS;
+ }
+ public String getBOOK_THUMB() {
+ return BOOK_THUMB;
+ }
+ public void setBOOK_THUMB(String bOOK_THUMB) {
+ BOOK_THUMB = bOOK_THUMB;
+ }
+ public String getPT_FULL_NAME() {
+ return PT_FULL_NAME;
+ }
+ public void setPT_FULL_NAME(String pT_FULL_NAME) {
+ PT_FULL_NAME = pT_FULL_NAME;
+ }
+
+
+}
View
1  src/cz/alenkacz/bookfan/tools/Constants.java
@@ -19,4 +19,5 @@
public static final String BACKEND_LOGIN_URL = "http://www.bookfan.eu/api/2/login?";
public static final String BACKEND_BOOK_ADD_URL = "http://www.bookfan.eu/api/2/library/add/";
public static final String BACKEND_BOOK_FIND_URL = "http://www.bookfan.eu/api/2/search/book?q=";
+ public static final String BACKEND_LIBRARY_GET_URL = "http://www.bookfan.eu/api/2/fetch-library/";
}
View
7 src/cz/alenkacz/bookfan/tools/Utils.java
@@ -32,6 +32,13 @@ public static String getFBLoginUrl(String token, String salt) {
return sb.toString();
}
+ public static String getLibraryGetUrl(String token) {
+ StringBuilder sb = new StringBuilder(Constants.BACKEND_LIBRARY_GET_URL);
+ sb.append(token);
+
+ return sb.toString();
+ }
+
public static String getBookAddUrl(String bookId, String token) {
StringBuilder sb = new StringBuilder(Constants.BACKEND_BOOK_ADD_URL);
sb.append(bookId);

No commit comments for this range

Something went wrong with that request. Please try again.