Wow almost ready

android/res/layout/article_button_element.xml

@@ -10,8 +10,13 @@
 
     <Button
         android:id="@+id/button"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Перейти на сайт..." />
+        android:layout_margin="8dp"
+        android:background="@color/bkg2"
+        android:drawableLeft="@drawable/ic_action_web_site"
+        android:text="@string/go_to_website"
+        android:textSize="30sp" />
 
 </LinearLayout>

android/res/layout/article_geotag_element.xml

@@ -8,6 +8,25 @@
     android:orientation="vertical"
     android:showDividers="middle" >
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:text="@string/address_form"
+        android:textSize="24sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/addressTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:background="@color/bkg2"
+        android:textSize="24sp" />
+
     <org.osmdroid.views.MapView
         android:id="@+id/mapview"
         android:layout_width="match_parent"

android/res/layout/article_phone_element.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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" >
+
+    <Button
+        android:id="@+id/button"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:background="@color/bkg2"
+        android:drawableLeft="@drawable/ic_action_call"
+        android:gravity="left|center_vertical"
+        android:textSize="30sp" />
+
+</LinearLayout>

android/res/layout/fragment_osm_map_page.xml

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

android/res/layout/fragment_welcome.xml

@@ -13,7 +13,7 @@
     <ImageView
         android:id="@+id/logo_view"
         android:layout_width="match_parent"
-        android:layout_height="350dp"
+        android:layout_height="250dp"
         android:layout_marginTop="22dp"
         android:contentDescription="@string/RB_Coat"
         android:scaleType="fitCenter"
@@ -22,7 +22,9 @@
     <LinearLayout
         android:id="@+id/flag_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:gravity="bottom" >
 
         <ImageButton
             android:id="@+id/image_flag_usa"

android/res/layout/main_page_list_element.xml

@@ -16,23 +16,33 @@
 
         <TextView
             android:id="@+id/dateTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:paddingLeft="16dp"
-            android:textSize="16sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
 
         <Button
             android:id="@+id/button"
-            android:layout_width="152dp"
-            android:layout_height="24dp"
-            android:layout_margin="8dp"
-            android:background="@drawable/see_more_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/transparent"
             android:gravity="right|center_vertical"
-            android:paddingRight="28dp"
-            android:textSize="16sp" />
+            android:textSize="20sp" />
+
+        <ImageButton
+            android:id="@+id/imageButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:background="@drawable/transparent"
+            android:src="@drawable/see_more_small" />
 
     </LinearLayout>
 
@@ -40,7 +50,9 @@
         android:id="@+id/descriptionTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="TextView" />
+        android:layout_margin="14dp"
+        android:text=""
+        android:textSize="18sp" />
 
     <it.sephiroth.android.library.widget.HListView
         android:id="@+id/hListView"

android/res/layout/main_page_news.xml

@@ -121,9 +121,11 @@
 
     <Button
         android:id="@+id/moreNewsButton"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:background="@drawable/transparent"
         android:text="@string/other_news" />
     
 </LinearLayout>

android/res/layout/main_page_search.xml

@@ -26,7 +26,7 @@
         android:textSize="20sp" />
 
     <EditText
-        android:id="@+id/editText"
+        android:id="@+id/searchEditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
@@ -37,9 +37,11 @@
 
     <Button
         android:id="@+id/searchButton"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:drawableLeft="@drawable/ic_action_search"
         android:text="@string/search_title" />
     
 </LinearLayout>

android/res/layout/osm_dialog.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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" >
+
+    <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
+                android:id="@+id/imageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp" />
+
+            <TextView
+                android:id="@+id/addressTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:background="@color/bkg2"
+                android:text="TextView"
+                android:textSize="18sp" />
+
+            <Button
+                android:id="@+id/button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:background="@color/bkg2"
+                android:drawableLeft="@drawable/ic_action_call"
+                android:gravity="left|center_vertical"
+                android:text="Button"
+                android:textSize="30sp" />
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>

