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

Many recent changes

Browse Source
This commit is contained in:
vladislav.khorev committed 2015-07-08 00:11:08 +00:00
1 parent 10e10d5814
commit b876b7b58e
23 files changed
+253 -223
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/res/layout/article_text_element.xml
+2 -1
View File
@@ -11,6 +11,7 @@
android:id="@+id/dateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView" />
android:text="TextView"
android:textSize="@dimen/article_content_text_size" />
</LinearLayout>
android/res/layout/article_title_element.xml
+19
View File
@@ -0,0 +1,19 @@
<?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:background="@color/light_grey_1"
android:orientation="vertical"
android:showDividers="middle" >
<TextView
android:id="@+id/dateTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="TextView"
android:textSize="@dimen/xxlarge_text_size"
android:textStyle="bold" />
</LinearLayout>
android/res/layout/fragment_grid_page.xml
+4 -1
View File
@@ -2,6 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/large_margin"
android:paddingLeft="@dimen/large_margin"
android:paddingRight="@dimen/large_margin"
android:background="@color/bkg2"
android:orientation="vertical" >
<ProgressBar
@@ -12,7 +15,7 @@
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<GridView
<fishrungames.bashgid.StaticGridView
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android/res/layout/fragment_settings_page.xml
+1
View File
@@ -12,6 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bkg2"
android:orientation="vertical" >
<TextView
android/res/layout/fragment_welcome.xml
+109 -108
View File
@@ -1,4 +1,4 @@
<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"
@@ -7,117 +7,118 @@
android:padding="@dimen/large_margin"
tools:context="fishrungames.bashgid.WelcomeFragment" >
<ImageView
android:id="@+id/logo_view"
android:layout_width="match_parent"
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" />
<LinearLayout
android:id="@+id/flag_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:baselineAligned="false"
android:gravity="bottom" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lang_english"
android:textColor="@color/text_white"
android:textSize="@dimen/language_text_size"
android:textStyle="bold" />
<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="@dimen/medium_margin"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_english"
android:onClick="OnSelectEnglish"
<ImageView
android:id="@+id/logo_view"
android:layout_width="match_parent"
android:layout_height="@dimen/logo_height"
android:layout_marginTop="@dimen/logo_margin_top"
android:contentDescription="@string/RB_Coat"
android:scaleType="fitCenter"
android:src="@drawable/united_states_icon_button" />
android:src="@drawable/logo" />
<LinearLayout
android:id="@+id/flag_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:gravity="bottom" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lang_english"
android:textColor="@color/text_white"
android:textSize="@dimen/language_text_size"
android:textStyle="bold" />
<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="@dimen/medium_margin"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_english"
android:onClick="OnSelectEnglish"
android:scaleType="fitCenter"
android:src="@drawable/united_states_icon_button" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
<TextView
android:id="@+id/TextView01"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lang_russian"
android:textColor="@color/text_white"
android:textSize="@dimen/language_text_size"
android:textStyle="bold" />
<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="@dimen/medium_margin"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_russian"
android:onClick="OnSelectRussian"
android:scaleType="fitCenter"
android:src="@drawable/russia_icon_button" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
<TextView
android:id="@+id/TextView02"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lang_chinese"
android:textColor="@color/text_white"
android:textSize="@dimen/language_text_size"
android:textStyle="bold" />
<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="@dimen/medium_margin"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_chinese"
android:onClick="OnSelectChinese"
android:scaleType="fitCenter"
android:src="@drawable/china_icon_button" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
<TextView
android:id="@+id/TextView01"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lang_russian"
android:textColor="@color/text_white"
android:textSize="@dimen/language_text_size"
android:textStyle="bold" />
<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="@dimen/medium_margin"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_russian"
android:onClick="OnSelectRussian"
android:scaleType="fitCenter"
android:src="@drawable/russia_icon_button" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
<TextView
android:id="@+id/TextView02"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lang_chinese"
android:textColor="@color/text_white"
android:textSize="@dimen/language_text_size"
android:textStyle="bold" />
<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="@dimen/medium_margin"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_chinese"
android:onClick="OnSelectChinese"
android:scaleType="fitCenter"
android:src="@drawable/china_icon_button" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
android/res/layout/grid_page_list_element.xml
+2 -2
View File
@@ -9,7 +9,7 @@
android:orientation="vertical"
android:showDividers="middle" >
<ImageView
<fishrungames.bashgid.SquareImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
android:layout_gravity="clip_vertical"
android:layout_margin="@dimen/medium_margin"
android:text="dsdsd"
android:textSize="@dimen/large_text_size"
android:textSize="@dimen/small_text_size"
android:textStyle="bold" />
</LinearLayout>
android/res/layout/main_page_header.xml
+1 -1
View File
@@ -51,7 +51,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
android:background="@drawable/transparent"
android:background="@color/button_default"
android:src="@drawable/ic_action_refresh" />
</LinearLayout>
android/res/layout/main_page_news.xml
+1 -1
View File
@@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
android:background="@drawable/transparent"
android:background="@color/button_default"
android:src="@drawable/ic_action_refresh" />
</LinearLayout>
android/res/layout/news_page_list_header.xml
+1 -1
View File
@@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
android:background="@drawable/transparent"
android:background="@color/button_default"
android:src="@drawable/ic_action_refresh" />
</LinearLayout>
android/res/values-large/dimens.xml
+1 -19
View File
@@ -27,29 +27,11 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">40sp</dimen>
<dimen name="xlarge_text_size">30sp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">30sp</dimen>
<dimen name="article_content_text_size">20sp</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_height">160dp</dimen>
<dimen name="logo_margin_top">24dp</dimen>
android/res/values-normal/dimens.xml
+1 -17
View File
@@ -27,29 +27,13 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">30sp</dimen>
<dimen name="xlarge_text_size">24sp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">20sp</dimen>
<dimen name="article_content_text_size">14sp</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_height">160dp</dimen>
<dimen name="logo_margin_top">24dp</dimen>
android/res/values-small/dimens.xml
+2 -16
View File
@@ -26,27 +26,13 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">30sp</dimen>
<dimen name="xlarge_text_size">24sp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">20sp</dimen>
<dimen name="article_content_text_size">14sp</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_height">160dp</dimen>
<dimen name="logo_margin_top">24dp</dimen>
android/res/values-xlarge/dimens.xml
+1 -16
View File
@@ -27,21 +27,6 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">40sp</dimen>
<dimen name="xlarge_text_size">30sp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">30sp</dimen>
<dimen name="article_content_text_size">20sp</dimen>
@@ -49,7 +34,7 @@
<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_height">160dp</dimen>
<dimen name="logo_margin_top">24dp</dimen>
android/res/values/dimens.xml
+5 -6
View File
@@ -27,8 +27,8 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">40sp</dimen>
<dimen name="xlarge_text_size">30sp</dimen>
<dimen name="xxlarge_text_size">36sp</dimen>
<dimen name="xlarge_text_size">24sp</dimen>
<dimen name="large_text_size">24sp</dimen>
@@ -38,10 +38,9 @@
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">20sp</dimen>
<dimen name="language_text_size">30sp</dimen>
<dimen name="article_content_text_size">20sp</dimen>
<dimen name="article_content_text_size">24sp</dimen>
@@ -49,7 +48,7 @@
<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_height">160dp</dimen>
<dimen name="logo_margin_top">24dp</dimen>