Different screen sizes apply + clean up

android/res/layout/article_album_element.xml

@@ -2,26 +2,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/bkg1"
     android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingTop="4dp"
     android:showDividers="middle" >
 
     <TextView
         android:id="@+id/titleTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/medium_margin"
         android:text="TextView"
-        android:textSize="18sp"
+        android:textSize="@dimen/xlarge_text_size"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/contentTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextView" />
+        android:layout_margin="@dimen/medium_margin"
+        android:text="TextView"
+        android:textSize="@dimen/small_text_size" />
 
     <it.sephiroth.android.library.widget.HListView
         android:id="@+id/hListView"

android/res/layout/article_album_element_item.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >

android/res/layout/article_button_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >
@@ -13,10 +12,10 @@
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/medium_margin"
         android:background="@color/bkg2"
         android:drawableLeft="@drawable/ic_action_web_site"
         android:text="@string/go_to_website"
-        android:textSize="30sp" />
+        android:textSize="@dimen/xlarge_text_size" />
 
 </LinearLayout>

android/res/layout/article_geotag_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >
@@ -12,31 +11,35 @@
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/medium_margin"
         android:text="@string/address_form"
-        android:textSize="24sp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/addressTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/medium_margin"
-        android:layout_marginLeft="8dp"
+        android:layout_marginLeft="@dimen/medium_margin"
-        android:layout_marginRight="8dp"
+        android:layout_marginRight="@dimen/medium_margin"
         android:background="@color/bkg2"
-        android:textSize="24sp" />
+        android:textSize="@dimen/large_text_size"
+         />
 
     <TextView
         android:id="@+id/hintTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/hold_address" />
+        android:text="@string/hold_address"
+		android:textSize="@dimen/small_text_size"
+		android:layout_marginBottom="@dimen/medium_margin"
+		android:layout_marginLeft="@dimen/medium_margin"/>
 
     <org.osmdroid.views.MapView
         android:id="@+id/mapview"
         android:layout_width="match_parent"
-        android:layout_height="160dp"
+        android:layout_height="@dimen/article_mapview_height"
         android:layout_gravity="center_horizontal"
         tilesource="Mapnik" />
     

android/res/layout/article_phone_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >
@@ -13,10 +12,10 @@
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/medium_margin"
         android:background="@color/bkg2"
         android:drawableLeft="@drawable/ic_action_call"
         android:gravity="left|center_vertical"
-        android:textSize="30sp" />
+        android:textSize="@dimen/xlarge_text_size" />
 
 </LinearLayout>

android/res/layout/article_photo_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >
@@ -23,7 +22,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:text="TextView"
-        android:textSize="18sp"
+        android:textSize="@dimen/medium_text_size"
         android:textStyle="bold" />
 
 </LinearLayout>

android/res/layout/article_text_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >

android/res/layout/drawer_list_element.xml

@@ -9,10 +9,10 @@
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="48dp"
+        android:layout_width="@dimen/drawer_image_size"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/drawer_image_size"
-        android:layout_margin="4dp"
+        android:layout_margin="@dimen/drawer_margin"
-        android:layout_marginLeft="10dp"
+        android:layout_marginLeft="@dimen/drawer_margin_left"
         android:contentDescription="@string/icon" />
 
     <TextView
@@ -20,10 +20,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="4dp"
+        android:layout_margin="@dimen/drawer_margin"
-        android:paddingLeft="10dp"
+        android:paddingLeft="@dimen/drawer_margin_left"
         android:text=""
         android:textColor="@color/text_white"
-        android:textSize="20sp" />
+        android:textSize="@dimen/medium_text_size" />
 
 </LinearLayout>

android/res/layout/fragment_article_page.xml

@@ -7,26 +7,23 @@
     android:orientation="vertical"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
-    
-    
-    
     <ListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="@dimen/large_margin"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/large_margin"
+        android:layout_marginRight="@dimen/large_margin"
         android:divider="@drawable/transparent"
-        android:dividerHeight="18dp"
+        android:dividerHeight="@dimen/large_divider_height" >
-        android:paddingBottom="16dp" >
 
     </ListView>
     
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/progress_bar_size"
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
     

android/res/layout/fragment_catalog_page.xml

@@ -10,8 +10,8 @@
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/progress_bar_size"
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
     
@@ -19,11 +19,11 @@
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="@dimen/large_margin"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/large_margin"
+        android:layout_marginRight="@dimen/large_margin"
         android:divider="@drawable/transparent"
-        android:dividerHeight="18dp"
+        android:dividerHeight="@dimen/large_divider_height" >
-        android:paddingBottom="16dp" >
 
     </ListView>
     

android/res/layout/fragment_main_page.xml

@@ -11,11 +11,12 @@
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="@dimen/large_margin"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/large_margin"
+        android:layout_marginRight="@dimen/large_margin"
         android:divider="@drawable/transparent"
-        android:dividerHeight="18dp"
+        android:dividerHeight="@dimen/large_divider_height" >
-        android:paddingBottom="16dp" >
+
 
     </ListView>
     

android/res/layout/fragment_navigation_drawer.xml

@@ -6,8 +6,8 @@
     android:background="@color/drawer_color"
     android:choiceMode="singleChoice"
     android:divider="@color/drawer_divider_color"
-    android:dividerHeight="1dp"
+    android:dividerHeight="@dimen/navigation_drawer_divider_height"
-    android:paddingLeft="10dp"
+    android:paddingLeft="@dimen/navigation_drawer_padding_left"
-    android:paddingRight="10dp"
+    android:paddingRight="@dimen/navigation_drawer_padding_right"
     tools:context="fishrungames.bashgid.NavigationDrawerFragment" />
 

android/res/layout/fragment_news_page.xml

@@ -12,11 +12,12 @@
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="@dimen/large_margin"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/large_margin"
+        android:layout_marginRight="@dimen/large_margin"
         android:divider="@color/bkg2"
-        android:dividerHeight="2dp"
+        android:dividerHeight="@dimen/small_divider_height"
-        android:paddingBottom="16dp" >
+         >
        
 
     </ListView>

android/res/layout/fragment_osm_map_page.xml

@@ -11,20 +11,21 @@
     tools:context="fishrungames.bashgid.MapHolderFragment" >
 
     <TextView
-        android:id="@+id/addressTextView"
+        android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="6dp"
+        android:layout_margin="@dimen/medium_margin"
         android:gravity="center_horizontal"
-        android:text="TextView"
+        android:text=""
-        android:textSize="24dp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
 
     <Spinner
         android:id="@+id/spinner"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/medium_margin" />
     
 <org.osmdroid.views.MapView
         android:id="@+id/mapview"

android/res/layout/fragment_photo_album_list_page.xml

@@ -12,11 +12,11 @@
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="@dimen/large_margin"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/large_margin"
+        android:layout_marginRight="@dimen/large_margin"
         android:divider="@color/bkg2"
-        android:dividerHeight="2dp"
+        android:dividerHeight="@dimen/small_divider_height" >
-        android:paddingBottom="16dp" >
 
     </ListView>
     

android/res/layout/fragment_photo_album_page.xml

@@ -12,19 +12,19 @@
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="@dimen/large_margin"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/large_margin"
+        android:layout_marginRight="@dimen/large_margin"
         android:divider="@color/bkg2"
-        android:dividerHeight="12dp"
+        android:dividerHeight="@dimen/small_divider_height" >
-        android:paddingBottom="16dp" >
 
     </ListView>
     
       <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/progress_bar_size"
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
     

android/res/layout/fragment_photo_page.xml

@@ -7,8 +7,8 @@
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/progress_bar_size"
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
     

android/res/layout/fragment_search_page.xml

@@ -3,10 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/large_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingLeft="@dimen/large_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/large_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="fishrungames.bashgid.SearchFragment" >
 
     <ListView

android/res/layout/fragment_settings_page.xml

@@ -1,18 +1,12 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:paddingBottom="@dimen/large_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/large_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/large_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="fishrungames.bashgid.SettingsFragment" >
 
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -23,16 +17,18 @@
                 android:id="@+id/selectLanguageTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
+                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="8dp"
+                android:layout_marginBottom="@dimen/medium_margin"
+                android:layout_marginTop="@dimen/medium_margin"
                 android:text="@string/select_language"
-                android:textSize="26sp" />
+                android:textSize="@dimen/large_text_size" />
 
             <LinearLayout
                 android:id="@+id/flag_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp" >
