From: drizea Date: Mon, 11 Jun 2012 18:45:40 +0000 (+0300) Subject: Android UI development started. Added dashboard activity main screen X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f79e5397f58d2e86ef4bd09e97a0b40aa980e86a;p=working%2FEvergreen.git Android UI development started. Added dashboard activity main screen --- diff --git a/Open-ILS/src/Android/.classpath b/Open-ILS/src/Android/.classpath new file mode 100644 index 0000000000..39e19dfd99 --- /dev/null +++ b/Open-ILS/src/Android/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Open-ILS/src/Android/.project b/Open-ILS/src/Android/.project new file mode 100644 index 0000000000..b7991ede89 --- /dev/null +++ b/Open-ILS/src/Android/.project @@ -0,0 +1,33 @@ + + + EvergreenApp + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/Open-ILS/src/Android/AndroidManifest.xml b/Open-ILS/src/Android/AndroidManifest.xml index 8db0af68f6..e0e7e2147c 100644 --- a/Open-ILS/src/Android/AndroidManifest.xml +++ b/Open-ILS/src/Android/AndroidManifest.xml @@ -11,16 +11,23 @@ android:label="@string/app_name" android:theme="@style/EvergreenTheme" > + + android:name=".views.MainScreenDashboard" + android:label="@string/app_name" + android:theme="@android:style/Theme.Light.NoTitleBar" + > - + + + diff --git a/Open-ILS/src/Android/bin/EvergreenApp.apk b/Open-ILS/src/Android/bin/EvergreenApp.apk index de9db1e806..51172c804e 100644 Binary files a/Open-ILS/src/Android/bin/EvergreenApp.apk and b/Open-ILS/src/Android/bin/EvergreenApp.apk differ diff --git a/Open-ILS/src/Android/bin/classes.dex b/Open-ILS/src/Android/bin/classes.dex index 19e5a569fb..18354fffe8 100644 Binary files a/Open-ILS/src/Android/bin/classes.dex and b/Open-ILS/src/Android/bin/classes.dex differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$dimen.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$dimen.class new file mode 100644 index 0000000000..8c6b06ebc7 Binary files /dev/null and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$dimen.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class index b5e59455eb..e19bc0d9b3 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class index cb2195a1e7..040779d69f 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class index b4f75c162e..bd324e9517 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class index d16063ec86..c88bcae007 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class index 68b4bab695..286087356d 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R.class index f9bc5ee43b..22991f1065 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class index 66bf99fa55..4c5de6990d 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class index f3b353e5f6..a630995f75 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class index bbb2ddabde..c7d3d1ed00 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/Utils.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class index 857337c203..804753b311 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class index 86dfba343f..26025e2183 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class index f171162b37..24913f6017 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class index 414583aa17..470e825e77 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class index f41a89bcbe..c550be472e 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class index 8da46402bf..7673bbeb14 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class index c56de43250..309c58f049 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class index 16f487cc9a..529185041f 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class index f5ef03adef..06fb3f47f0 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class index b16719caf7..90e5cb058c 100644 Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class differ diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class new file mode 100644 index 0000000000..8f32ef1052 Binary files /dev/null and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class differ diff --git a/Open-ILS/src/Android/bin/res/drawable-hdpi/account_pref.png b/Open-ILS/src/Android/bin/res/drawable-hdpi/account_pref.png new file mode 100644 index 0000000000..b1116eba6b Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/account_pref.png differ diff --git a/Open-ILS/src/Android/bin/res/drawable-hdpi/book_bag.png b/Open-ILS/src/Android/bin/res/drawable-hdpi/book_bag.png new file mode 100644 index 0000000000..6fc9c25270 Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/book_bag.png differ diff --git a/Open-ILS/src/Android/bin/res/drawable-hdpi/check_out.png b/Open-ILS/src/Android/bin/res/drawable-hdpi/check_out.png new file mode 100644 index 0000000000..80bd3295a3 Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/check_out.png differ diff --git a/Open-ILS/src/Android/bin/res/drawable-hdpi/find_96.png b/Open-ILS/src/Android/bin/res/drawable-hdpi/find_96.png new file mode 100644 index 0000000000..98169ced49 Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/find_96.png differ diff --git a/Open-ILS/src/Android/bin/res/drawable-hdpi/fines.png b/Open-ILS/src/Android/bin/res/drawable-hdpi/fines.png new file mode 100644 index 0000000000..7b3253052e Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/fines.png differ diff --git a/Open-ILS/src/Android/bin/res/drawable-hdpi/holds.png b/Open-ILS/src/Android/bin/res/drawable-hdpi/holds.png new file mode 100644 index 0000000000..42d2625126 Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/holds.png differ diff --git a/Open-ILS/src/Android/bin/resources.ap_ b/Open-ILS/src/Android/bin/resources.ap_ index 40468e4fcc..9568ba7c4f 100644 Binary files a/Open-ILS/src/Android/bin/resources.ap_ and b/Open-ILS/src/Android/bin/resources.ap_ differ diff --git a/Open-ILS/src/Android/gen/org/evergreen/android/R.java b/Open-ILS/src/Android/gen/org/evergreen/android/R.java index 1f5c3f2c6b..f94be63ce2 100644 --- a/Open-ILS/src/Android/gen/org/evergreen/android/R.java +++ b/Open-ILS/src/Android/gen/org/evergreen/android/R.java @@ -27,47 +27,73 @@ public final class R { public static final int title_text_alt=0x7f040002; public static final int white=0x7f04000c; } + public static final class dimen { + public static final int text_size_large=0x7f050003; + public static final int text_size_medium=0x7f050002; + public static final int text_size_small=0x7f050001; + public static final int title_height=0x7f050000; + } public static final class drawable { - public static final int action_search=0x7f020000; - public static final int address_book=0x7f020001; - public static final int ic_launcher=0x7f020002; + public static final int account_pref=0x7f020000; + public static final int action_search=0x7f020001; + public static final int address_book=0x7f020002; + public static final int book_bag=0x7f020003; + public static final int check_out=0x7f020004; + public static final int find_96=0x7f020005; + public static final int fines=0x7f020006; + public static final int holds=0x7f020007; + public static final int ic_launcher=0x7f020008; } public static final class id { - public static final int chose_organisation=0x7f070011; - public static final int record_details_info_author=0x7f070001; - public static final int record_details_info_publisher=0x7f070002; - public static final int record_details_info_title=0x7f070000; - public static final int record_details_simple_author=0x7f070004; - public static final int record_details_simple_isbn=0x7f070009; - public static final int record_details_simple_publisher=0x7f070005; - public static final int record_details_simple_series=0x7f070007; - public static final int record_details_simple_subject=0x7f070006; - public static final int record_details_simple_synopsis=0x7f070008; - public static final int record_details_simple_title=0x7f070003; - public static final int searchButton=0x7f07000f; - public static final int searchText=0x7f07000e; - public static final int search_record_author=0x7f07000c; - public static final int search_record_img=0x7f07000a; - public static final int search_record_publishing=0x7f07000d; - public static final int search_record_title=0x7f07000b; - public static final int search_results_list=0x7f070010; + public static final int chose_organisation=0x7f080017; + public static final int home_btn_feature1=0x7f080000; + public static final int home_btn_feature2=0x7f080001; + public static final int home_btn_feature3=0x7f080002; + public static final int home_btn_feature4=0x7f080003; + public static final int home_btn_feature5=0x7f080004; + public static final int home_btn_feature6=0x7f080005; + public static final int record_details_info_author=0x7f080007; + public static final int record_details_info_publisher=0x7f080008; + public static final int record_details_info_title=0x7f080006; + public static final int record_details_simple_author=0x7f08000a; + public static final int record_details_simple_isbn=0x7f08000f; + public static final int record_details_simple_publisher=0x7f08000b; + public static final int record_details_simple_series=0x7f08000d; + public static final int record_details_simple_subject=0x7f08000c; + public static final int record_details_simple_synopsis=0x7f08000e; + public static final int record_details_simple_title=0x7f080009; + public static final int searchButton=0x7f080015; + public static final int searchText=0x7f080014; + public static final int search_record_author=0x7f080012; + public static final int search_record_img=0x7f080010; + public static final int search_record_publishing=0x7f080013; + public static final int search_record_title=0x7f080011; + public static final int search_results_list=0x7f080016; } public static final class layout { - public static final int main=0x7f030000; - public static final int record_details_info=0x7f030001; - public static final int record_details_simple=0x7f030002; - public static final int search_result_item=0x7f030003; - public static final int search_result_list=0x7f030004; + public static final int dashbord_main=0x7f030000; + public static final int main=0x7f030001; + public static final int record_details_info=0x7f030002; + public static final int record_details_simple=0x7f030003; + public static final int search_result_item=0x7f030004; + public static final int search_result_list=0x7f030005; } public static final class string { - public static final int app_name=0x7f050001; - public static final int hello=0x7f050000; + public static final int app_name=0x7f060001; + public static final int hello=0x7f060000; + public static final int title_feature1=0x7f060002; + public static final int title_feature2=0x7f060003; + public static final int title_feature3=0x7f060004; + public static final int title_feature4=0x7f060005; + public static final int title_feature5=0x7f060006; + public static final int title_feature6=0x7f060007; } public static final class style { - public static final int EvergreenTheme=0x7f060004; - public static final int sectionHeader=0x7f060000; - public static final int spacer=0x7f060003; - public static final int textLarge=0x7f060002; - public static final int textSmall=0x7f060001; + public static final int EvergreenTheme=0x7f070004; + public static final int HomeButton=0x7f070005; + public static final int sectionHeader=0x7f070000; + public static final int spacer=0x7f070003; + public static final int textLarge=0x7f070002; + public static final int textSmall=0x7f070001; } } diff --git a/Open-ILS/src/Android/res/drawable-hdpi/account_pref.png b/Open-ILS/src/Android/res/drawable-hdpi/account_pref.png new file mode 100644 index 0000000000..27de9862f1 Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/account_pref.png differ diff --git a/Open-ILS/src/Android/res/drawable-hdpi/book_bag.png b/Open-ILS/src/Android/res/drawable-hdpi/book_bag.png new file mode 100644 index 0000000000..a6abc3083b Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/book_bag.png differ diff --git a/Open-ILS/src/Android/res/drawable-hdpi/check_out.png b/Open-ILS/src/Android/res/drawable-hdpi/check_out.png new file mode 100644 index 0000000000..95cd2b8307 Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/check_out.png differ diff --git a/Open-ILS/src/Android/res/drawable-hdpi/find_96.png b/Open-ILS/src/Android/res/drawable-hdpi/find_96.png new file mode 100644 index 0000000000..9846809f7e Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/find_96.png differ diff --git a/Open-ILS/src/Android/res/drawable-hdpi/fines.png b/Open-ILS/src/Android/res/drawable-hdpi/fines.png new file mode 100644 index 0000000000..369aac8f5f Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/fines.png differ diff --git a/Open-ILS/src/Android/res/drawable-hdpi/holds.png b/Open-ILS/src/Android/res/drawable-hdpi/holds.png new file mode 100644 index 0000000000..8968581953 Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/holds.png differ diff --git a/Open-ILS/src/Android/res/layout/dashbord_main.xml b/Open-ILS/src/Android/res/layout/dashbord_main.xml new file mode 100644 index 0000000000..c847997992 --- /dev/null +++ b/Open-ILS/src/Android/res/layout/dashbord_main.xml @@ -0,0 +1,60 @@ + + + +