fixing bugs and other stuff
This commit is contained in:
vladislav.khorev committed
1 parent
482fb1edc4
commit
d977b27e9f
21 files changed
+466
-144
No files matched your search
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
@@ -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"
|
||||
|
||||
@@ -74,5 +74,18 @@
|
||||
<string name="search_is_performing">Идет поиск, пожалуйста, подождите...</string>
|
||||
<string name="search_at_least_3_symbols">Чтобы начать поиск, введите как минимум 3 символа</string>
|
||||
|
||||
<string name="credits">Башгид (c) 2015\n\nВсе права принадлежат ГУП «Китап»\nТелефон: +73472238838\nhttp://kitap-ufa.ru/\n\nРазработчик - Владислав Хорев\nТелефон: +79260492730\nEmail: mephi1984@gmail.com\n\nПеревод на китайский язык сделан Лилией Лисицей\nТелефон: +8615756011926\n Email:lilialoo926@mail.ru</string>
|
||||
|
||||
<string name="call_support">У вас возникли трудности при работе с приложением? Нажмите сюда, чтобы позвонить в техподдержку.</string>
|
||||
|
||||
<string name="visit_kitap">Посетить сайт ГУП «Китап»</string>
|
||||
|
||||
<string name="visit_developer">Посетить сайт разработчика</string>
|
||||
|
||||
<string name="visit_translator">Посетить сайт переводчика</string>
|
||||
|
||||
<string name="hold_address">Чтобы скопировать адрес, нажмите и его удерживайте некоторое время.</string>
|
||||
|
||||
|
||||
|
||||
</resources>
|
||||
@@ -67,5 +67,18 @@
|
||||
<string name="search_is_performing">正在搜索，请稍等…</string>
|
||||
<string name="search_at_least_3_symbols">输入关键字符，开始搜索</string>
|
||||
|
||||
<string name="credits">Bashguide (c) 2015\n\nApplication owner: ГУП «Китап»\nPhone: +73472238838\nhttp://kitap-ufa.ru/\n\nApplication is made by Vladislav Khorev\nPhone: +79260492730\nEmail: mephi1984@gmail.com\n\nTranslation to Chinese made by Little Fox Lilia\nPhone: +8615756011926\n Email:lilialoo926@mail.ru</string>
|
||||
|
||||
<string name="call_support">Having problems with application? Click here to call support.</string>
|
||||
|
||||
<string name="visit_kitap">Visit ГУП «Китап» website</string>
|
||||
|
||||
<string name="visit_developer">Visit developer\'s website</string>
|
||||
|
||||
<string name="visit_translator">Visit translator\'s website</string>
|
||||
|
||||
<string name="hold_address">Tap and hold address to copy it to clipboard.</string>
|
||||
|
||||
|
||||
|
||||
</resources>
|
||||
@@ -75,6 +75,18 @@
|
||||
<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>
|
||||
|
||||
<string name="credits">Bashguide (c) 2015\n\nApplication owner: ГУП «Китап»\nPhone: +73472238838\nhttp://kitap-ufa.ru/\n\nApplication is made by Vladislav Khorev\nPhone: +79260492730\nEmail: mephi1984@gmail.com\n\nTranslation to Chinese made by Little Fox Lilia\nPhone: +8615756011926\n Email:lilialoo926@mail.ru</string>
|
||||
|
||||
<string name="call_support">Having problems with application? Click here to call support.</string>
|
||||
|
||||
<string name="visit_kitap">Visit ГУП «Китап» website</string>
|
||||
|
||||
<string name="visit_developer">Visit developer\'s website</string>
|
||||
|
||||
<string name="visit_translator">Visit translator\'s website</string>
|
||||
|
||||
<string name="hold_address">Tap and hold address to copy it to clipboard.</string>
|
||||
|
||||
|
||||
|
||||
</resources>
|
||||
Reference in new issue
Block a user