+                android:layout_marginBottom="@dimen/medium_margin"
+                android:baselineAligned="false" >
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -45,17 +41,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_weight="1"
                         android:text="@string/lang_english"
-                        android:textSize="20sp" />
+                        android:textSize="@dimen/language_text_size" />
 
                     <ImageButton
                         android:id="@+id/image_flag_usa"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_margin="8dp"
+                        android:layout_margin="@dimen/medium_margin"
-                        android:layout_weight="1"
                         android:adjustViewBounds="true"
                         android:background="@drawable/transparent"
                         android:contentDescription="@string/lang_english"
@@ -76,17 +70,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_weight="1"
                         android:text="@string/lang_russian"
-                        android:textSize="20sp" />
+                        android:textSize="@dimen/language_text_size" />
 
                     <ImageButton
                         android:id="@+id/image_flag_russia"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_margin="8dp"
+                        android:layout_margin="@dimen/medium_margin"
-                        android:layout_weight="1"
                         android:adjustViewBounds="true"
                         android:background="@drawable/transparent"
                         android:contentDescription="@string/lang_russian"
@@ -107,17 +99,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_weight="1"
                         android:text="@string/lang_chinese"
-                        android:textSize="20sp" />
+                        android:textSize="@dimen/language_text_size" />
 
                     <ImageButton
                         android:id="@+id/image_flag_china"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_margin="8dp"
+                        android:layout_margin="@dimen/medium_margin"
-                        android:layout_weight="1"
                         android:adjustViewBounds="true"
                         android:background="@drawable/transparent"
                         android:contentDescription="@string/lang_chinese"
@@ -132,43 +122,56 @@
                 android:id="@+id/textView1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
+                android:layout_marginBottom="@dimen/medium_margin"
                 android:text="@string/credits"
-                android:textSize="18sp" />
+                android:textSize="@dimen/small_text_size" />
 
             <ImageView
                 android:id="@+id/kitapImageView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:src="@drawable/kitap" />
+                android:src="@drawable/kitap"
+                android:layout_marginBottom="@dimen/medium_margin" />
 
             <Button
                 android:id="@+id/callSupportButton"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/call_support" />
+                android:text="@string/call_support"
+                android:textSize="@dimen/small_text_size"
+                android:layout_marginBottom="@dimen/medium_margin"
+                 />
 
             <Button
                 android:id="@+id/visitKitapButton"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/visit_kitap" />
+                android:text="@string/visit_kitap"
+                android:textSize="@dimen/small_text_size"
+                android:layout_marginBottom="@dimen/medium_margin" />
 
             <Button
                 android:id="@+id/visitDeveloperButton"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/visit_developer" />
+                android:text="@string/visit_developer"
+                android:textSize="@dimen/small_text_size"
+                android:layout_marginBottom="@dimen/medium_margin" />
 
             <Button
                 android:id="@+id/visitTranslatorButton"
+                style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/visit_translator" />
+                android:text="@string/visit_translator"
+                android:textSize="@dimen/small_text_size"
+                android:layout_marginBottom="@dimen/medium_margin" />
 
         </LinearLayout>
 
     </ScrollView>
 
-</LinearLayout>

android/res/layout/fragment_video_page.xml

@@ -6,8 +6,8 @@
 <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/progress_bar_size"
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
     
@@ -16,9 +16,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="bottom"
-        android:horizontalSpacing="12dp"
+        android:horizontalSpacing="@dimen/grid_view_horizontal_spacing"
-        android:numColumns="4"
+        android:numColumns="@integer/grid_columns"
-        android:verticalSpacing="12dp" >
+        android:verticalSpacing="@dimen/grid_view_vertical_spacing" >
 
     </GridView>
 

android/res/layout/fragment_video_record_page.xml

@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="match_parent">
-    android:layout_margin="6dp"
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical" >
 
             <ProgressBar
                 android:id="@+id/progressBar"
                 style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+                android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+                android:layout_height="@dimen/progress_bar_size"
-        android:layout_gravity="center_horizontal"
                 android:indeterminate="true" />
 
-    <ImageView
+            <fishrungames.bashgid.DynamicImageView
                 android:id="@+id/imageView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal" />
+                android:scaleType="centerCrop" />
 
             <TextView
                 android:id="@+id/nameTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+                android:layout_margin="@dimen/medium_margin"
-        android:textSize="24sp"
+                android:textSize="@dimen/large_text_size"
                 android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/descriptionTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
-
         </LinearLayout>
+
+    </ScrollView>
+

android/res/layout/fragment_welcome.xml

@@ -4,17 +4,14 @@
     android:layout_height="match_parent"
     android:background="@drawable/background"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:padding="@dimen/large_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="fishrungames.bashgid.WelcomeFragment" >
 
     <ImageView
         android:id="@+id/logo_view"
         android:layout_width="match_parent"
-        android:layout_height="250dp"
+        android:layout_height="@dimen/logo_height"
-        android:layout_marginTop="22dp"
+        android:layout_marginTop="@dimen/logo_margin_top"
         android:contentDescription="@string/RB_Coat"
         android:scaleType="fitCenter"
         android:src="@drawable/logo" />
@@ -22,7 +19,7 @@
     <LinearLayout
         android:id="@+id/flag_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="bottom"
         android:baselineAligned="false"
         android:gravity="bottom" >
@@ -39,14 +36,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/lang_english"
-                android:textSize="20sp" />
+                android:textSize="@dimen/language_text_size" />
 
             <ImageButton
                 android:id="@+id/image_flag_usa"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_margin="8dp"
+                android:layout_margin="@dimen/medium_margin"
                 android:adjustViewBounds="true"
                 android:background="@drawable/transparent"
                 android:contentDescription="@string/lang_english"
@@ -68,14 +65,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/lang_russian"
-                android:textSize="20sp" />
+                android:textSize="@dimen/language_text_size" />
 
             <ImageButton
                 android:id="@+id/image_flag_russia"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_margin="8dp"
+                android:layout_margin="@dimen/medium_margin"
                 android:adjustViewBounds="true"
                 android:background="@drawable/transparent"
                 android:contentDescription="@string/lang_russian"
@@ -97,14 +94,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/lang_chinese"
-                android:textSize="20sp" />
+                android:textSize="@dimen/language_text_size" />
 
             <ImageButton
                 android:id="@+id/image_flag_china"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_margin="8dp"
+                android:layout_margin="@dimen/medium_margin"
                 android:adjustViewBounds="true"
                 android:background="@drawable/transparent"
                 android:contentDescription="@string/lang_chinese"

android/res/layout/journal_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="horizontal"
     android:showDividers="middle" >
@@ -18,22 +17,29 @@
             android:id="@+id/titleTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_margin="@dimen/small_margin"
             android:text="TextView"
-            android:textSize="20sp"
+            android:textSize="@dimen/medium_text_size"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/dateTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="TextView" />
+            android:layout_marginBottom="@dimen/small_margin"
+            android:layout_marginLeft="@dimen/small_margin"
+            android:layout_marginRight="@dimen/small_margin"
+            android:text="TextView"
+            android:textSize="@dimen/xsmall_text_size" />
+
     </LinearLayout>
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="80dp"
+        android:layout_width="@dimen/list_element_image_view_size"
-        android:layout_height="80dp"
+        android:layout_height="@dimen/list_element_image_view_size"
         android:layout_gravity="right"
+        android:layout_margin="@dimen/small_margin"
         android:layout_weight="0"
         android:scaleType="centerInside" />
 

android/res/layout/journal_page_header.xml

@@ -4,18 +4,16 @@
     android:layout_height="match_parent"
     android:background="@color/bkg1"
     android:orientation="vertical"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
     <TextView
-        android:id="@+id/dateTextView"
+        android:id="@+id/headerTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/medium_margin"
-        android:text="@string/journal_open_map"
+        android:text="@string/category_is_loading"
-        android:textSize="24sp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
     
 

android/res/layout/main_page_header.xml

@@ -7,9 +7,9 @@
     <include layout="@layout/main_page_search"/>
 
     <View
-        android:id="@+id/view1"
+        android:id="@+id/dividerView"
         android:layout_width="match_parent"
-        android:layout_height="18dp"
+        android:layout_height="@dimen/large_divider_height"
         android:background="@color/bkg2" />
 
     <include layout="@layout/main_page_news"/>

android/res/layout/main_page_list_element.xml

@@ -2,58 +2,55 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/bkg1"
     android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingTop="4dp"
     android:showDividers="middle" >
 
