diff --git a/android/res/drawable/agro_teaser.png b/android/res/drawable/agro_teaser.png
deleted file mode 100644
index 0d76ae0..0000000
Binary files a/android/res/drawable/agro_teaser.png and /dev/null differ
diff --git a/android/res/drawable/agro_teaser_darken.png b/android/res/drawable/agro_teaser_darken.png
deleted file mode 100644
index 5255c08..0000000
Binary files a/android/res/drawable/agro_teaser_darken.png and /dev/null differ
diff --git a/android/res/drawable/culture_teaser.png b/android/res/drawable/culture_teaser.png
deleted file mode 100644
index 3023ad9..0000000
Binary files a/android/res/drawable/culture_teaser.png and /dev/null differ
diff --git a/android/res/drawable/culture_teaser_darken.png b/android/res/drawable/culture_teaser_darken.png
deleted file mode 100644
index 4eef4c8..0000000
Binary files a/android/res/drawable/culture_teaser_darken.png and /dev/null differ
diff --git a/android/res/drawable/economics_teaser.png b/android/res/drawable/economics_teaser.png
deleted file mode 100644
index 1f7185c..0000000
Binary files a/android/res/drawable/economics_teaser.png and /dev/null differ
diff --git a/android/res/drawable/economics_teaser_darken.png b/android/res/drawable/economics_teaser_darken.png
deleted file mode 100644
index 43bb7e9..0000000
Binary files a/android/res/drawable/economics_teaser_darken.png and /dev/null differ
diff --git a/android/res/drawable/education_teaser.png b/android/res/drawable/education_teaser.png
deleted file mode 100644
index fd3455c..0000000
Binary files a/android/res/drawable/education_teaser.png and /dev/null differ
diff --git a/android/res/drawable/education_teaser_darken.png b/android/res/drawable/education_teaser_darken.png
deleted file mode 100644
index c947085..0000000
Binary files a/android/res/drawable/education_teaser_darken.png and /dev/null differ
diff --git a/android/res/drawable/img_culture1.jpg b/android/res/drawable/img_culture1.jpg
new file mode 100644
index 0000000..4b72a3a
Binary files /dev/null and b/android/res/drawable/img_culture1.jpg differ
diff --git a/android/res/drawable/culture_teaser_button.xml b/android/res/drawable/img_culture1_button.xml
similarity index 55%
rename from android/res/drawable/culture_teaser_button.xml
rename to android/res/drawable/img_culture1_button.xml
index 761e6c5..2b7e551 100644
--- a/android/res/drawable/culture_teaser_button.xml
+++ b/android/res/drawable/img_culture1_button.xml
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/android/res/drawable/img_culture1_highlighted.xml b/android/res/drawable/img_culture1_highlighted.xml
new file mode 100644
index 0000000..02edba6
--- /dev/null
+++ b/android/res/drawable/img_culture1_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_culture2.jpg b/android/res/drawable/img_culture2.jpg
new file mode 100644
index 0000000..ece8ddd
Binary files /dev/null and b/android/res/drawable/img_culture2.jpg differ
diff --git a/android/res/drawable/agro_teaser_button.xml b/android/res/drawable/img_culture2_button.xml
similarity index 55%
rename from android/res/drawable/agro_teaser_button.xml
rename to android/res/drawable/img_culture2_button.xml
index 5eab3fe..77893ef 100644
--- a/android/res/drawable/agro_teaser_button.xml
+++ b/android/res/drawable/img_culture2_button.xml
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/android/res/drawable/img_culture2_highlighted.xml b/android/res/drawable/img_culture2_highlighted.xml
new file mode 100644
index 0000000..af065b8
--- /dev/null
+++ b/android/res/drawable/img_culture2_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_culture3.jpg b/android/res/drawable/img_culture3.jpg
new file mode 100644
index 0000000..f231ccc
Binary files /dev/null and b/android/res/drawable/img_culture3.jpg differ
diff --git a/android/res/drawable/tourism_teaser_button.xml b/android/res/drawable/img_culture3_button.xml
similarity index 55%
rename from android/res/drawable/tourism_teaser_button.xml
rename to android/res/drawable/img_culture3_button.xml
index e8fbf92..b8cef8d 100644
--- a/android/res/drawable/tourism_teaser_button.xml
+++ b/android/res/drawable/img_culture3_button.xml
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/android/res/drawable/img_culture3_highlighted.xml b/android/res/drawable/img_culture3_highlighted.xml
new file mode 100644
index 0000000..81aecdf
--- /dev/null
+++ b/android/res/drawable/img_culture3_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_education1.jpg b/android/res/drawable/img_education1.jpg
new file mode 100644
index 0000000..0eeebf1
Binary files /dev/null and b/android/res/drawable/img_education1.jpg differ
diff --git a/android/res/drawable/economics_teaser_button.xml b/android/res/drawable/img_education1_button.xml
similarity index 54%
rename from android/res/drawable/economics_teaser_button.xml
rename to android/res/drawable/img_education1_button.xml
index 778a0cc..a98cbe8 100644
--- a/android/res/drawable/economics_teaser_button.xml
+++ b/android/res/drawable/img_education1_button.xml
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/android/res/drawable/img_education1_highlighted.xml b/android/res/drawable/img_education1_highlighted.xml
new file mode 100644
index 0000000..0689127
--- /dev/null
+++ b/android/res/drawable/img_education1_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_education2.jpg b/android/res/drawable/img_education2.jpg
new file mode 100644
index 0000000..a4aeaad
Binary files /dev/null and b/android/res/drawable/img_education2.jpg differ
diff --git a/android/res/drawable/education_teaser_button.xml b/android/res/drawable/img_education2_button.xml
similarity index 54%
rename from android/res/drawable/education_teaser_button.xml
rename to android/res/drawable/img_education2_button.xml
index 226210c..b991317 100644
--- a/android/res/drawable/education_teaser_button.xml
+++ b/android/res/drawable/img_education2_button.xml
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/android/res/drawable/img_education2_highlighted.xml b/android/res/drawable/img_education2_highlighted.xml
new file mode 100644
index 0000000..2b0394c
--- /dev/null
+++ b/android/res/drawable/img_education2_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_education3.jpg b/android/res/drawable/img_education3.jpg
new file mode 100644
index 0000000..bd3f7e1
Binary files /dev/null and b/android/res/drawable/img_education3.jpg differ
diff --git a/android/res/drawable/img_education3_button.xml b/android/res/drawable/img_education3_button.xml
new file mode 100644
index 0000000..59d17de
--- /dev/null
+++ b/android/res/drawable/img_education3_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_education3_highlighted.xml b/android/res/drawable/img_education3_highlighted.xml
new file mode 100644
index 0000000..36410a8
--- /dev/null
+++ b/android/res/drawable/img_education3_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor1.jpg b/android/res/drawable/img_for_investor1.jpg
new file mode 100644
index 0000000..f5ff3d0
Binary files /dev/null and b/android/res/drawable/img_for_investor1.jpg differ
diff --git a/android/res/drawable/img_for_investor1_button.xml b/android/res/drawable/img_for_investor1_button.xml
new file mode 100644
index 0000000..90dc123
--- /dev/null
+++ b/android/res/drawable/img_for_investor1_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor1_highlighted.xml b/android/res/drawable/img_for_investor1_highlighted.xml
new file mode 100644
index 0000000..c891659
--- /dev/null
+++ b/android/res/drawable/img_for_investor1_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor2.jpg b/android/res/drawable/img_for_investor2.jpg
new file mode 100644
index 0000000..a274aba
Binary files /dev/null and b/android/res/drawable/img_for_investor2.jpg differ
diff --git a/android/res/drawable/img_for_investor2_button.xml b/android/res/drawable/img_for_investor2_button.xml
new file mode 100644
index 0000000..3ff3ac2
--- /dev/null
+++ b/android/res/drawable/img_for_investor2_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor2_highlighted.xml b/android/res/drawable/img_for_investor2_highlighted.xml
new file mode 100644
index 0000000..96e896c
--- /dev/null
+++ b/android/res/drawable/img_for_investor2_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor3.jpg b/android/res/drawable/img_for_investor3.jpg
new file mode 100644
index 0000000..63a1cea
Binary files /dev/null and b/android/res/drawable/img_for_investor3.jpg differ
diff --git a/android/res/drawable/img_for_investor3_button.xml b/android/res/drawable/img_for_investor3_button.xml
new file mode 100644
index 0000000..79dfd63
--- /dev/null
+++ b/android/res/drawable/img_for_investor3_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor3_highlighted.xml b/android/res/drawable/img_for_investor3_highlighted.xml
new file mode 100644
index 0000000..9af62a9
--- /dev/null
+++ b/android/res/drawable/img_for_investor3_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor4.jpg b/android/res/drawable/img_for_investor4.jpg
new file mode 100644
index 0000000..7d8c220
Binary files /dev/null and b/android/res/drawable/img_for_investor4.jpg differ
diff --git a/android/res/drawable/img_for_investor4_button.xml b/android/res/drawable/img_for_investor4_button.xml
new file mode 100644
index 0000000..2e6a80c
--- /dev/null
+++ b/android/res/drawable/img_for_investor4_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_for_investor4_highlighted.xml b/android/res/drawable/img_for_investor4_highlighted.xml
new file mode 100644
index 0000000..9cf053a
--- /dev/null
+++ b/android/res/drawable/img_for_investor4_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist1.jpg b/android/res/drawable/img_tourist1.jpg
new file mode 100644
index 0000000..0a140eb
Binary files /dev/null and b/android/res/drawable/img_tourist1.jpg differ
diff --git a/android/res/drawable/sport_teaser_button.xml b/android/res/drawable/img_tourist1_button.xml
similarity index 55%
rename from android/res/drawable/sport_teaser_button.xml
rename to android/res/drawable/img_tourist1_button.xml
index 6917bd4..4c6a9a0 100644
--- a/android/res/drawable/sport_teaser_button.xml
+++ b/android/res/drawable/img_tourist1_button.xml
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist1_highlighted.xml b/android/res/drawable/img_tourist1_highlighted.xml
new file mode 100644
index 0000000..7d60da7
--- /dev/null
+++ b/android/res/drawable/img_tourist1_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist2.jpg b/android/res/drawable/img_tourist2.jpg
new file mode 100644
index 0000000..301b836
Binary files /dev/null and b/android/res/drawable/img_tourist2.jpg differ
diff --git a/android/res/drawable/img_tourist2_button.xml b/android/res/drawable/img_tourist2_button.xml
new file mode 100644
index 0000000..e7c59b2
--- /dev/null
+++ b/android/res/drawable/img_tourist2_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist2_highlighted.xml b/android/res/drawable/img_tourist2_highlighted.xml
new file mode 100644
index 0000000..7fb6f9d
--- /dev/null
+++ b/android/res/drawable/img_tourist2_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist3.jpg b/android/res/drawable/img_tourist3.jpg
new file mode 100644
index 0000000..f52e8ed
Binary files /dev/null and b/android/res/drawable/img_tourist3.jpg differ
diff --git a/android/res/drawable/img_tourist3_button.xml b/android/res/drawable/img_tourist3_button.xml
new file mode 100644
index 0000000..4c8146a
--- /dev/null
+++ b/android/res/drawable/img_tourist3_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist3_highlighted.xml b/android/res/drawable/img_tourist3_highlighted.xml
new file mode 100644
index 0000000..afe94cf
--- /dev/null
+++ b/android/res/drawable/img_tourist3_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist4.jpg b/android/res/drawable/img_tourist4.jpg
new file mode 100644
index 0000000..5e67b8a
Binary files /dev/null and b/android/res/drawable/img_tourist4.jpg differ
diff --git a/android/res/drawable/img_tourist4_button.xml b/android/res/drawable/img_tourist4_button.xml
new file mode 100644
index 0000000..af68c4c
--- /dev/null
+++ b/android/res/drawable/img_tourist4_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/img_tourist4_highlighted.xml b/android/res/drawable/img_tourist4_highlighted.xml
new file mode 100644
index 0000000..6ec11e4
--- /dev/null
+++ b/android/res/drawable/img_tourist4_highlighted.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/res/drawable/medicine_teaser.png b/android/res/drawable/medicine_teaser.png
deleted file mode 100644
index 218014c..0000000
Binary files a/android/res/drawable/medicine_teaser.png and /dev/null differ
diff --git a/android/res/drawable/medicine_teaser_button.xml b/android/res/drawable/medicine_teaser_button.xml
deleted file mode 100644
index f90acb1..0000000
--- a/android/res/drawable/medicine_teaser_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/android/res/drawable/medicine_teaser_darken.png b/android/res/drawable/medicine_teaser_darken.png
deleted file mode 100644
index dffa9a6..0000000
Binary files a/android/res/drawable/medicine_teaser_darken.png and /dev/null differ
diff --git a/android/res/drawable/news_image1.jpg b/android/res/drawable/news_image1.jpg
new file mode 100644
index 0000000..7d10cf2
Binary files /dev/null and b/android/res/drawable/news_image1.jpg differ
diff --git a/android/res/drawable/news_image2.jpg b/android/res/drawable/news_image2.jpg
new file mode 100644
index 0000000..8489f93
Binary files /dev/null and b/android/res/drawable/news_image2.jpg differ
diff --git a/android/res/drawable/news_image3.jpg b/android/res/drawable/news_image3.jpg
new file mode 100644
index 0000000..f803625
Binary files /dev/null and b/android/res/drawable/news_image3.jpg differ
diff --git a/android/res/drawable/sport_teaser.png b/android/res/drawable/sport_teaser.png
deleted file mode 100644
index ec18d8c..0000000
Binary files a/android/res/drawable/sport_teaser.png and /dev/null differ
diff --git a/android/res/drawable/sport_teaser_darken.png b/android/res/drawable/sport_teaser_darken.png
deleted file mode 100644
index 050aaca..0000000
Binary files a/android/res/drawable/sport_teaser_darken.png and /dev/null differ
diff --git a/android/res/drawable/test_investagency.png b/android/res/drawable/test_investagency.png
deleted file mode 100644
index 28eb221..0000000
Binary files a/android/res/drawable/test_investagency.png and /dev/null differ
diff --git a/android/res/drawable/test_promstruct_rb.png b/android/res/drawable/test_promstruct_rb.png
deleted file mode 100644
index bbaa506..0000000
Binary files a/android/res/drawable/test_promstruct_rb.png and /dev/null differ
diff --git a/android/res/drawable/test_teaser_bkg.png b/android/res/drawable/test_teaser_bkg.png
deleted file mode 100644
index adc305f..0000000
Binary files a/android/res/drawable/test_teaser_bkg.png and /dev/null differ
diff --git a/android/res/drawable/test_teaser_bkg_button.xml b/android/res/drawable/test_teaser_bkg_button.xml
deleted file mode 100644
index c76f008..0000000
--- a/android/res/drawable/test_teaser_bkg_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/android/res/drawable/test_teaser_bkg_darken.png b/android/res/drawable/test_teaser_bkg_darken.png
deleted file mode 100644
index 58f036a..0000000
Binary files a/android/res/drawable/test_teaser_bkg_darken.png and /dev/null differ
diff --git a/android/res/drawable/test_umpo.png b/android/res/drawable/test_umpo.png
deleted file mode 100644
index f29529e..0000000
Binary files a/android/res/drawable/test_umpo.png and /dev/null differ
diff --git a/android/res/drawable/tourism_teaser.png b/android/res/drawable/tourism_teaser.png
deleted file mode 100644
index f38c438..0000000
Binary files a/android/res/drawable/tourism_teaser.png and /dev/null differ
diff --git a/android/res/drawable/tourism_teaser_darken.png b/android/res/drawable/tourism_teaser_darken.png
deleted file mode 100644
index 50f068b..0000000
Binary files a/android/res/drawable/tourism_teaser_darken.png and /dev/null differ
diff --git a/android/res/drawable/transport_teaser.png b/android/res/drawable/transport_teaser.png
deleted file mode 100644
index 1f9b7c3..0000000
Binary files a/android/res/drawable/transport_teaser.png and /dev/null differ
diff --git a/android/res/drawable/transport_teaser_button.xml b/android/res/drawable/transport_teaser_button.xml
deleted file mode 100644
index f8ff3a1..0000000
--- a/android/res/drawable/transport_teaser_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/android/res/drawable/transport_teaser_darken.png b/android/res/drawable/transport_teaser_darken.png
deleted file mode 100644
index f8de95f..0000000
Binary files a/android/res/drawable/transport_teaser_darken.png and /dev/null differ
diff --git a/android/res/layout/button_hview_list_element.xml b/android/res/layout/button_hview_list_element.xml
new file mode 100644
index 0000000..bd57d10
--- /dev/null
+++ b/android/res/layout/button_hview_list_element.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
diff --git a/android/res/layout/darken_hview_list_element.xml b/android/res/layout/darken_hview_list_element.xml
new file mode 100644
index 0000000..d3654b0
--- /dev/null
+++ b/android/res/layout/darken_hview_list_element.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
diff --git a/android/res/layout/fragment_main_page.xml b/android/res/layout/fragment_main_page.xml
index 37531eb..f253a15 100644
--- a/android/res/layout/fragment_main_page.xml
+++ b/android/res/layout/fragment_main_page.xml
@@ -5,25 +5,40 @@
android:layout_margin="0dp"
android:background="@drawable/background"
android:orientation="vertical"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
tools:context="fishrungames.bashgid.MainPageFragment" >
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/res/layout/fragment_semidetails_page.xml b/android/res/layout/fragment_semidetails_page.xml
deleted file mode 100644
index b773613..0000000
--- a/android/res/layout/fragment_semidetails_page.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/android/res/layout/main_page_list_element.xml b/android/res/layout/main_page_list_element.xml
new file mode 100644
index 0000000..ad12d79
--- /dev/null
+++ b/android/res/layout/main_page_list_element.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/res/layout/main_page_list_header.xml b/android/res/layout/main_page_list_header.xml
new file mode 100644
index 0000000..9b861ca
--- /dev/null
+++ b/android/res/layout/main_page_list_header.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/res/layout/semidetails_element.xml b/android/res/layout/semidetails_element.xml
deleted file mode 100644
index c248cba..0000000
--- a/android/res/layout/semidetails_element.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/res/layout/simple_hview_list_element.xml b/android/res/layout/simple_hview_list_element.xml
new file mode 100644
index 0000000..df687e4
--- /dev/null
+++ b/android/res/layout/simple_hview_list_element.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/android/res/layout/teaser_list_element.xml b/android/res/layout/teaser_list_element.xml
deleted file mode 100644
index 8da0d0d..0000000
--- a/android/res/layout/teaser_list_element.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 5da3e01..ef05501 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -11,6 +11,14 @@
#F0F0F0
#2B517F
+
+#000000
+
+#60000000
+
+#BCDEFF
+
+
diff --git a/android/src/fishrungames/bashgid/MainActivity.java b/android/src/fishrungames/bashgid/MainActivity.java
index 615142d..8d43d4e 100644
--- a/android/src/fishrungames/bashgid/MainActivity.java
+++ b/android/src/fishrungames/bashgid/MainActivity.java
@@ -66,7 +66,7 @@ public class MainActivity extends ActionBarActivity {
public void OnSelectSemiDetails(Integer pos)
{
- getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, new SemiDetailsFragment()).addToBackStack(null).commit();
+ //getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, new SemiDetailsFragment()).addToBackStack(null).commit();
}
public void OpenMainScreen()
diff --git a/android/src/fishrungames/bashgid/MainPageFragment.java b/android/src/fishrungames/bashgid/MainPageFragment.java
index 79e1c03..7c10bac 100644
--- a/android/src/fishrungames/bashgid/MainPageFragment.java
+++ b/android/src/fishrungames/bashgid/MainPageFragment.java
@@ -8,60 +8,90 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.Button;
-import android.widget.GridView;
+import android.widget.ImageView;
import android.widget.ListView;
+import android.widget.TextView;
+import it.sephiroth.android.library.widget.HListView;
public class MainPageFragment extends Fragment {
- final Integer[] teaserIcons = {
- R.drawable.economics_teaser_button,
- R.drawable.test_teaser_bkg_button,
- R.drawable.agro_teaser_button,
- R.drawable.transport_teaser_button,
- R.drawable.education_teaser_button,
- R.drawable.tourism_teaser_button,
- R.drawable.medicine_teaser_button,
- R.drawable.sport_teaser_button,
- };
+ String [] teaserHeaderArray = { "Для инвестора", "Культура Башкортостана", "Для гостей и туристов", "Образование" };
- final String[] teaserText = {
- "Экономика",
- "Промышленность",
- "Сельское хозяйство ",
- "Транспорт",
- "Образование",
- "Туризм",
- "Медицина",
- "Спорт",
-
- };
+ String [] investorGroupTitleArray = { "Предприятия Башкортостана", "Статистика", "Помощь инвестору", "Транспорт" };
+ String [] investorGroupSubtitleArray = { "Обзор", "Все об экономике Башкортостана", "Программа помощи инвесторам", "Обзор транспортной инфраструктуры" };
+ int[] investorGroupImgIdArray = { R.drawable.img_for_investor1_button, R.drawable.img_for_investor2_button, R.drawable.img_for_investor3_button, R.drawable.img_for_investor4_button };
- GridView teaserGridView;
+
+ String [] cultureGroupTitleArray = { "Земфира", "Башкирский театр", "Национальная библиотека" };
+ String [] cultureGroupSubtitleArray = { "Персона дня", "Культурные традиции", "Литература"};
+ int[] cultureGroupImgIdArray = { R.drawable.img_culture1_button, R.drawable.img_culture2_button, R.drawable.img_culture3_button };
+
+
+ String [] touristGroupTitleArray = { "Панорамы Уфы", "Иремель", "Памятник Салавату Юлаеву", "Ночная жизнь в Уфе" };
+ String [] touristGroupSubtitleArray = { "Уфа с высоты птичьего полета", "Природный парк", "Достопримечательность", "Обзор"};
+ int[] touristGroupImgIdArray = { R.drawable.img_tourist1_button, R.drawable.img_tourist2_button, R.drawable.img_tourist3_button, R.drawable.img_tourist4_button };
+
+ String [] educationGroupTitleArray = { "Учебные заведения Уфы", "УГАТУ", "БГПУ" };
+ String [] educationGroupSubtitleArray = { "Обзор", "Университет", "Университет"};
+ int[] educationGroupImgIdArray = { R.drawable.img_education1_button, R.drawable.img_education2_button, R.drawable.img_education3_button };
+
+
+ ListView listView;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_main_page, container, false);
+
+ listView = (ListView) rootView.findViewById(R.id.listView);
-
- teaserGridView = (GridView) rootView.findViewById(R.id.teaserGridView);
+ listView.setAdapter(new ListAdapter(getActivity()));
- teaserGridView.setAdapter(new SlideListAdapter(getActivity()));
+ View header = inflater.inflate(R.layout.main_page_list_header, null);
+ fillHeader(header);
+
+ listView.addHeaderView(header);
return rootView;
}
- public class SlideListAdapter extends BaseAdapter {
+ private void fillHeader(View header)
+ {
+ ImageView news1ImageView = (ImageView) header.findViewById(R.id.news1ImageView);
+ ImageView news2ImageView = (ImageView) header.findViewById(R.id.news2ImageView);
+ ImageView news3ImageView = (ImageView) header.findViewById(R.id.news3ImageView);
+
+ TextView news1TextView = (TextView)header.findViewById(R.id.news1TextView);
+ TextView news2TextView = (TextView)header.findViewById(R.id.news2TextView);
+ TextView news3TextView = (TextView)header.findViewById(R.id.news3TextView);
+
+ news1ImageView.setImageResource(R.drawable.news_image1);
+ news2ImageView.setImageResource(R.drawable.news_image2);
+ news3ImageView.setImageResource(R.drawable.news_image3);
+
+ news1TextView.setText("Власти Башкирии создадут выезд из Уфы на трассу М-5 «Урал»");
+ news2TextView.setText("Башкирия заняла первое место индекса «деловой активности»");
+ news3TextView.setText("«Салават Юлаев» обыграл «Ладу» и прервал серию из 5 поражений в КХЛ");
+
+ Button moreNewsButton = (Button)header.findViewById(R.id.moreNewsButton);
+
+ moreNewsButton.setText("Другие новости...");
+
+ }
+
+
+
+ public class ListAdapter extends BaseAdapter {
private Context mContext;
- public SlideListAdapter(Context c) {
+ public ListAdapter(Context c) {
mContext = c;
}
public int getCount() {
- return teaserIcons.length;
+ return teaserHeaderArray.length;
}
public Object getItem(int position) {
@@ -79,28 +109,44 @@ public class MainPageFragment extends Fragment {
View view;
if (convertView == null) { // if it's not recycled, initialize some attributes
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- view = inflater.inflate(R.layout.teaser_list_element, null);
+ view = inflater.inflate(R.layout.main_page_list_element, null);
} else {
view = convertView;
}
- Button button = (Button) view.findViewById(R.id.teaserElement);
+ TextView textView = (TextView) view.findViewById(R.id.textView);
- button.setOnClickListener(new View.OnClickListener()
+ Button button = (Button) view.findViewById(R.id.button);
+
+ HListView hListView = (HListView) view.findViewById(R.id.hListView);
+
+ if (position == 0)
{
- @Override
- public void onClick(View v) {
- MainActivity.getInstance().OnSelectSemiDetails(0);
- }
- }
- );
- //button.setBackground(mContext.getResources().getDrawable(teaserIcons[position]));
-
- button.setBackgroundResource(teaserIcons[position]);
- button.setText(teaserText[position]);
+ hListView.setAdapter(new MainPageHListViewAdapters.SimpleElementAdapter(getActivity(), investorGroupTitleArray, investorGroupSubtitleArray, investorGroupImgIdArray));
+ }
+ else if (position == 1)
+ {
+ hListView.setAdapter(new MainPageHListViewAdapters.SimpleElementAdapter(getActivity(), cultureGroupTitleArray, cultureGroupSubtitleArray, cultureGroupImgIdArray));
+ }
+ else if (position == 2)
+ {
+ hListView.setAdapter(new MainPageHListViewAdapters.SimpleElementAdapter(getActivity(), touristGroupTitleArray, touristGroupSubtitleArray, touristGroupImgIdArray));
+ }
+ else
+ {
+ hListView.setAdapter(new MainPageHListViewAdapters.SimpleElementAdapter(getActivity(), educationGroupTitleArray, educationGroupSubtitleArray, educationGroupImgIdArray));
+ }
+
+ textView.setText(teaserHeaderArray[position]);
+
+ button.setText("Посмотреть все");
+
+
+
+
return view;
}
diff --git a/android/src/fishrungames/bashgid/MainPageHListViewAdapters.java b/android/src/fishrungames/bashgid/MainPageHListViewAdapters.java
new file mode 100644
index 0000000..2fd8bb2
--- /dev/null
+++ b/android/src/fishrungames/bashgid/MainPageHListViewAdapters.java
@@ -0,0 +1,143 @@
+package fishrungames.bashgid;
+
+import it.sephiroth.android.library.widget.HListView;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class MainPageHListViewAdapters {
+
+
+ public static class SimpleElementAdapter extends BaseAdapter {
+
+ String [] textsArray;
+ String [] subTextsArray;
+ int [] imgIdArray;
+
+ private Context mContext;
+
+ public SimpleElementAdapter(Context c, String [] textsArray, String [] subTextsArray, int [] imgIdArray) {
+ mContext = c;
+ this.textsArray = textsArray;
+ this.subTextsArray = subTextsArray;
+ this.imgIdArray = imgIdArray;
+
+ }
+
+ public int getCount() {
+ return textsArray.length;
+ }
+
+ public Object getItem(int position) {
+ return null;
+ }
+
+ public long getItemId(int position) {
+ return 0;
+ }
+
+ // create a new ImageView for each item referenced by the Adapter
+ public View getView(int position, View convertView, ViewGroup parent) {
+
+
+ View view;
+ if (convertView == null) { // if it's not recycled, initialize some attributes
+ LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ view = inflater.inflate(R.layout.simple_hview_list_element, null);
+
+
+ } else {
+ view = convertView;
+ }
+
+ TextView textView = (TextView) view.findViewById(R.id.textView);
+
+ TextView subTextView = (TextView) view.findViewById(R.id.subTextView);
+
+ ImageButton imageButton = (ImageButton) view.findViewById(R.id.imageButton);
+
+
+ textView.setText(textsArray[position]);
+
+ subTextView.setText(subTextsArray[position]);
+
+ //imageButton.setImageResource(imgIdArray[position]);
+ imageButton.setBackgroundResource(imgIdArray[position]);
+
+
+ return view;
+ }
+
+ }
+
+
+public static class DarkenElementAdapter extends BaseAdapter {
+
+ String [] textsArray;
+ String [] subTextsArray;
+ int [] imgIdArray;
+
+ private Context mContext;
+
+ public DarkenElementAdapter(Context c, String [] textsArray, String [] subTextsArray, int [] imgIdArray) {
+ mContext = c;
+ this.textsArray = textsArray;
+ this.subTextsArray = subTextsArray;
+ this.imgIdArray = imgIdArray;
+
+ }
+
+ public int getCount() {
+ return textsArray.length;
+ }
+
+ public Object getItem(int position) {
+ return null;
+ }
+
+ public long getItemId(int position) {
+ return 0;
+ }
+
+ // create a new ImageView for each item referenced by the Adapter
+ public View getView(int position, View convertView, ViewGroup parent) {
+
+
+ View view;
+ if (convertView == null) { // if it's not recycled, initialize some attributes
+ LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ view = inflater.inflate(R.layout.darken_hview_list_element, null);
+
+
+ } else {
+ view = convertView;
+ }
+
+ TextView textView = (TextView) view.findViewById(R.id.textView);
+
+ TextView subTextView = (TextView) view.findViewById(R.id.subTextView);
+
+ LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.linearLayout);
+
+ textView.setText(textsArray[position]);
+
+ subTextView.setText(subTextsArray[position]);
+
+ linearLayout.setBackgroundResource(imgIdArray[position]);
+
+ return view;
+ }
+
+ }
+
+
+
+
+
+}
diff --git a/android/src/fishrungames/bashgid/SemiDetailsFragment.java b/android/src/fishrungames/bashgid/SemiDetailsFragment.java
deleted file mode 100644
index 3e3572e..0000000
--- a/android/src/fishrungames/bashgid/SemiDetailsFragment.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package fishrungames.bashgid;
-
-import it.sephiroth.android.library.widget.HListView;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-public class SemiDetailsFragment extends Fragment {
-
-
- ListView semidetailsGridView;
-
- HListView hListView;
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.fragment_semidetails_page, container, false);
-
- semidetailsGridView = (ListView) rootView.findViewById(R.id.listView);
-
- semidetailsGridView.setAdapter(new SemidetailsAdapter(getActivity()));
-
- hListView = (HListView) rootView.findViewById(R.id.hListView1);
-
- hListView.setAdapter(new SemidetailsAdapter(getActivity()));
-
- return rootView;
- }
-
-
-
-
- public class SemidetailsAdapter extends BaseAdapter {
- private Context mContext;
-
- public SemidetailsAdapter(Context c) {
- mContext = c;
- }
-
- public int getCount() {
- return 3;
- }
-
- public Object getItem(int position) {
- return null;
- }
-
- public long getItemId(int position) {
- return 0;
- }
-
- // create a new ImageView for each item referenced by the Adapter
- public View getView(int position, View convertView, ViewGroup parent) {
-
-
- View view;
- if (convertView == null) { // if it's not recycled, initialize some attributes
- LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- view = inflater.inflate(R.layout.semidetails_element, null);
-
-
- } else {
- view = convertView;
- }
-
- TextView headerTextView = (TextView)view.findViewById(R.id.headerTextView);
- TextView subHeaderTextView = (TextView)view.findViewById(R.id.subHeaderTextView);
-
- ImageView imageView = (ImageView)view.findViewById(R.id.imageView);
-
- TextView imageTextView = (TextView)view.findViewById(R.id.imageTextView);
-
- TextView footerTextView = (TextView)view.findViewById(R.id.footerTextView);
-
- Button button1 = (Button)view.findViewById(R.id.button1);
- Button button2 = (Button)view.findViewById(R.id.button2);
- Button button3 = (Button)view.findViewById(R.id.button3);
-
- if (position == 0)
- {
- headerTextView.setVisibility(View.VISIBLE);
- headerTextView.setText("Структура промышленности Башкортостана");
-
- subHeaderTextView.setText("Важнейшие отрасли промышленности Башкортостана — нефтедобыча, нефтепереработка, химия и нефтехимия.");
- subHeaderTextView.setVisibility(View.VISIBLE);
-
- imageView.setImageResource(R.drawable.test_promstruct_rb);
-
- LayoutParams params = imageView.getLayoutParams();
- params.width = LayoutParams.MATCH_PARENT;
- imageView.setLayoutParams(params);
-
-
-
- imageTextView.setVisibility(View.GONE);
-
- footerTextView.setText("Информация предоставлена Министерством промышленности и инновационной политики республики Башкортостан");
-
- button1.setText("Статистика по отраслям...");
- button1.setVisibility(View.VISIBLE);
-
- button2.setText("Поиск...");
- button2.setVisibility(View.VISIBLE);
-
- button3.setVisibility(View.GONE);
-
-
- }
- else if (position == 1)
- {
- headerTextView.setVisibility(View.VISIBLE);
- headerTextView.setText("Предприятие дня");
-
- subHeaderTextView.setVisibility(View.VISIBLE);
- subHeaderTextView.setText("Уфимское моторостроительное производственное объединение");
-
- imageView.setImageResource(R.drawable.test_umpo);
-
- LayoutParams params = imageView.getLayoutParams();
- params.width = 200;
- imageView.setLayoutParams(params);
-
-
- imageTextView.setVisibility(View.VISIBLE);
- imageTextView.setText("УМПО - российское предприятие, производитель авиационных двигателей. Основано в 1925 году. В объединении работают более 15 тысяч человек.");
-
- footerTextView.setText("Информация предоставлена пресс-службой УМПО");
-
- button1.setText("Информация о предприятии...");
- button1.setVisibility(View.VISIBLE);
-
- button2.setText("Продукция...");
- button2.setVisibility(View.VISIBLE);
-
- button3.setText("Контакты...");
- button3.setVisibility(View.VISIBLE);
- }
- else
- {
- headerTextView.setVisibility(View.VISIBLE);
- headerTextView.setText("Информационная поддержка инвестора");
-
- subHeaderTextView.setVisibility(View.VISIBLE);
- subHeaderTextView.setText("С чего начать? Пошаговое руководство и ответы на вопросы");
-
- imageView.setImageResource(R.drawable.test_investagency);
-
- LayoutParams params = imageView.getLayoutParams();
- params.width = 200;
- imageView.setLayoutParams(params);
-
-
- imageTextView.setVisibility(View.VISIBLE);
- imageTextView.setText("Специалисты агентства подготовили справочник, в котором вы узнаете ответы на все юридические вопросы, которые могут возникнуть при инвестировании в предприятия Республики Башкортостан");
-
- footerTextView.setText("Агентство по привлечению инвестиций Республики Башкортостан");
-
- button1.setText("С чего начать...");
- button1.setVisibility(View.VISIBLE);
-
- button2.setText("Часто задаваемые вопросы...");
- button2.setVisibility(View.VISIBLE);
-
- button3.setVisibility(View.GONE);
- }
-
- //Button button = (Button) view.findViewById(R.id.teaserElement);
-
- //button.setBackground(mContext.getResources().getDrawable(teaserIcons[position]));
-
- //button.setBackgroundResource(teaserIcons[position]);
- //button.setText(teaserText[position]);
- return view;
- }
-
- }
-}