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

fixing bugs and other stuff

Browse Source
This commit is contained in:
vladislav.khorev committed 2015-07-02 10:49:20 +00:00
1 parent 482fb1edc4
commit d977b27e9f
21 files changed
+466 -144
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/res/layout/article_geotag_element.xml
+6
View File
@@ -27,6 +27,12 @@
android:background="@color/bkg2"
android:textSize="24sp" />
<TextView
android:id="@+id/hintTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/hold_address" />
<org.osmdroid.views.MapView
android:id="@+id/mapview"
android:layout_width="match_parent"
android/res/layout/fragment_settings_page.xml
+154 -45
View File
@@ -9,57 +9,166 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="fishrungames.bashgid.SettingsFragment" >
<TextView
android:id="@+id/selectLanguageTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/select_language"
android:textSize="26sp" />
<LinearLayout
android:id="@+id/flag_view"
<ScrollView
android:id="@+id/scrollView1"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<ImageButton
android:id="@+id/image_flag_usa"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_english"
android:scaleType="fitCenter"
android:src="@drawable/united_states_icon_button"
android:onClick="OnSelectEnglish" />
android:orientation="vertical" >
<ImageButton
android:id="@+id/image_flag_russia"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_russian"
android:scaleType="fitCenter"
android:src="@drawable/russia_icon_button"
android:onClick="OnSelectRussian" />
<TextView
android:id="@+id/selectLanguageTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:text="@string/select_language"
android:textSize="26sp" />
<ImageButton
android:id="@+id/image_flag_china"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_chinese"
android:scaleType="fitCenter"
android:src="@drawable/china_icon_button"
android:onClick="OnSelectChinese" />
<LinearLayout
android:id="@+id/flag_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp" >
</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:layout_weight="1"
android:text="@string/lang_english"
android:textSize="20sp" />
<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: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/textView3"
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" />
<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: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:layout_weight="1"
android:text="@string/lang_chinese"
android:textSize="20sp" />
<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: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>
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/credits"
android:textSize="18sp" />
<ImageView
android:id="@+id/kitapImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@drawable/kitap" />
<Button
android:id="@+id/callSupportButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/call_support" />
<Button
android:id="@+id/visitKitapButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/visit_kitap" />
<Button
android:id="@+id/visitDeveloperButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/visit_developer" />
<Button
android:id="@+id/visitTranslatorButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/visit_translator" />
</LinearLayout>
</ScrollView>
</LinearLayout>
android/res/layout/fragment_welcome.xml
+81 -32
View File
@@ -24,46 +24,95 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:baselineAligned="false"
android:gravity="bottom" >
<ImageButton
android:id="@+id/image_flag_usa"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_english"
android:scaleType="fitCenter"
android:src="@drawable/united_states_icon_button"
android:onClick="OnSelectEnglish" />
android:orientation="vertical" >
<ImageButton
android:id="@+id/image_flag_russia"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_russian"
android:scaleType="fitCenter"
android:src="@drawable/russia_icon_button"
android:onClick="OnSelectRussian" />
<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:textSize="20sp" />
<ImageButton
android:id="@+id/image_flag_china"
<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: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="wrap_content"
android:layout_margin="8dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/lang_chinese"
android:scaleType="fitCenter"
android:src="@drawable/china_icon_button"
android:onClick="OnSelectChinese" />
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:textSize="20sp" />
<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: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:textSize="20sp" />
<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: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>
android/res/layout/main_page_news.xml
+3 -36
View File
@@ -32,20 +32,9 @@
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" >
<ImageButton
android:id="@+id/news1ImageButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|left"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/news_content_description"
android:maxWidth="40dp"
android:scaleType="centerInside" />
<Button
android:id="@+id/news1Button"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
@@ -63,20 +52,9 @@
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" >
<ImageButton
android:id="@+id/news2ImageButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/news_content_description"
android:maxWidth="40dp"
android:scaleType="centerInside" />
<Button
android:id="@+id/news2Button"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
@@ -94,20 +72,9 @@
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" >
<ImageButton
android:id="@+id/news3ImageButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
android:background="@drawable/transparent"
android:contentDescription="@string/news_content_description"
android:maxWidth="40dp"
android:scaleType="centerInside" />
<Button
android:id="@+id/news3Button"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android/res/layout/news_list_element.xml
+32
View File
@@ -0,0 +1,32 @@
<?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:orientation="horizontal"
android:showDividers="middle" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
<TextView
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="TextView"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/dateTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="TextView" />
</LinearLayout>
</LinearLayout>
android/res/layout/osm_dialog.xml
+6
View File
@@ -33,6 +33,12 @@
android:text="TextView"
android:textSize="18sp" />
<TextView
android:id="@+id/hintTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/hold_address" />
<Button
android:id="@+id/button"
style="?android:attr/borderlessButtonStyle"