+    <TextView
+        android:id="@+id/dateTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/medium_margin"
+        android:textSize="@dimen/xlarge_text_size"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/descriptionTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/medium_margin"
+        android:textSize="@dimen/small_text_size" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="top" >
+        android:layout_gravity="right"
-
+        android:gravity="right|center_vertical" >
-        <TextView
-            android:id="@+id/dateTextView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:paddingLeft="16dp"
-            android:textSize="32sp"
-            android:textStyle="bold" />
 
         <Button
             android:id="@+id/button"
             style="?android:attr/borderlessButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
+            android:layout_gravity="right"
-            android:layout_marginLeft="8dp"
+            android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_marginTop="8dp"
+            android:layout_marginLeft="@dimen/medium_margin"
+            android:layout_marginTop="@dimen/medium_margin"
             android:background="@drawable/transparent"
             android:gravity="right|center_vertical"
-            android:textSize="20sp" />
+            android:textSize="@dimen/medium_text_size" />
 
         <ImageButton
             android:id="@+id/imageButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:layout_gravity="right"
+            android:layout_margin="@dimen/medium_margin"
             android:background="@drawable/transparent"
             android:src="@drawable/see_more_small" />
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/descriptionTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="14dp"
-        android:text=""
-        android:textSize="18sp" />
-
     <it.sephiroth.android.library.widget.HListView
         android:id="@+id/hListView"
         android:layout_width="match_parent"

android/res/layout/main_page_news.xml

@@ -4,8 +4,6 @@
     android:layout_height="match_parent"
     android:background="@color/bkg1"
     android:orientation="vertical"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
     <TextView
@@ -13,31 +11,31 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/medium_margin"
         android:text="@string/news_header"
-        android:textSize="24sp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
 
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/progress_bar_size"
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/medium_margin"
-        android:layout_marginTop="8dp" >
+        android:layout_marginTop="@dimen/medium_margin" >
 
         <Button
             android:id="@+id/news1Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
+            android:layout_marginLeft="@dimen/medium_margin"
             android:background="@drawable/transparent_button"
             android:gravity="left|center_vertical"
             android:minHeight="0dp"
@@ -49,15 +47,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/medium_margin"
-        android:layout_marginTop="8dp" >
+        android:layout_marginTop="@dimen/medium_margin" >
 
         <Button
             android:id="@+id/news2Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
+            android:layout_marginLeft="@dimen/medium_margin"
             android:background="@drawable/transparent_button"
             android:gravity="left|center_vertical"
             android:minHeight="0dp"
@@ -69,15 +67,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="@dimen/medium_margin"
-        android:layout_marginTop="8dp" >
+        android:layout_marginTop="@dimen/medium_margin" >
 
         <Button
             android:id="@+id/news3Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
+            android:layout_marginLeft="@dimen/medium_margin"
             android:background="@drawable/transparent_button"
             android:gravity="left|center_vertical"
             android:minHeight="0dp"

android/res/layout/main_page_search.xml

@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:adjustViewBounds="true"
-        android:maxHeight="80dp"
+        android:maxHeight="@dimen/main_page_logo_size"
         android:src="@drawable/bashgid_logo_main" />
 
     <TextView
@@ -23,13 +23,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:text="@string/app_name"
-        android:textSize="20sp" />
+        android:textSize="@dimen/large_text_size" />
 
     <EditText
         android:id="@+id/searchEditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ems="10"
         android:hint="@string/enter_search_query" >
 
         <requestFocus />
@@ -42,7 +41,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:drawableLeft="@drawable/ic_action_search"
-        android:text="@string/search_title" />
+        android:text="@string/search_title"
+        android:textSize="@dimen/large_text_size" />
     
 </LinearLayout>
 

android/res/layout/news_page_list_element.xml

@@ -1,43 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/LinearLayout2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
+    android:background="@color/light_grey_1"
-    android:background="@color/bkg1"
     android:orientation="horizontal"
-    android:paddingBottom="4dp"
-    android:paddingTop="4dp"
     android:showDividers="middle" >
 
-    <ImageButton
-        android:id="@+id/imageButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="6dp"
-        android:background="@drawable/transparent"
-        android:src="@drawable/transparent_button"
-        android:contentDescription="@string/news_content_description" />
-
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
-        <Button
+        <TextView
-            android:id="@+id/button"
+            android:id="@+id/titleTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/transparent_button"
+            android:layout_margin="@dimen/small_margin"
-            android:gravity="left|center_vertical"
+            android:text="TextView"
-            android:minHeight="0dip"
+            android:textSize="@dimen/medium_text_size"
-            android:minWidth="0dip"
+            android:textStyle="bold" />
-            android:textColor="@color/text_grey" />
 
         <TextView
             android:id="@+id/dateTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/small_margin"
+            android:layout_marginLeft="@dimen/small_margin"
+            android:layout_marginRight="@dimen/small_margin"
+            android:text="TextView"
+            android:textSize="@dimen/xsmall_text_size" />
 
     </LinearLayout>
 

android/res/layout/news_page_list_footer.xml

@@ -4,8 +4,6 @@
     android:layout_height="match_parent"
     android:background="@color/bkg1"
     android:orientation="vertical"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
     <TextView
@@ -13,9 +11,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/medium_margin"
         android:text="@string/news_load_more"
-        android:textSize="24sp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
     
 </LinearLayout>

android/res/layout/news_page_list_header.xml

@@ -13,16 +13,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/medium_margin"
         android:text="@string/news_header"
-        android:textSize="24sp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
     
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
-        android:layout_width="100dp"
+        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/progress_bar_size"
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
     

android/res/layout/osm_dialog.xml

@@ -1,57 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/LinearLayout1"
+    android:id="@+id/scrollView1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >
 
-    <ScrollView
+
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
 
-            <ImageView
+            <fishrungames.bashgid.DynamicImageView
                 android:id="@+id/imageView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp" />
+                android:layout_gravity="center_horizontal"
+                android:layout_margin="@dimen/small_margin"
+                android:scaleType="centerCrop" />
 
             <TextView
                 android:id="@+id/addressTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_margin="@dimen/small_margin"
                 android:background="@color/bkg2"
                 android:text="TextView"
-                android:textSize="18sp" />
+                android:textSize="@dimen/medium_text_size" />
 
             <TextView
                 android:id="@+id/hintTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/hold_address" />
+                android:layout_margin="@dimen/small_margin"
+                android:text="@string/hold_address"
+                android:textSize="@dimen/small_text_size" />
 
             <Button
                 android:id="@+id/button"
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_margin="@dimen/small_margin"
                 android:background="@color/bkg2"
                 android:drawableLeft="@drawable/ic_action_call"
                 android:gravity="left|center_vertical"
                 android:text="Button"
-                android:textSize="30sp" />
+                android:textSize="@dimen/medium_text_size" />
         </LinearLayout>
 
     </ScrollView>
-
-</LinearLayout>

android/res/layout/photo_album_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="horizontal"
     android:showDividers="middle" >

android/res/layout/photo_album_list_element.xml

@@ -3,7 +3,6 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="4dp"
     android:background="@color/light_grey_1"
     android:orientation="vertical"
     android:showDividers="middle" >

android/res/layout/photo_page_element.xml

@@ -3,6 +3,7 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center_vertical"
     android:orientation="vertical" >
 
     <ScrollView
@@ -29,15 +30,20 @@
                 android:id="@+id/titleTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/large_margin"
                 android:text="TextView"
-                android:textSize="18sp"
+                android:textSize="@dimen/xlarge_text_size"
                 android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/descriptionTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="TextView" />
+                android:layout_marginLeft="@dimen/large_margin"
+                android:layout_marginRight="@dimen/large_margin"
+                android:text="TextView"
+                android:textSize="@dimen/medium_text_size" />
+
         </LinearLayout>
 
     </ScrollView>

android/res/layout/search_page_list_header.xml

@@ -4,8 +4,6 @@
     android:layout_height="match_parent"
     android:background="@color/bkg1"
     android:orientation="vertical"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
     tools:context="fishrungames.bashgid.SearchFragment" >
 
     <TextView
@@ -14,14 +12,13 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal"
-        android:textSize="18sp"
+        android:textSize="@dimen/medium_text_size"
         android:textStyle="bold" />
 
     <EditText
         android:id="@+id/editText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ems="10"
         android:hint="@string/enter_search_query"
         android:inputType="text" >
 

android/res/layout/simple_hview_list_element.xml