android/res/layout/search_page_list_header.xml

@@ -9,7 +9,7 @@
     tools:context="fishrungames.bashgid.SearchFragment" >
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/addressTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -27,5 +27,10 @@
 
         <requestFocus />
     </EditText>
+
+    <TextView
+        android:id="@+id/hintTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
     
 </LinearLayout>

android/res/layout/simple_hview_list_element.xml

@@ -24,7 +24,7 @@
         android:layout_gravity="center_horizontal"
         android:padding="2dp"
         android:text="TextView"
-        android:textSize="16sp"
+        android:textSize="24sp"
         android:textStyle="bold" />
 
     <TextView
@@ -32,6 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="TextView" />
+        android:text="TextView"
+        android:textSize="18sp" />
 
 </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"
-          app:showAsAction="always"
+          android:showAsAction="always|withText"
           android:actionViewClass="android.widget.SearchView" />
 
 </menu>

android/res/values-ru/strings.xml

@@ -63,5 +63,16 @@
     <string name="dialog_open">Открыть</string>
     <string name="dialog_cancel">Отмена</string>
     
-    
+    <string name="search_everywhere">Искать везде</string>
+	<string name="search_in">Искать в: %%</string>
+
+<string name="address_form">Адрес:</string>
+<string name="copied_text">Скопированный текст</string>
+<string name="text_is_copied">Адрес скопирован в буфер обмена.</string>
+
+<string name="search_result_count">Найдено результатов поиска: %%</string>
+<string name="search_is_performing">Идет поиск, пожалуйста, подождите...</string>
+<string name="search_at_least_3_symbols">Чтобы начать поиск, введите как минимум 3 символа</string>
+
+	
 </resources>

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

@@ -20,7 +20,7 @@
     
     
     <string name="news_header">头条新闻</string>
-    <string name="news_load_more">Load more</string>
+    <string name="news_load_more">加载更多</string>
     
     <string name="news_content_description">新闻内容描述</string>
     
@@ -47,13 +47,25 @@
     <string name="price">Price: </string>
     <string name="rub">RUB</string>
     
-    <string name="journal_open_map">Show on map</string>
-    <string name="map_is_loading">Map is loading...</string>
-    <string name="map_is_loaded">Map is loaded</string>
-    <string name="news_are_loading">News are loading...</string>
     
-    <string name="dialog_open">Open</string>
-    <string name="dialog_cancel">Cancel</string>
+    <string name="journal_open_map">在地图上显示</string>
+    <string name="map_is_loading">地图正在加载...</string>
+    <string name="map_is_loaded">地图加载完毕</string>
+    <string name="news_are_loading">新闻正在加载</string>
     
+    <string name="dialog_open">打开</string>
+    <string name="dialog_cancel">取消</string>
+    
+<string name="search_everywhere">全面搜索</string>
+<string name="search_in">在%%搜索: </string>
+    
+<string name="address_form">地址:</string>
+<string name="copied_text">复制文本</string>
+<string name="text_is_copied">地址已被复制到剪贴板</string>
+
+<string name="search_result_count">搜索结果: %% 文章被找到</string>
+<string name="search_is_performing">正在搜索，请稍等…</string>
+<string name="search_at_least_3_symbols">输入关键字符，开始搜索</string>
+
 
 </resources>

android/res/values/strings.xml

@@ -63,6 +63,18 @@
     
     <string name="dialog_open">Open</string>
     <string name="dialog_cancel">Cancel</string>
+    
+    <string name="search_everywhere">Search everywhere</string>
+<string name="search_in">Search in: %%</string>
+<string name="address_form">Address:</string>
+<string name="copied_text">Copied text</string>
+<string name="text_is_copied">Address is copied to clipboard.</string>
+
+
+<string name="search_result_count">Search result: %% articles found</string>
+<string name="search_is_performing">Search is performing, please wait...</string>
+<string name="search_at_least_3_symbols">To start search, enter at least 3 symbols</string>
+
+
     
-
 </resources>