other/bashgid
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Different screen sizes apply + clean up

Browse Source
This commit is contained in:
vladislav.khorev committed 2015-07-02 22:36:06 +00:00
1 parent d977b27e9f
commit ce6cace53b
64 files changed
+824 -513
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/res/layout/article_album_element.xml
+5 -5
View File
@@ -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
-1
View File
@@ -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
+2 -3
View File
@@ -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
+12 -9
View File
@@ -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_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="@dimen/medium_margin"
android:layout_marginLeft="@dimen/medium_margin"
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
+2 -3
View File
@@ -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
+1 -2
View File
@@ -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
-1
View File
@@ -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
+7 -7
View File
@@ -9,10 +9,10 @@
<ImageView
android:id="@+id/imageView"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="4dp"
android:layout_marginLeft="10dp"
android:layout_width="@dimen/drawer_image_size"
android:layout_height="@dimen/drawer_image_size"
android:layout_margin="@dimen/drawer_margin"
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:paddingLeft="10dp"
android:layout_margin="@dimen/drawer_margin"
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
+6 -9
View File
@@ -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_marginRight="16dp"
android:layout_marginBottom="@dimen/large_margin"
android:layout_marginLeft="@dimen/large_margin"
android:layout_marginRight="@dimen/large_margin"
android:divider="@drawable/transparent"
android:dividerHeight="18dp"
android:paddingBottom="16dp" >
android:dividerHeight="@dimen/large_divider_height" >
</ListView>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/progress_bar_size"
android:layout_height="@dimen/progress_bar_size"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
android/res/layout/fragment_catalog_page.xml
+6 -6
View File
@@ -10,8 +10,8 @@
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/progress_bar_size"
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_marginRight="16dp"
android:layout_marginBottom="@dimen/large_margin"
android:layout_marginLeft="@dimen/large_margin"
android:layout_marginRight="@dimen/large_margin"
android:divider="@drawable/transparent"
android:dividerHeight="18dp"
android:paddingBottom="16dp" >
android:dividerHeight="@dimen/large_divider_height" >
</ListView>
android/res/layout/fragment_main_page.xml
+5 -4
View File
@@ -11,11 +11,12 @@
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="@dimen/large_margin"
android:layout_marginLeft="@dimen/large_margin"
android:layout_marginRight="@dimen/large_margin"
android:divider="@drawable/transparent"
android:dividerHeight="18dp"
android:paddingBottom="16dp" >
android:dividerHeight="@dimen/large_divider_height" >
</ListView>
android/res/layout/fragment_navigation_drawer.xml
+3 -3
View File
@@ -6,8 +6,8 @@
android:background="@color/drawer_color"
android:choiceMode="singleChoice"
android:divider="@color/drawer_divider_color"
android:dividerHeight="1dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:dividerHeight="@dimen/navigation_drawer_divider_height"
android:paddingLeft="@dimen/navigation_drawer_padding_left"
android:paddingRight="@dimen/navigation_drawer_padding_right"
tools:context="fishrungames.bashgid.NavigationDrawerFragment" />
android/res/layout/fragment_news_page.xml
+5 -4
View File
@@ -12,11 +12,12 @@
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="@dimen/large_margin"
android:layout_marginLeft="@dimen/large_margin"
android:layout_marginRight="@dimen/large_margin"
android:divider="@color/bkg2"
android:dividerHeight="2dp"
android:paddingBottom="16dp" >
android:dividerHeight="@dimen/small_divider_height"
>
</ListView>
android/res/layout/fragment_osm_map_page.xml
+6 -5
View File
@@ -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:textSize="24dp"
android:text=""
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
+4 -4
View File
@@ -12,11 +12,11 @@
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="@dimen/large_margin"
android:layout_marginLeft="@dimen/large_margin"
android:layout_marginRight="@dimen/large_margin"
android:divider="@color/bkg2"
android:dividerHeight="2dp"
android:paddingBottom="16dp" >
android:dividerHeight="@dimen/small_divider_height" >
</ListView>
android/res/layout/fragment_photo_album_page.xml
+6 -6
View File
@@ -12,19 +12,19 @@
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="@dimen/large_margin"
android:layout_marginLeft="@dimen/large_margin"
android:layout_marginRight="@dimen/large_margin"
android:divider="@color/bkg2"
android:dividerHeight="12dp"
android:paddingBottom="16dp" >
android:dividerHeight="@dimen/small_divider_height" >
</ListView>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/progress_bar_size"
android:layout_height="@dimen/progress_bar_size"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
android/res/layout/fragment_photo_page.xml
+2 -2
View File
@@ -7,8 +7,8 @@
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/progress_bar_size"
android:layout_height="@dimen/progress_bar_size"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
android/res/layout/fragment_search_page.xml
+3 -4
View File
@@ -3,10 +3,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/large_margin"
android:paddingLeft="@dimen/large_margin"
android:paddingRight="@dimen/large_margin"
tools:context="fishrungames.bashgid.SearchFragment" >
<ListView
android/res/layout/fragment_settings_page.xml
+38 -35
View File
@@ -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:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/large_margin"
android:paddingLeft="@dimen/large_margin"
android:paddingRight="@dimen/large_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_marginTop="8dp"
android:layout_gravity="center_horizontal"
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_weight="1"
android:layout_margin="@dimen/medium_margin"
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_weight="1"
android:layout_margin="@dimen/medium_margin"
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_weight="1"
android:layout_margin="@dimen/medium_margin"
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
+5 -5
View File
@@ -6,8 +6,8 @@
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/progress_bar_size"
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:numColumns="4"
android:verticalSpacing="12dp" >
android:horizontalSpacing="@dimen/grid_view_horizontal_spacing"
android:numColumns="@integer/grid_columns"
android:verticalSpacing="@dimen/grid_view_vertical_spacing" >
</GridView>
android/res/layout/fragment_video_record_page.xml
+33 -29
View File
@@ -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_margin="6dp"
android:orientation="vertical" >
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/nameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="24sp"
android:textStyle="bold" />
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="@dimen/progress_bar_size"
android:layout_height="@dimen/progress_bar_size"
android:indeterminate="true" />
<TextView
android:id="@+id/descriptionTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<fishrungames.bashgid.DynamicImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/nameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/medium_margin"
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>
</LinearLayout>
android/res/layout/fragment_welcome.xml
+10 -13
View File
@@ -4,17 +4,14 @@
android:layout_height="match_parent"
android:background="@drawable/background"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:padding="@dimen/large_margin"
tools:context="fishrungames.bashgid.WelcomeFragment" >
<ImageView
android:id="@+id/logo_view"
android:layout_width="match_parent"
android:layout_height="250dp"
android:layout_marginTop="22dp"
android:layout_height="@dimen/logo_height"
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
+11 -5
View File
@@ -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_height="80dp"
android:layout_width="@dimen/list_element_image_view_size"
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 -6
View File
@@ -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:text="@string/journal_open_map"
android:textSize="24sp"
android:layout_margin="@dimen/medium_margin"
android:text="@string/category_is_loading"
android:textSize="@dimen/large_text_size"
android:textStyle="bold" />
android/res/layout/main_page_header.xml
+2 -2
View File
@@ -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
+24 -27
View File
@@ -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" >
<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" />
android:layout_gravity="right"
android:gravity="right|center_vertical" >
<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_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_gravity="right"
android:layout_marginBottom="@dimen/medium_margin"
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
+13 -15
View File
@@ -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_height="100dp"
android:layout_width="@dimen/progress_bar_size"
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_marginTop="8dp" >
android:layout_marginBottom="@dimen/medium_margin"
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_marginTop="8dp" >
android:layout_marginBottom="@dimen/medium_margin"
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_marginTop="8dp" >
android:layout_marginBottom="@dimen/medium_margin"
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
+4 -4
View File
@@ -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
+17 -25
View File
@@ -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/bkg1"
android:background="@color/light_grey_1"
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
android:id="@+id/button"
android:layout_width="wrap_content"
<TextView
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/transparent_button"
android:gravity="left|center_vertical"
android:minHeight="0dip"
android:minWidth="0dip"
android:textColor="@color/text_grey" />
android:layout_margin="@dimen/small_margin"
android:text="TextView"
android:textSize="@dimen/medium_text_size"
android:textStyle="bold" />
<TextView
android:id="@+id/dateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_width="match_parent"
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
+2 -4
View File
@@ -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
+4 -4
View File
@@ -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_height="100dp"
android:layout_width="@dimen/progress_bar_size"
android:layout_height="@dimen/progress_bar_size"
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
android/res/layout/osm_dialog.xml
+14 -16
View File
@@ -1,57 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/LinearLayout1"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
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
-1
View File
@@ -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
-1
View File
@@ -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
+8 -2
View File
@@ -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
+1 -4
View File
@@ -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
+6 -6
View File
@@ -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:padding="2dp"
android:maxHeight="@dimen/horizontal_list_element_image_height"
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
+10
View File
@@ -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
+4 -6
View File
@@ -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>