@@ -10,11 +10,11 @@
     <ImageButton
         android:id="@+id/imageButton"
         android:layout_width="wrap_content"
-        android:layout_height="180dp"
+        android:layout_height="@dimen/horizontal_list_element_image_height"
         android:layout_gravity="center_horizontal"
         android:adjustViewBounds="true"
-        android:maxHeight="180dp"
+        android:maxHeight="@dimen/horizontal_list_element_image_height"
-        android:padding="2dp"
+        android:padding="@dimen/horizontal_list_element_padding"
         android:scaleType="centerCrop" />
 
     <TextView
@@ -22,9 +22,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:padding="2dp"
+        android:padding="@dimen/horizontal_list_element_padding"
         android:text="TextView"
-        android:textSize="24sp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
 
     <TextView
@@ -33,6 +33,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:text="TextView"
-        android:textSize="18sp" />
+        android:textSize="@dimen/small_text_size" />
 
 </LinearLayout>

android/res/layout/spinner_dropdown_item.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="@dimen/medium_text_size"
+    android:ellipsize="marquee"/>

android/res/layout/video_page_list_element.xml

@@ -2,14 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
-    android:layout_height="150dp"
+    android:layout_height="@dimen/video_page_height"
     android:layout_gravity="center_vertical"
-    android:layout_margin="4dp"
     android:background="@color/bkg1"
     android:gravity="center_vertical"
     android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingTop="4dp"
     android:showDividers="middle" >
 
     <fishrungames.bashgid.DynamicImageView
@@ -26,8 +23,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:layout_margin="@dimen/medium_margin"
         android:text="dsdsd"
-        android:textSize="16sp"
+        android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
     
 </LinearLayout>

android/res/menu/global.xml

@@ -4,7 +4,7 @@
     <item android:id="@+id/action_search"
           android:title="@string/search_title"
           android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
-          android:showAsAction="always|withText"
+          app:showAsAction="always|withText"
           android:actionViewClass="android.widget.SearchView" />
 
 </menu>

android/res/values-large/dimens.xml

@@ -0,0 +1,73 @@
+<resources>
+    
+    <dimen name="large_divider_height">16dp</dimen>
+
+    <dimen name="progress_bar_size">100dp</dimen>
+    
+    <dimen name="small_divider_height">2dp</dimen>
+    <!--
+         Per the design guidelines, navigation drawers should be between 240dp and 320dp:
+         https://developer.android.com/design/patterns/navigation-drawer.html
+    -->
+    <dimen name="navigation_drawer_width">240dp</dimen>
+    
+    <dimen name="navigation_drawer_divider_height">1dp</dimen>
+    
+    <dimen name="navigation_drawer_padding_left">10dp</dimen>
+    <dimen name="navigation_drawer_padding_right">10dp</dimen>
+    
+    <dimen name="drawer_image_size">48dp</dimen>
+    <dimen name="drawer_margin">4dp</dimen>
+    <dimen name="drawer_margin_left">10dp</dimen>  
+    
+    <dimen name="large_margin">16dp</dimen>
+    
+    <dimen name="medium_margin">8dp</dimen>
+    
+    <dimen name="small_margin">4dp</dimen>
+    
+    
+    <dimen name="xxlarge_text_size">60dp</dimen>
+    <dimen name="xlarge_text_size">30dp</dimen>
+    
+    <dimen name="large_text_size">24dp</dimen>
+    
+    <dimen name="medium_text_size">20dp</dimen>
+    
+    <dimen name="small_text_size">18dp</dimen>
+    
+    <dimen name="xsmall_text_size">14dp</dimen>
+    
+    
+    <dimen name="language_text_size">30dp</dimen>
+    
+    <dimen name="article_content_text_size">24dp</dimen>
+    
+    
+    
+
+    <dimen name="grid_view_horizontal_spacing">12dp</dimen>
+    <dimen name="grid_view_vertical_spacing">12dp</dimen>
+    
+    <dimen name="logo_height">240dp</dimen>
+    
+    <dimen name="logo_margin_top">24dp</dimen>
+
+    
+    
+    <dimen name="list_element_image_view_size">80dp</dimen>
+
+    <dimen name="horizontal_list_element_image_height">180dp</dimen>
+    
+    <dimen name="horizontal_list_element_padding">2dp</dimen>
+    
+    
+    <dimen name="main_page_logo_size">80dp</dimen>
+ 
+      <dimen name="video_page_height">160dp</dimen>
+      <dimen name="article_mapview_height">160dp</dimen>
+    
+      
+      
+    
+</resources>

android/res/values-large/integers.xml

@@ -0,0 +1,5 @@
+
+
+<resources>
+    <integer name="grid_columns">3</integer>
+</resources>

android/res/values-normal/dimens.xml

@@ -0,0 +1,73 @@
+<resources>
+    
+    <dimen name="large_divider_height">16dp</dimen>
+
+    <dimen name="progress_bar_size">100dp</dimen>
+    
+    <dimen name="small_divider_height">2dp</dimen>
+    <!--
+         Per the design guidelines, navigation drawers should be between 240dp and 320dp:
+         https://developer.android.com/design/patterns/navigation-drawer.html
+    -->
+    <dimen name="navigation_drawer_width">240dp</dimen>
+    
+    <dimen name="navigation_drawer_divider_height">1dp</dimen>
+    
+    <dimen name="navigation_drawer_padding_left">10dp</dimen>
+    <dimen name="navigation_drawer_padding_right">10dp</dimen>
+    
+    <dimen name="drawer_image_size">32dp</dimen>
+    <dimen name="drawer_margin">4dp</dimen>
+    <dimen name="drawer_margin_left">10dp</dimen>  
+    
+    <dimen name="large_margin">16dp</dimen>
+    
+    <dimen name="medium_margin">8dp</dimen>
+    
+    <dimen name="small_margin">4dp</dimen>
+    
+    
+    <dimen name="xxlarge_text_size">30dp</dimen>
+    <dimen name="xlarge_text_size">24dp</dimen>
+    
+    <dimen name="large_text_size">24dp</dimen>
+    
+    <dimen name="medium_text_size">20dp</dimen>
+    
+    <dimen name="small_text_size">18dp</dimen>
+    
+    <dimen name="xsmall_text_size">14dp</dimen>
+    
+    <dimen name="language_text_size">20dp</dimen>
+    
+    <dimen name="article_content_text_size">14dp</dimen>
+    
+    
+    
+    
+
+    <dimen name="grid_view_horizontal_spacing">12dp</dimen>
+    <dimen name="grid_view_vertical_spacing">12dp</dimen>
+    
+    <dimen name="logo_height">240dp</dimen>
+    
+    <dimen name="logo_margin_top">24dp</dimen>
+
+    
+    
+    <dimen name="list_element_image_view_size">80dp</dimen>
+
+    <dimen name="horizontal_list_element_image_height">180dp</dimen>
+    
+    <dimen name="horizontal_list_element_padding">2dp</dimen>
+    
+    
+    <dimen name="main_page_logo_size">80dp</dimen>
+ 
+      <dimen name="video_page_height">160dp</dimen>
+      <dimen name="article_mapview_height">160dp</dimen>
+    
+      
+      
+    
+</resources>

android/res/values-normal/integers.xml

@@ -0,0 +1,5 @@
+
+
+<resources>
+    <integer name="grid_columns">2</integer>
+</resources>

android/res/values-ru/strings.xml

@@ -86,6 +86,10 @@
 
 <string name="hold_address">Чтобы скопировать адрес, нажмите и его удерживайте некоторое время.</string>
 
+<string name="category_is_loading">Категория загружается...</string>
+    
+<string name="category_is_loaded">Категория загружена</string>
+    
 
 	
 </resources>

android/res/values-small/dimens.xml

