Fixing context bugs

This commit is contained in:
vladislav.khorev committed 2015-07-06 00:44:07 +00:00
1 parent b0021bbbf6
commit c0c8ba61c6
44 files changed
+938 -957

No files matched your search

+3 -1
View File
@@ -6,12 +6,15 @@
tools:context="fishrungames.bashgid.MainActivity" >
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</FrameLayout>
<fragment
android:id="@+id/navigation_drawer"
android:name="fishrungames.bashgid.NavigationDrawerFragment"
@@ -20,5 +23,4 @@
android:layout_gravity="start"
tools:layout="@layout/fragment_navigation_drawer" />
</android.support.v4.widget.DrawerLayout>
+3 -1
View File
@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bkg2"
android:orientation="vertical" >
<ProgressBar
android:id="@+id/progressBar"
@@ -11,7 +12,7 @@
android:layout_gravity="center_horizontal"
android:indeterminate="true" />
<fishrungames.bashgid.StaticGridView
<GridView
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -20,6 +21,7 @@
android:numColumns="@integer/grid_columns"
android:verticalSpacing="@dimen/grid_view_vertical_spacing"
android:isScrollContainer="false"
android:background="@color/bkg2"
android:stretchMode="columnWidth" />
@@ -1,10 +1,11 @@
<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="wrap_content"
android:layout_height="match_parent"
android:paddingBottom="@dimen/large_margin"
android:paddingLeft="@dimen/large_margin"
android:paddingRight="@dimen/large_margin"
android:background="@color/bkg2"
tools:context="fishrungames.bashgid.SettingsFragment" >
@@ -9,7 +9,7 @@
android:orientation="vertical"
android:showDividers="middle" >
<fishrungames.bashgid.SquareImageView
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+8 -8
View File
@@ -27,21 +27,21 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">60dp</dimen>
<dimen name="xlarge_text_size">30dp</dimen>
<dimen name="xxlarge_text_size">40sp</dimen>
<dimen name="xlarge_text_size">30sp</dimen>
<dimen name="large_text_size">24dp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20dp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18dp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14dp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">30dp</dimen>
<dimen name="language_text_size">30sp</dimen>
<dimen name="article_content_text_size">24dp</dimen>
<dimen name="article_content_text_size">20sp</dimen>
+8 -8
View File
@@ -27,20 +27,20 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">30dp</dimen>
<dimen name="xlarge_text_size">24dp</dimen>
<dimen name="xxlarge_text_size">30sp</dimen>
<dimen name="xlarge_text_size">24sp</dimen>
<dimen name="large_text_size">24dp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20dp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18dp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14dp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">20dp</dimen>
<dimen name="language_text_size">20sp</dimen>
<dimen name="article_content_text_size">14dp</dimen>
<dimen name="article_content_text_size">14sp</dimen>
+8 -8
View File
@@ -27,20 +27,20 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">30dp</dimen>
<dimen name="xlarge_text_size">24dp</dimen>
<dimen name="xxlarge_text_size">30sp</dimen>
<dimen name="xlarge_text_size">24sp</dimen>
<dimen name="large_text_size">24dp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20dp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18dp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14dp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">20dp</dimen>
<dimen name="language_text_size">20sp</dimen>
<dimen name="article_content_text_size">14dp</dimen>
<dimen name="article_content_text_size">14sp</dimen>
<dimen name="grid_view_horizontal_spacing">12dp</dimen>
+8 -8
View File
@@ -27,21 +27,21 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">60dp</dimen>
<dimen name="xlarge_text_size">30dp</dimen>
<dimen name="xxlarge_text_size">40sp</dimen>
<dimen name="xlarge_text_size">30sp</dimen>
<dimen name="large_text_size">24dp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20dp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18dp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14dp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">30dp</dimen>
<dimen name="language_text_size">30sp</dimen>
<dimen name="article_content_text_size">24dp</dimen>
<dimen name="article_content_text_size">20sp</dimen>
+8 -8
View File
@@ -27,21 +27,21 @@
<dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">60dp</dimen>
<dimen name="xlarge_text_size">30dp</dimen>
<dimen name="xxlarge_text_size">40sp</dimen>
<dimen name="xlarge_text_size">30sp</dimen>
<dimen name="large_text_size">24dp</dimen>
<dimen name="large_text_size">24sp</dimen>
<dimen name="medium_text_size">20dp</dimen>
<dimen name="medium_text_size">20sp</dimen>
<dimen name="small_text_size">18dp</dimen>
<dimen name="small_text_size">18sp</dimen>
<dimen name="xsmall_text_size">14dp</dimen>
<dimen name="xsmall_text_size">14sp</dimen>
<dimen name="language_text_size">30dp</dimen>
<dimen name="language_text_size">30sp</dimen>
<dimen name="article_content_text_size">24dp</dimen>
<dimen name="article_content_text_size">20sp</dimen>