@@ -0,0 +1,70 @@
+<resources>
+    
+    <dimen name="large_divider_height">16dp</dimen>
+
+    <dimen name="progress_bar_size">100dp</dimen>
+    
+    <dimen name="small_divider_height">2dp</dimen>
+    <!--
+         Per the design guidelines, navigation drawers should be between 240dp and 320dp:
+         https://developer.android.com/design/patterns/navigation-drawer.html
+    -->
+    <dimen name="navigation_drawer_width">240dp</dimen>
+    
+    <dimen name="navigation_drawer_divider_height">1dp</dimen>
+    
+    <dimen name="navigation_drawer_padding_left">10dp</dimen>
+    <dimen name="navigation_drawer_padding_right">10dp</dimen>
+    
+    <dimen name="drawer_image_size">32dp</dimen>
+    <dimen name="drawer_margin">4dp</dimen>
+    <dimen name="drawer_margin_left">10dp</dimen>  
+    
+    <dimen name="large_margin">16dp</dimen>
+    
+    <dimen name="medium_margin">8dp</dimen>
+    
+    <dimen name="small_margin">4dp</dimen>
+    
+    
+    <dimen name="xxlarge_text_size">30dp</dimen>
+    <dimen name="xlarge_text_size">24dp</dimen>
+    
+    <dimen name="large_text_size">24dp</dimen>
+    
+    <dimen name="medium_text_size">20dp</dimen>
+    
+    <dimen name="small_text_size">18dp</dimen>
+    
+    <dimen name="xsmall_text_size">14dp</dimen>
+    
+    <dimen name="language_text_size">20dp</dimen>
+    
+    <dimen name="article_content_text_size">14dp</dimen>
+   
+
+    <dimen name="grid_view_horizontal_spacing">12dp</dimen>
+    <dimen name="grid_view_vertical_spacing">12dp</dimen>
+    
+    <dimen name="logo_height">240dp</dimen>
+    
+    <dimen name="logo_margin_top">24dp</dimen>
+
+    
+    
+    <dimen name="list_element_image_view_size">80dp</dimen>
+
+    <dimen name="horizontal_list_element_image_height">180dp</dimen>
+    
+    <dimen name="horizontal_list_element_padding">2dp</dimen>
+    
+    
+    <dimen name="main_page_logo_size">80dp</dimen>
+ 
+      <dimen name="video_page_height">160dp</dimen>
+      <dimen name="article_mapview_height">160dp</dimen>
+    
+      
+      
+    
+</resources>

android/res/values-small/integers.xml

@@ -0,0 +1,5 @@
+
+
+<resources>
+    <integer name="grid_columns">2</integer>
+</resources>

android/res/values-xlarge/dimens.xml

@@ -0,0 +1,73 @@
+<resources>
+    
+    <dimen name="large_divider_height">16dp</dimen>
+
+    <dimen name="progress_bar_size">100dp</dimen>
+    
+    <dimen name="small_divider_height">2dp</dimen>
+    <!--
+         Per the design guidelines, navigation drawers should be between 240dp and 320dp:
+         https://developer.android.com/design/patterns/navigation-drawer.html
+    -->
+    <dimen name="navigation_drawer_width">240dp</dimen>
+    
+    <dimen name="navigation_drawer_divider_height">1dp</dimen>
+    
+    <dimen name="navigation_drawer_padding_left">10dp</dimen>
+    <dimen name="navigation_drawer_padding_right">10dp</dimen>
+    
+    <dimen name="drawer_image_size">48dp</dimen>
+    <dimen name="drawer_margin">4dp</dimen>
+    <dimen name="drawer_margin_left">10dp</dimen>  
+    
+    <dimen name="large_margin">16dp</dimen>
+    
+    <dimen name="medium_margin">8dp</dimen>
+    
+    <dimen name="small_margin">4dp</dimen>
+    
+    
+    <dimen name="xxlarge_text_size">60dp</dimen>
+    <dimen name="xlarge_text_size">30dp</dimen>
+    
+    <dimen name="large_text_size">24dp</dimen>
+    
+    <dimen name="medium_text_size">20dp</dimen>
+    
+    <dimen name="small_text_size">18dp</dimen>
+    
+    <dimen name="xsmall_text_size">14dp</dimen>
+    
+    
+    <dimen name="language_text_size">30dp</dimen>
+    
+    <dimen name="article_content_text_size">24dp</dimen>
+    
+    
+    
+
+    <dimen name="grid_view_horizontal_spacing">12dp</dimen>
+    <dimen name="grid_view_vertical_spacing">12dp</dimen>
+    
+    <dimen name="logo_height">240dp</dimen>
+    
+    <dimen name="logo_margin_top">24dp</dimen>
+
+    
+    
+    <dimen name="list_element_image_view_size">80dp</dimen>
+
+    <dimen name="horizontal_list_element_image_height">180dp</dimen>
+    
+    <dimen name="horizontal_list_element_padding">2dp</dimen>
+    
+    
+    <dimen name="main_page_logo_size">80dp</dimen>
+ 
+      <dimen name="video_page_height">160dp</dimen>
+      <dimen name="article_mapview_height">160dp</dimen>
+    
+      
+      
+    
+</resources>

android/res/values-xlarge/integers.xml

@@ -0,0 +1,5 @@
+
+
+<resources>
+    <integer name="grid_columns">4</integer>
+</resources>

android/res/values-zh-rCN/strings.xml

@@ -80,5 +80,8 @@
 <string name="hold_address">Tap and hold address to copy it to clipboard.</string>
 
 
+<string name="category_is_loading">Category is loading...</string>
+    
+<string name="category_is_loaded">Category is loaded</string>
     
 </resources>

android/res/values/dimens.xml

@@ -1,13 +1,73 @@
 <resources>
     
-    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="large_divider_height">16dp</dimen>
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
 
+    <dimen name="progress_bar_size">100dp</dimen>
+    
+    <dimen name="small_divider_height">2dp</dimen>
     <!--
          Per the design guidelines, navigation drawers should be between 240dp and 320dp:
          https://developer.android.com/design/patterns/navigation-drawer.html
     -->
     <dimen name="navigation_drawer_width">240dp</dimen>
     
+    <dimen name="navigation_drawer_divider_height">1dp</dimen>
+    
+    <dimen name="navigation_drawer_padding_left">10dp</dimen>
+    <dimen name="navigation_drawer_padding_right">10dp</dimen>
+    
+    <dimen name="drawer_image_size">48dp</dimen>
+    <dimen name="drawer_margin">4dp</dimen>
+    <dimen name="drawer_margin_left">10dp</dimen>  
+    
+    <dimen name="large_margin">16dp</dimen>
+    
+    <dimen name="medium_margin">8dp</dimen>
+    
+    <dimen name="small_margin">4dp</dimen>
+    
+    
+    <dimen name="xxlarge_text_size">60dp</dimen>
+    <dimen name="xlarge_text_size">30dp</dimen>
+    
+    <dimen name="large_text_size">24dp</dimen>
+    
+    <dimen name="medium_text_size">20dp</dimen>
+    
+    <dimen name="small_text_size">18dp</dimen>
+    
+    <dimen name="xsmall_text_size">14dp</dimen>
+    
+    
+    <dimen name="language_text_size">30dp</dimen>
+    
+    <dimen name="article_content_text_size">24dp</dimen>
+    
+    
+    
+
+    <dimen name="grid_view_horizontal_spacing">12dp</dimen>
+    <dimen name="grid_view_vertical_spacing">12dp</dimen>
+    
+    <dimen name="logo_height">240dp</dimen>
+    
+    <dimen name="logo_margin_top">24dp</dimen>
+
+    
+    
+    <dimen name="list_element_image_view_size">80dp</dimen>
+
+    <dimen name="horizontal_list_element_image_height">180dp</dimen>
+    
+    <dimen name="horizontal_list_element_padding">2dp</dimen>
+    
+    
+    <dimen name="main_page_logo_size">80dp</dimen>
+ 
+      <dimen name="video_page_height">160dp</dimen>
+      <dimen name="article_mapview_height">160dp</dimen>
+    
+      
+      
+    
 </resources>

android/res/values/integers.xml

@@ -2,4 +2,5 @@
 
 <resources>
     <integer name="flag_in_time">500</integer>
+    <integer name="grid_columns">4</integer>
 </resources>

android/res/values/strings.xml

@@ -87,6 +87,10 @@
 
 <string name="hold_address">Tap and hold address to copy it to clipboard.</string>
 
+<string name="category_is_loading">Category is loading...</string>
+
+<string name="category_is_loaded">Category is loaded</string>
+    
 
     
 </resources>

android/src/fishrungames/bashgid/ArticleFragment.java

@@ -342,11 +342,11 @@ public class ArticleFragment extends Fragment
 	        	
 	        	if (article.type == ArticleManager.ARTICLE_TYPE_NEWS)
 	        	{
-	        		textView.setTextSize(32);
+	        		textView.setTextSize(getResources().getDimension(R.dimen.xlarge_text_size));
 	        	}
 	        	else
 	        	{
-	        		textView.setTextSize(64);
+	        		textView.setTextSize(getResources().getDimension(R.dimen.xxlarge_text_size));
 	        	}
 	        	
 	        	textView.setTypeface(null, Typeface.BOLD);
@@ -359,7 +359,7 @@ public class ArticleFragment extends Fragment
 	        	
 	        	textView.setText(articleLayout.get(position).value);
 	        	
-	        	textView.setTextSize(24);
+	        	textView.setTextSize(getResources().getDimension(R.dimen.article_content_text_size));
 	        	textView.setTypeface(null, Typeface.NORMAL);
 	        	textView.setGravity(Gravity.LEFT);
 		        

android/src/fishrungames/bashgid/CatalogFragment.java

@@ -147,8 +147,17 @@ public class CatalogFragment extends Fragment
 	        hListView.setAdapter(new MainPageHListViewAdapters.JournalElementAdapter(getActivity(), journalList.get(position)));
 
 	        textView.setText(journalList.get(position).title);
+	        
+	        if (journalList.get(position).description.length() > 0)
+	        {
 	        	descriptionTextView.setText(journalList.get(position).description);
 		        
+	        	descriptionTextView.setVisibility(View.VISIBLE);
+	        }
+	        else
+	        {
+	        	descriptionTextView.setVisibility(View.GONE);
+	        }
 	        
 	        
 	        button.setText(R.string.see_all);

android/src/fishrungames/bashgid/JournalFragment.java

@@ -32,6 +32,7 @@ public class JournalFragment extends Fragment
 	
 	ListAdapter listAdapter;
 	ProgressBar progressBar;
+	TextView headerTextView;
 	
 	DatabaseGetJournalTask databaseGetJournalTask = null;
 	
@@ -77,10 +78,15 @@ public class JournalFragment extends Fragment
 		
 		ListView listView = (ListView) rootView.findViewById(R.id.listView);
 		
+
 		View header = inflater.inflate(R.layout.journal_page_header, null);
 		
+		
+		headerTextView = (TextView)header.findViewById(R.id.headerTextView);
+		
 		listView.addHeaderView(header);
 		
+		
 		listAdapter = new ListAdapter(getActivity());
 		
 		
@@ -91,23 +97,24 @@ public class JournalFragment extends Fragment
 			@Override
 			public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 			{
+				/*
+				if (journal.geoCategory == 1)
+				{
+					position = position - 1; // because there is header for geo objects
+				}*/
+				
+				
 				if (position == 0)
+				{
+					if (journal.geoCategory == 1)
 					{
 					MainActivity.getInstance().OpenMapScreen(journalName);
 					}
-				else
-				{
-				
-					/*if (journalName.equals("news"))
-				{
-					MainActivity.getInstance().OpenNewsRecordScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
 				}
 				else
 				{
-					MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
-				}*/
-					MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
 				
+					MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_TO_MAINFRAGMENT);
 				}
 			}
 		});
@@ -159,6 +166,16 @@ public class JournalFragment extends Fragment
 
 		this.journal = journal;
 		
+		if (journal.geoCategory == 1)
+		{
+			headerTextView.setText(R.string.journal_open_map);
+			
+		}
+		else
+		{
+			headerTextView.setText(R.string.category_is_loaded);
+		}
+		
 		listAdapter.notifyDataSetChanged();
 		
 	}

android/src/fishrungames/bashgid/MainActivity.java

@@ -1,32 +1,21 @@
 package fishrungames.bashgid;
 
-import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Date;
+
 import java.util.Locale;
 
-import fishrungames.bashgid.core.AlbumManager;
-
-import fishrungames.bashgid.core.AlbumManager.AlbumRecordData;
-import fishrungames.bashgid.core.AlbumManager.AlbumShortData;
-import fishrungames.bashgid.core.ArticleManager;
-
-import fishrungames.bashgid.core.ArticleManager.ArticleRecordData;
-import fishrungames.bashgid.core.BookManager.BookRecord;
 
 import fishrungames.bashgid.core.AlbumManager.AlbumFullData;
+import fishrungames.bashgid.core.AlbumManager.AlbumShortData;
 import fishrungames.bashgid.core.ArticleManager.ArticleFullData;
 import fishrungames.bashgid.core.ArticleManager.ArticleShortData;
 import fishrungames.bashgid.core.ChannelManager.ChannelFullData;
 import fishrungames.bashgid.core.DatabaseDownloadTask;
-import fishrungames.bashgid.core.HtmlDownloadManager.TextFileRecord;
+
 import fishrungames.bashgid.core.JournalManager.JournalRecordData;
 import fishrungames.bashgid.core.JournalManager.JournalSemiFullData;
 import fishrungames.bashgid.core.NewsDownloadTask;
-import fishrungames.bashgid.core.TranslationManager.TranslationRecordData;
 
-import fishrungames.bashgid.core.PhotoManager.PhotoRecordData;
-import fishrungames.bashgid.core.VideoManager;
 import fishrungames.bashgid.core.VideoManager.VideoRecordData;
 import fishrungames.bashgid.core.db.AlbumDataSource;
 import fishrungames.bashgid.core.db.ArticleDataSource;
@@ -44,6 +33,7 @@ import fishrungames.networkutils.ImageManager;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v4.app.Fragment;
 
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
@@ -52,9 +42,16 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
+//import android.support.v4.view.MenuCompat;
+//import android.support.v4.view.MenuItemCompat;
+
+
+
+
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
@@ -64,9 +61,7 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 {
 
 	public static final String TAG_FROM_MAINFRAGMENT_TO_NEWSRECORDFRAGMENT = "TAG_FROM_MAINFRAGMENT_TO_NEWSRECORDFRAGMENT";
-	public static final String TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT = "TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT";
 	public static final String TAG_FROM_SEARCHFRAGMENT_TO_NEWSRECORDFRAGMENT = "TAG_FROM_SEARCHFRAGMENT_TO_NEWSRECORDFRAGMENT";
-	public static final String TAG_FROM_BOOKSFRAGMENT_TO_BOOKRECORDFRAGMENT = "TAG_FROM_BOOKSFRAGMENT_TO_BOOKRECORDFRAGMENT";
 	public static final String TAG_FROM_VIDEOLISTFRAGMENT_TO_VIDEORECORDFRAGMENT = "TAG_FROM_VIDEOLISTFRAGMENT_TO_VIDEORECORDFRAGMENT";
 
 	public static final String TAG_FROM_PHOTOLISTFRAGMENT_TO_PHOTOFRAGMENT = "TAG_FROM_PHOTOLISTFRAGMENT_TO_PHOTOFRAGMENT";
@@ -76,15 +71,11 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 	public static final String TAG_FROM_CATALOGFRAGMENT_TO_ARTICLEFRAGMENT = "TAG_FROM_CATALOGFRAGMENT_TO_ARTICLEFRAGMENT";
 	public static final String TAG_FROM_CATALOGFRAGMENT_TO_JOURNALFRAGMENT = "TAG_FROM_CATALOGFRAGMENT_TO_JOURNALFRAGMENT";
 
-	
-	
-	
 	public static final String TAG_TO_WELCOMEFRAGMENT = "WelcomeFragment";
 	public static final String TAG_TO_SEARCHFRAGMENT = "SearchFragment";
 	public static final String TAG_TO_MAINFRAGMENT = "MainFragment";
 	public static final String TAG_TO_MAPFRAGMENT = "MapFragment";
 	
-	
 	public static final String PREFS_MAIN = "PREFS_MAIN";
 
 	public static final int NEWS_DOWNLOADER_STATE_UPDATE = 10;
@@ -126,7 +117,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 
 	MainPageFragment mainPageFragment = null;
 	NewsListFragment newsListFragment = null;
-	NewsRecordFragment newsRecordFragment = null;
 
 	AlbumListFragment albumListFragment = null;
 	PhotoAlbumFragment photoAlbumFragment = null;
@@ -416,7 +406,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 	{
 		mainPageFragment = null;
 		newsListFragment = null;
-		newsRecordFragment = null;
 		
 		albumListFragment = null;
 		photoAlbumFragment = null;
@@ -509,11 +498,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 			articleFragment.SetArticle(article);
 		}
 		
-		if (newsRecordFragment != null)
-		{
-			newsRecordFragment.SetArticle(article);
-		}
-		
 		if (mapHolderFragment != null)
 		{
 			mapHolderFragment.SetArticle(article);
@@ -620,12 +604,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 			return;
 		}
 		
-		if (newsListFragment != null || newsRecordFragment != null)
-		{
-			OpenSearchScreen("news", "News");
-			return;
-		}
-		
 		if (journalFragment != null)
 		{
 			if (journalFragment.journal == null)
@@ -639,6 +617,13 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 			return;
 		}
 		
+		if (newsListFragment != null)
+		{
+			String newsTitle = getResources().getString(R.string.news_header);
+			OpenSearchScreen("news", newsTitle);
+			return;
+		}
+		
 		OpenSearchScreen();
 	}
 	
@@ -782,29 +767,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 		mNavigationDrawerFragment.EnableDrawer();
 	}
 
-	/*
-	public void OpenSearchScreen()
-	{
-		ClearAllFragmentLinks();
-		
-		SearchFragment
-
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SearchFragment(), TAG_TO_SEARCHFRAGMENT)
-				.commit();
-
-		mNavigationDrawerFragment.EnableDrawer();
-
-	}*/
-
-	public void OpenLinkContentScreen(TextFileRecord contentRecord)
-	{
-		ClearAllFragmentLinks();
-
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new LinkContentFragment(contentRecord), TAG_TO_MAINFRAGMENT).commit();
-
-		mNavigationDrawerFragment.EnableDrawer();
-	}
-
 	public void OpenMapScreen(String filter)
 	{
 		ClearAllFragmentLinks();
@@ -836,14 +798,7 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 		mNavigationDrawerFragment.EnableDrawer();
 	}
 
-	public void OpenStreetViewScreen(double lat, double lon)
-	{
-		ClearAllFragmentLinks();
 
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StreetViewHolderFragment(lat, lon), TAG_TO_MAPFRAGMENT).commit();
-
-		mNavigationDrawerFragment.EnableDrawer();
-	}
 
 	public void OpenPhotoAlbumListScreen()
 	{
@@ -890,24 +845,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 		mNavigationDrawerFragment.EnableDrawer();
 	}
 
-	public void OpenNewsRecordScreen(String articleName, String tag)
-	{
-		// Xperimental -- addToBackStack provoke error "Class not found". Need
-		// to resolve somehow!
-		// getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
-		// new NewsRecordFragment(newsRecord)).addToBackStack(null).commit();
-
-		// I added workaround:
-
-		ClearAllFragmentLinks();
-
-		newsRecordFragment = new NewsRecordFragment(articleName);
-
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, newsRecordFragment, tag).commit();
-
-		mNavigationDrawerFragment.EnableDrawer();
-
-	}
 	public void OpenArticleScreen(String articleName, String tag)
 	{
 		
@@ -921,43 +858,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 	}
 	
 
-	public void OpenHtmlViewerScreen(String url)
-	{
-		ClearAllFragmentLinks();
-
-		HtmlViewerFragment htmlViewerFragment = new HtmlViewerFragment();
-		htmlViewerFragment.url = url;
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, htmlViewerFragment, TAG_TO_MAINFRAGMENT).commit();
-
-		mNavigationDrawerFragment.EnableDrawer();
-	}
-
-	public void OpenBooksScreen()
-	{
-		ClearAllFragmentLinks();
-
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new BooksFragment(), TAG_TO_MAINFRAGMENT).commit();
-
-		mNavigationDrawerFragment.EnableDrawer();
-
-	}
-
-	public void OpenBookRecordScreen(BookRecord bookRecord, String tag)
-	{
-		// Xperimental -- addToBackStack provoke error "Class not found". Need
-		// to resolve somehow!
-		// getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
-		// new NewsRecordFragment(newsRecord)).addToBackStack(null).commit();
-
-		// I added workaround:
-		ClearAllFragmentLinks();
-
-		BookRecordFragment bookRecordFragment = new BookRecordFragment(bookRecord);
-
-		getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, bookRecordFragment, tag).commit();
-
-		mNavigationDrawerFragment.EnableDrawer();
-	}
 
 	public void OpenVideoListScreen(String channelName)
 	{
@@ -1040,10 +940,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 			return true;
 		}
 
-		if (id == R.id.action_settings)
-		{
-			return true;
-		}
 		return super.onOptionsItemSelected(item);
 	}
 
@@ -1071,16 +967,17 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 		{
 			OpenPhotoAlbumListScreen();			
 		}
+		/*
 		else if (position == 7)
 		{
 			//OpenBooksScreen();
 			OpenJournalScreen("books", MainActivity.TAG_TO_MAINFRAGMENT);
-		}
+		}*/
-		else if (position == 8)
+		else if (position == 7)
 		{
 			OpenJournalScreen("investor", MainActivity.TAG_TO_MAINFRAGMENT);
 		}
-		else if (position == 9)
+		else if (position == 8)
 		{
 			OpenSettingsScreen();
 		}
@@ -1097,20 +994,6 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
 			return;
 		}
 
-		if (getSupportFragmentManager().findFragmentByTag(TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT) != null)
-		{
-			OpenNewsScreen();
-
-			return;
-		}
-
-		if (getSupportFragmentManager().findFragmentByTag(TAG_FROM_BOOKSFRAGMENT_TO_BOOKRECORDFRAGMENT) != null)
-		{
-			OpenBooksScreen();
-
-			return;
-		}
-
 		if (getSupportFragmentManager().findFragmentByTag(TAG_FROM_VIDEOLISTFRAGMENT_TO_VIDEORECORDFRAGMENT) != null)
 		{
 			OpenVideoListScreen("main");

android/src/fishrungames/bashgid/MainPageFragment.java

@@ -301,15 +301,24 @@ public class MainPageFragment extends Fragment {
 	        
 	        ImageButton imageButton = (ImageButton) view.findViewById(R.id.imageButton);
 	        
-	        
 	        HListView hListView = (HListView) view.findViewById(R.id.hListView);
 	        
 	        hListView.setAdapter(new MainPageHListViewAdapters.JournalElementAdapter(getActivity(), journalList.get(position)));
 
 	        textView.setText(journalList.get(position).title);
 	        
+	        if (journalList.get(position).description.length() > 0)
+	        {
 	        	descriptionTextView.setText(journalList.get(position).description);
 		        
+	        	descriptionTextView.setVisibility(View.VISIBLE);
+	        }
+	        else
+	        {
+	        	descriptionTextView.setVisibility(View.GONE);
+	        }
+	        
+	        
 	        
 	        button.setText(R.string.see_all);
 

android/src/fishrungames/bashgid/MainPageHListViewAdapters.java

@@ -156,6 +156,7 @@ public static class JournalElementAdapter extends BaseAdapter {
 
 	}
 	
+/*
 	public static class SimpleElementAdapter extends BaseAdapter {
 				
 	    private Context mContext;
@@ -211,8 +212,9 @@ public static class JournalElementAdapter extends BaseAdapter {
 	        return view;
 	    }
 
-	}
+	}*/
 	
+/*
 	
 public static class DarkenElementAdapter extends BaseAdapter {
 		
@@ -272,27 +274,9 @@ public static class DarkenElementAdapter extends BaseAdapter {
 	        return view;
 	    }
 
-	}
+	}*/
 	
 	
-public static class ContentButtonOnClickListener implements OnClickListener
-{
-	
-	TextFileRecord contentRecord;
-	
-	public ContentButtonOnClickListener(TextFileRecord contentRecord)
-	{
-		this.contentRecord = contentRecord;
-	}
-
-	@Override
-	public void onClick(View v)
-	{
-		//MainActivity.getInstance().OpenHtmlViewerScreen(url);
-		MainActivity.getInstance().OpenLinkContentScreen(contentRecord);
-	}
-	
-}
 	
 
 }

android/src/fishrungames/bashgid/NavigationDrawerFragment.java

@@ -2,13 +2,13 @@ package fishrungames.bashgid;
 
 
 import android.support.v7.app.ActionBarActivity;
-import android.app.Activity;
 
 import android.support.v7.app.ActionBar;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
@@ -27,7 +27,6 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 /**
  * Fragment used for managing interactions for and presentation of a navigation drawer.
@@ -277,11 +276,6 @@ public class NavigationDrawerFragment extends Fragment {
             return true;
         }
 
-        if (item.getItemId() == R.id.action_settings) {
-            Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show();
-            return true;
-        }
-
         return super.onOptionsItemSelected(item);
     }
 
@@ -324,7 +318,7 @@ public class NavigationDrawerFragment extends Fragment {
 	    		R.string.drawer_map,
 	    		R.string.drawer_video,
 	    		R.string.drawer_photo_gallery,
-	    		R.string.drawer_books,
+	    		//R.string.drawer_books,
 	    		R.string.drawer_for_investor,
 	    		R.string.drawer_settings
 	    		};
@@ -337,7 +331,7 @@ public class NavigationDrawerFragment extends Fragment {
 	    		R.drawable.drawer_pushpin,
 	    		R.drawable.drawer_tv,
 	    		R.drawable.drawer_photography,
-	    		R.drawable.drawer_books,
+	    		//R.drawable.drawer_books,
 	    		R.drawable.drawer_id,
 	    		R.drawable.drawer_gear
 	    		}; 

android/src/fishrungames/bashgid/NewsListFragment.java

@@ -90,9 +90,7 @@ public class NewsListFragment extends Fragment
 				}
 				else if (position > 0)
 				{
-					MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
+					MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_TO_MAINFRAGMENT);
-					
-					//MainActivity.getInstance().OpenNewsRecordScreen(journal.articleArr.get(position - 1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
 				}
 				
 			}
@@ -215,7 +213,7 @@ public class NewsListFragment 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.news_list_element, null);
+	        	view = inflater.inflate(R.layout.news_page_list_element, null);
 	        	
 	   
 	        } else {

android/src/fishrungames/bashgid/OsmMapHolderFragment.java

@@ -300,6 +300,8 @@ public class OsmMapHolderFragment extends Fragment
 	int filterType;
 
 	Spinner spinner;
+	MapView mapView;
+	TextView titleTextView;
 
 	public OsmMapHolderFragment()
 	{
@@ -345,8 +347,7 @@ public class OsmMapHolderFragment extends Fragment
 		outState.putInt("filterType", filterType);
 	}
 
-	MapView mapView;
+	
-	TextView textView;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
@@ -360,9 +361,7 @@ public class OsmMapHolderFragment extends Fragment
 
 		View rootView = inflater.inflate(R.layout.fragment_osm_map_page, container, false);
 
-		textView = (TextView) rootView.findViewById(R.id.addressTextView);
+		titleTextView = (TextView) rootView.findViewById(R.id.titleTextView);
-
-		
 
 		mapView = (MapView) rootView.findViewById(R.id.mapview);
 
@@ -403,7 +402,7 @@ public class OsmMapHolderFragment extends Fragment
 
 						filterType = 0;
 						filter = availableGeoJournals.get(position).name;
-						textView.setText(R.string.map_is_loading);
+						titleTextView.setText(R.string.map_is_loading);
 						RestoreJournalOrArticle();
 					}
 				}
@@ -421,13 +420,13 @@ public class OsmMapHolderFragment extends Fragment
 		
 		if ((filterType == 0 && journal == null) || (filterType == 1 && article == null))
 		{
-			textView.setText(R.string.map_is_loading);
+			titleTextView.setText(R.string.map_is_loading);
 
 			RestoreJournalOrArticle();
 
 		} else
 		{
-			textView.setText(R.string.map_is_loaded);
+			titleTextView.setText(R.string.map_is_loaded);
 			RestoreGeoJournals();
 		}
 		
@@ -495,7 +494,7 @@ public class OsmMapHolderFragment extends Fragment
 	{
 		filterType = 0;
 
-		textView.setText(R.string.map_is_loaded);
+		titleTextView.setText(R.string.map_is_loaded);
 
 		this.journal = journal;
 
@@ -509,7 +508,7 @@ public class OsmMapHolderFragment extends Fragment
 	{
 		filterType = 1;
 
-		textView.setText(R.string.map_is_loaded);
+		titleTextView.setText(R.string.map_is_loaded);
 
 		this.article = article;
 

android/src/fishrungames/bashgid/SearchFragment.java

@@ -26,12 +26,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.AdapterView.OnItemClickListener;
 
 public class SearchFragment extends Fragment
 {
@@ -141,6 +144,15 @@ public class SearchFragment extends Fragment
 		
 		listView.setAdapter(listAdapter);
 		
+		listView.setOnItemClickListener(new OnItemClickListener(){
+
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+			{
+				MainActivity.getInstance().OpenArticleScreen(searchResultArr.get(position-1).name, MainActivity.TAG_TO_MAINFRAGMENT);
+			}
+		});
+				
 		CallUpdateNews();
 		
 		return rootView;
@@ -185,6 +197,7 @@ public class SearchFragment extends Fragment
 	    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);
@@ -212,6 +225,36 @@ public class SearchFragment extends Fragment
 	        
 	        imageButton.setOnClickListener(new ButtonOnClickListener(searchResultArr.get(position).name, searchResultArr.get(position).type));
 	        
+	        return view;*/
+	    	
+	    	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.journal_element, null);
+	        	
+	   
+	        } else {
+	        	view = convertView;
+	        }
+	   
+	        TextView titleTextView = (TextView)view.findViewById(R.id.titleTextView);
+	    
+	        titleTextView.setText(searchResultArr.get(position).title);
+	        
+	        TextView dateTextView = (TextView)view.findViewById(R.id.dateTextView);
+		    
+	        dateTextView.setText(NewsDataSource.iso8601Format.format(searchResultArr.get(position).dateTime));
+	        	
+	        ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
+	        
+	        if (searchResultArr.get(position).previewImageUrl != null)
+	        {
+	        	ImageManager.getInstance().ApplyImageToImageView(imageView, searchResultArr.get(position).previewImageUrl);
+	        }
+	        else
+	        {
+	        	imageView.setImageResource(R.drawable.transparent);
+	        }
 	        return view;
 	    }
 
@@ -252,6 +295,7 @@ public class SearchFragment extends Fragment
 	}
 		
 
+	/*
 	public static class ButtonOnClickListener implements OnClickListener
 	{
 		
@@ -269,18 +313,14 @@ public class SearchFragment extends Fragment
 		@Override
 		public void onClick(View v)
 		{
-			if (articleType == ArticleManager.ARTICLE_TYPE_NEWS)
+
-			{
-				MainActivity.getInstance().OpenNewsRecordScreen(articleName, MainActivity.TAG_TO_MAINFRAGMENT);
-			}
-			else
-			{
 			MainActivity.getInstance().OpenArticleScreen(articleName, MainActivity.TAG_TO_MAINFRAGMENT);
-			}
+			
+			
 	
 		}
 		
-	}
+	}*/
 	
 	
 }

android/src/fishrungames/bashgid/core/AlbumManager.java

@@ -77,7 +77,7 @@ public class AlbumManager
 	
 	public static AlbumFullData CreateEmptyAlbum()
 	{
-		AlbumFullData result = new AlbumFullData(new AlbumRecordData("", "", "", 0));
+		AlbumFullData result = new AlbumFullData(new AlbumRecordData("", "", "", 1));
 		
 		return result;
 	}
@@ -94,7 +94,7 @@ public class AlbumManager
 	{
 		if (!MainActivity.getInstance().albumDataSource.IsAlbumAlreadyExist(albumName))
 		{
-			MainActivity.getInstance().albumDataSource.CreateNewAlbum(new AlbumRecordData(albumName, albumName, "", 0));
+			MainActivity.getInstance().albumDataSource.CreateNewAlbum(new AlbumRecordData(albumName, albumName, "", 1));
 		}
 		
 		MainActivity.getInstance().albumDataSource.AddPhotoToAlbum(imageUrl, albumName);
@@ -121,7 +121,7 @@ public class AlbumManager
 	{
 		if (!MainActivity.getInstance().channelDataSource.IsChannelAlreadyExist(channelName))
 		{
-			MainActivity.getInstance().channelDataSource.CreateNewChannel(new ChannelRecordData(channelName, channelName, "", 0));
+			MainActivity.getInstance().channelDataSource.CreateNewChannel(new ChannelRecordData(channelName, channelName, "", 1));
 		}
 		
 		MainActivity.getInstance().channelDataSource.AddVideoToChannel(videoUrl, channelName);
@@ -146,7 +146,7 @@ public class AlbumManager
 	{
 		if (!MainActivity.getInstance().journalDataSource.IsJournalAlreadyExist(journalName))
 		{
-			MainActivity.getInstance().journalDataSource.CreateNewJournal(new JournalRecordData(journalName, journalName, "", 0, 0, 0));
+			MainActivity.getInstance().journalDataSource.CreateNewJournal(new JournalRecordData(journalName, journalName, "", 1, 0, 0));
 		}
 		
 		MainActivity.getInstance().journalDataSource.AddArticleToJournal(articleName, journalName);