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 2015-07-02 10:49:20 +00:00
parent 482fb1edc4
commit d977b27e9f
21 changed files with 466 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/res/drawable/kitap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
android/res/drawable/marker_default.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

6
android/res/layout/article_geotag_element.xml
View File

@ -27,6 +27,12 @@
android:background="@color/bkg2" android:background="@color/bkg2"
android:textSize="24sp" /> 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 <org.osmdroid.views.MapView
android:id="@+id/mapview" android:id="@+id/mapview"
android:layout_width="match_parent" android:layout_width="match_parent"

199
android/res/layout/fragment_settings_page.xml
View File

@ -9,57 +9,166 @@
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
tools:context="fishrungames.bashgid.SettingsFragment" > tools:context="fishrungames.bashgid.SettingsFragment" >
<TextView <ScrollView
android:id="@+id/selectLanguageTextView" android:id="@+id/scrollView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/select_language"
android:textSize="26sp" />
<LinearLayout
android:id="@+id/flag_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
<ImageButton <LinearLayout
android:id="@+id/image_flag_usa" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:orientation="vertical" >
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" />
<ImageButton <TextView
android:id="@+id/image_flag_russia" android:id="@+id/selectLanguageTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_marginBottom="8dp"
android:layout_weight="1" android:layout_marginTop="8dp"
android:adjustViewBounds="true" android:text="@string/select_language"
android:background="@drawable/transparent" android:textSize="26sp" />
android:contentDescription="@string/lang_russian"
android:scaleType="fitCenter"
android:src="@drawable/russia_icon_button"
android:onClick="OnSelectRussian" />
<ImageButton <LinearLayout
android:id="@+id/image_flag_china" android:id="@+id/flag_view"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_marginBottom="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> <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> </LinearLayout>

113
android/res/layout/fragment_welcome.xml
View File

@ -24,46 +24,95 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:baselineAligned="false"
android:gravity="bottom" > android:gravity="bottom" >
<ImageButton <LinearLayout
android:id="@+id/image_flag_usa"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="8dp"
android:layout_weight="1" android:layout_weight="1"
android:adjustViewBounds="true" android:orientation="vertical" >
android:background="@drawable/transparent"
android:contentDescription="@string/lang_english"
android:scaleType="fitCenter"
android:src="@drawable/united_states_icon_button"
android:onClick="OnSelectEnglish" />
<ImageButton <TextView
android:id="@+id/image_flag_russia" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_gravity="center_horizontal"
android:layout_weight="1" android:text="@string/lang_english"
android:adjustViewBounds="true" android:textSize="20sp" />
android:background="@drawable/transparent"
android:contentDescription="@string/lang_russian"
android:scaleType="fitCenter"
android:src="@drawable/russia_icon_button"
android:onClick="OnSelectRussian" />
<ImageButton <ImageButton
android:id="@+id/image_flag_china" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="8dp"
android:layout_weight="1" android:layout_weight="1"
android:adjustViewBounds="true" android:orientation="vertical" >
android:background="@drawable/transparent"
android:contentDescription="@string/lang_chinese" <TextView
android:scaleType="fitCenter" android:id="@+id/TextView01"
android:src="@drawable/china_icon_button" android:layout_width="wrap_content"
android:onClick="OnSelectChinese" /> 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> </LinearLayout>

39
android/res/layout/main_page_news.xml
View File

@ -32,20 +32,9 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="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 <Button
android:id="@+id/news1Button" android:id="@+id/news1Button"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
@ -63,20 +52,9 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="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 <Button
android:id="@+id/news2Button" android:id="@+id/news2Button"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
@ -94,20 +72,9 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="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 <Button
android:id="@+id/news3Button" android:id="@+id/news3Button"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"

32
android/res/layout/news_list_element.xml Normal file
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>

6
android/res/layout/osm_dialog.xml
View File

@ -33,6 +33,12 @@
android:text="TextView" android:text="TextView"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView
android:id="@+id/hintTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/hold_address" />
<Button <Button
android:id="@+id/button" android:id="@+id/button"
style="?android:attr/borderlessButtonStyle" style="?android:attr/borderlessButtonStyle"

13
android/res/values-ru/strings.xml
View File

@ -74,5 +74,18 @@
<string name="search_is_performing">Идет поиск, пожалуйста, подождите...</string> <string name="search_is_performing">Идет поиск, пожалуйста, подождите...</string>
<string name="search_at_least_3_symbols">Чтобы начать поиск, введите как минимум 3 символа</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> </resources>

13
android/res/values-zh-rCN/strings.xml
View File

@ -67,5 +67,18 @@
<string name="search_is_performing">正在搜索，请稍等…</string> <string name="search_is_performing">正在搜索，请稍等…</string>
<string name="search_at_least_3_symbols">输入关键字符，开始搜索</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> </resources>

12
android/res/values/strings.xml
View File

@ -75,6 +75,18 @@
<string name="search_is_performing">Search is performing, please wait...</string> <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="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> </resources>

15
android/src/fishrungames/bashgid/ArticleFragment.java
View File

@ -14,6 +14,7 @@ import org.osmdroid.views.MapView;
import fishrungames.bashgid.OsmMapHolderFragment.CustomItemizedOverlay; import fishrungames.bashgid.OsmMapHolderFragment.CustomItemizedOverlay;
import fishrungames.bashgid.OsmMapHolderFragment.NoInteractionOverlay; import fishrungames.bashgid.OsmMapHolderFragment.NoInteractionOverlay;
import fishrungames.bashgid.core.ArticleManager;
import fishrungames.bashgid.core.DatabaseGetAlbumTask; import fishrungames.bashgid.core.DatabaseGetAlbumTask;
import fishrungames.bashgid.core.DatabaseGetArticleTask; import fishrungames.bashgid.core.DatabaseGetArticleTask;
import fishrungames.bashgid.core.LocationHolder; import fishrungames.bashgid.core.LocationHolder;
@ -339,7 +340,15 @@ public class ArticleFragment extends Fragment
textView.setText(articleLayout.get(position).value); textView.setText(articleLayout.get(position).value);
textView.setTextSize(64); if (article.type == ArticleManager.ARTICLE_TYPE_NEWS)
{
textView.setTextSize(32);
}
else
{
textView.setTextSize(64);
}
textView.setTypeface(null, Typeface.BOLD); textView.setTypeface(null, Typeface.BOLD);
textView.setGravity(Gravity.CENTER_HORIZONTAL); textView.setGravity(Gravity.CENTER_HORIZONTAL);
@ -372,12 +381,15 @@ public class ArticleFragment extends Fragment
double geoLon = articleLayout.get(position).geoLon; double geoLon = articleLayout.get(position).geoLon;
TextView addressTextView = (TextView) view.findViewById(R.id.addressTextView); TextView addressTextView = (TextView) view.findViewById(R.id.addressTextView);
TextView hintTextView = (TextView) view.findViewById(R.id.hintTextView);
if (article.address.length() > 0) if (article.address.length() > 0)
{ {
addressTextView.setText(article.address); addressTextView.setText(article.address);
addressTextView.setVisibility(View.VISIBLE); addressTextView.setVisibility(View.VISIBLE);
hintTextView.setVisibility(View.VISIBLE);
final String copied_text = getResources().getString(R.string.copied_text); final String copied_text = getResources().getString(R.string.copied_text);
addressTextView.setOnLongClickListener(new OnLongClickListener(){ addressTextView.setOnLongClickListener(new OnLongClickListener(){
@ -410,6 +422,7 @@ public class ArticleFragment extends Fragment
else else
{ {
addressTextView.setVisibility(View.GONE); addressTextView.setVisibility(View.GONE);
hintTextView.setVisibility(View.GONE);
} }
MapView mapView = (MapView) view.findViewById(R.id.mapview); MapView mapView = (MapView) view.findViewById(R.id.mapview);

7
android/src/fishrungames/bashgid/JournalFragment.java
View File

@ -97,14 +97,17 @@ public class JournalFragment extends Fragment
} }
else else
{ {
if (journalName.equals("news"))
/*if (journalName.equals("news"))
{ {
MainActivity.getInstance().OpenNewsRecordScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT); MainActivity.getInstance().OpenNewsRecordScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
} }
else else
{ {
MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT); MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
} }*/
MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
} }
} }
}); });

35
android/src/fishrungames/bashgid/MainPageFragment.java
View File

@ -165,9 +165,9 @@ public class MainPageFragment extends Fragment {
newsJournal = journal; newsJournal = journal;
ImageButton news1ImageButton = (ImageButton) header.findViewById(R.id.news1ImageButton); //ImageButton news1ImageButton = (ImageButton) header.findViewById(R.id.news1ImageButton);
ImageButton news2ImageButton = (ImageButton) header.findViewById(R.id.news2ImageButton); //ImageButton news2ImageButton = (ImageButton) header.findViewById(R.id.news2ImageButton);
ImageButton news3ImageButton = (ImageButton) header.findViewById(R.id.news3ImageButton); //ImageButton news3ImageButton = (ImageButton) header.findViewById(R.id.news3ImageButton);
Button news1Button = (Button)header.findViewById(R.id.news1Button); Button news1Button = (Button)header.findViewById(R.id.news1Button);
Button news2Button = (Button)header.findViewById(R.id.news2Button); Button news2Button = (Button)header.findViewById(R.id.news2Button);
@ -175,47 +175,47 @@ public class MainPageFragment extends Fragment {
if (newsJournal.articleArr.size() > 0) if (newsJournal.articleArr.size() > 0)
{ {
ImageManager.getInstance().ApplyImageToImageView(news1ImageButton, newsJournal.articleArr.get(0).previewImageUrl); //ImageManager.getInstance().ApplyImageToImageView(news1ImageButton, newsJournal.articleArr.get(0).previewImageUrl);
news1Button.setText(newsJournal.articleArr.get(0).title); news1Button.setText(newsJournal.articleArr.get(0).title);
news1ImageButton.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(0).name)); //news1ImageButton.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(0).name));
news1Button.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(0).name)); news1Button.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(0).name));
} }
else else
{ {
news1ImageButton.setImageResource(R.drawable.transparent); //news1ImageButton.setImageResource(R.drawable.transparent);
news1Button.setText(R.string.news_record_not_available); news1Button.setText(R.string.news_record_not_available);
news1ImageButton.setOnClickListener(null); //news1ImageButton.setOnClickListener(null);
news1Button.setOnClickListener(null); news1Button.setOnClickListener(null);
} }
if (newsJournal.articleArr.size() > 1) if (newsJournal.articleArr.size() > 1)
{ {
ImageManager.getInstance().ApplyImageToImageView(news2ImageButton, newsJournal.articleArr.get(1).previewImageUrl); //ImageManager.getInstance().ApplyImageToImageView(news2ImageButton, newsJournal.articleArr.get(1).previewImageUrl);
news2Button.setText(newsJournal.articleArr.get(1).title); news2Button.setText(newsJournal.articleArr.get(1).title);
news2ImageButton.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(1).name)); //news2ImageButton.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(1).name));
news2Button.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(1).name)); news2Button.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(1).name));
} }
else else
{ {
news2ImageButton.setImageResource(R.drawable.transparent); //news2ImageButton.setImageResource(R.drawable.transparent);
news2Button.setText(R.string.news_record_not_available); news2Button.setText(R.string.news_record_not_available);
news2ImageButton.setOnClickListener(null); //news2ImageButton.setOnClickListener(null);
news2Button.setOnClickListener(null); news2Button.setOnClickListener(null);
} }
if (newsJournal.articleArr.size() > 2) if (newsJournal.articleArr.size() > 2)
{ {
ImageManager.getInstance().ApplyImageToImageView(news3ImageButton, newsJournal.articleArr.get(2).previewImageUrl); //ImageManager.getInstance().ApplyImageToImageView(news3ImageButton, newsJournal.articleArr.get(2).previewImageUrl);
news3Button.setText(newsJournal.articleArr.get(2).title); news3Button.setText(newsJournal.articleArr.get(2).title);
news3ImageButton.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(2).name)); //news3ImageButton.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(2).name));
news3Button.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(2).name)); news3Button.setOnClickListener(new NewsButtonOnClickListener(newsJournal.articleArr.get(2).name));
} }
else else
{ {
news3ImageButton.setImageResource(R.drawable.transparent); //news3ImageButton.setImageResource(R.drawable.transparent);
news3Button.setText(R.string.news_record_not_available); news3Button.setText(R.string.news_record_not_available);
news3ImageButton.setOnClickListener(null); //news3ImageButton.setOnClickListener(null);
news3Button.setOnClickListener(null); news3Button.setOnClickListener(null);
} }
@ -364,7 +364,10 @@ public class MainPageFragment extends Fragment {
databaseGetJournalTask.cancel(false); databaseGetJournalTask.cancel(false);
databaseGetJournalTask = null; databaseGetJournalTask = null;
} }
MainActivity.getInstance().OpenNewsRecordScreen(articleName, MainActivity.TAG_FROM_MAINFRAGMENT_TO_NEWSRECORDFRAGMENT); //MainActivity.getInstance().OpenNewsRecordScreen(articleName, MainActivity.TAG_FROM_MAINFRAGMENT_TO_NEWSRECORDFRAGMENT);
MainActivity.getInstance().OpenArticleScreen(articleName, MainActivity.TAG_TO_MAINFRAGMENT);
} }
} }

11
android/src/fishrungames/bashgid/NewsListFragment.java
View File

@ -90,8 +90,9 @@ public class NewsListFragment extends Fragment
} }
else if (position > 0) else if (position > 0)
{ {
MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position-1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
MainActivity.getInstance().OpenNewsRecordScreen(journal.articleArr.get(position - 1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
//MainActivity.getInstance().OpenNewsRecordScreen(journal.articleArr.get(position - 1).name, MainActivity.TAG_FROM_NEWSLISTFRAGMENT_TO_NEWSRECORDFRAGMENT);
} }
} }
@ -214,7 +215,7 @@ public class NewsListFragment extends Fragment
View view; View view;
if (convertView == null) { // if it's not recycled, initialize some attributes if (convertView == null) { // if it's not recycled, initialize some attributes
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = inflater.inflate(R.layout.journal_element, null); view = inflater.inflate(R.layout.news_list_element, null);
} else { } else {
@ -229,7 +230,7 @@ public class NewsListFragment extends Fragment
dateTextView.setText(journal.articleArr.get(position).dateTime.toString()); dateTextView.setText(journal.articleArr.get(position).dateTime.toString());
ImageView imageView = (ImageView) view.findViewById(R.id.imageView); /*ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
if (journal.articleArr.get(position).previewImageUrl != null) if (journal.articleArr.get(position).previewImageUrl != null)
{ {
@ -241,7 +242,7 @@ public class NewsListFragment extends Fragment
else else
{ {
imageView.setImageResource(R.drawable.transparent); imageView.setImageResource(R.drawable.transparent);
} }*/
return view; return view;
} }

4
android/src/fishrungames/bashgid/OsmMapHolderFragment.java
View File

@ -136,6 +136,8 @@ public class OsmMapHolderFragment extends Fragment
ImageView image = (ImageView) dialogInnerView.findViewById(R.id.imageView); ImageView image = (ImageView) dialogInnerView.findViewById(R.id.imageView);
TextView textView = (TextView) dialogInnerView.findViewById(R.id.addressTextView); TextView textView = (TextView) dialogInnerView.findViewById(R.id.addressTextView);
TextView hintTextView = (TextView) dialogInnerView.findViewById(R.id.hintTextView);
Button button = (Button) dialogInnerView.findViewById(R.id.button); Button button = (Button) dialogInnerView.findViewById(R.id.button);
ImageManager.getInstance().ApplyImageToImageView(image, item.getSnippet()); ImageManager.getInstance().ApplyImageToImageView(image, item.getSnippet());
@ -146,6 +148,7 @@ public class OsmMapHolderFragment extends Fragment
textView.setText(address); textView.setText(address);
textView.setVisibility(View.VISIBLE); textView.setVisibility(View.VISIBLE);
hintTextView.setVisibility(View.VISIBLE);
final String copied_text = MainActivity.getInstance().getResources().getString(R.string.copied_text); final String copied_text = MainActivity.getInstance().getResources().getString(R.string.copied_text);
@ -180,6 +183,7 @@ public class OsmMapHolderFragment extends Fragment
} else } else
{ {
textView.setVisibility(View.GONE); textView.setVisibility(View.GONE);
hintTextView.setVisibility(View.GONE);
} }
if (item.phone.length() > 0) if (item.phone.length() > 0)

59
android/src/fishrungames/bashgid/SettingsFragment.java
View File

@ -1,11 +1,15 @@
package fishrungames.bashgid; package fishrungames.bashgid;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
public class SettingsFragment extends Fragment public class SettingsFragment extends Fragment
@ -16,7 +20,62 @@ public class SettingsFragment extends Fragment
View rootView = inflater.inflate(R.layout.fragment_settings_page, container, false); View rootView = inflater.inflate(R.layout.fragment_settings_page, container, false);
Button callSupportButton = (Button)rootView.findViewById(R.id.callSupportButton);
callSupportButton.setOnClickListener(new OnClickListener()
{
@Override
public void onClick(View v)
{
String uri = "tel:+79260492730";
Intent intent = new Intent(Intent.ACTION_DIAL);
intent.setData(Uri.parse(uri));
MainActivity.getInstance().startActivity(intent);
}
});
Button visitKitapButton = (Button)rootView.findViewById(R.id.visitKitapButton);
visitKitapButton.setOnClickListener(new OnClickListener()
{
@Override
public void onClick(View v)
{
Intent i = new Intent(Intent.ACTION_VIEW);
i.setData(Uri.parse("http://kitap-ufa.ru/"));
startActivity(i);
}
});
Button visitDeveloperButton = (Button)rootView.findViewById(R.id.visitDeveloperButton);
visitDeveloperButton.setOnClickListener(new OnClickListener()
{
@Override
public void onClick(View v)
{
Intent i = new Intent(Intent.ACTION_VIEW);
i.setData(Uri.parse("http://fishrungames.ru/"));
startActivity(i);
}
});
Button visitTranslatorButton = (Button)rootView.findViewById(R.id.visitTranslatorButton);
visitTranslatorButton.setOnClickListener(new OnClickListener()
{
@Override
public void onClick(View v)
{
Intent i = new Intent(Intent.ACTION_VIEW);
i.setData(Uri.parse("http://littlefoxlilia.ru/"));
startActivity(i);
}
});
return rootView; return rootView;
} }
} }

1
android/src/fishrungames/bashgid/core/ChannelManager.java
View File

@ -84,7 +84,6 @@ public class ChannelManager
} }
MainActivity.getInstance().albumDataSource.AddPhotoToAlbum(imageUrl, albumName); MainActivity.getInstance().albumDataSource.AddPhotoToAlbum(imageUrl, albumName);
} }
public static void DownloadAndAddPhotoToAlbum(PhotoRecordData recordData, String albumName) public static void DownloadAndAddPhotoToAlbum(PhotoRecordData recordData, String albumName)

42
android/src/fishrungames/bashgid/core/NewsManager.java
View File

@ -6,6 +6,7 @@ import fishrungames.networkutils.ImageManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.Locale;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import fishrungames.networkutils.DownloadFunctions; import fishrungames.networkutils.DownloadFunctions;
@ -16,17 +17,23 @@ import android.util.Log;
import fishrungames.bashgid.MainActivity; import fishrungames.bashgid.MainActivity;
import fishrungames.bashgid.R; import fishrungames.bashgid.R;
import fishrungames.bashgid.core.ArticleManager.ArticleRecordData; import fishrungames.bashgid.core.ArticleManager.ArticleRecordData;
import fishrungames.bashgid.core.TranslationManager.TranslationRecordData;
public class NewsManager { public class NewsManager {
/*
public static final String [] urlArr = { public static final String [] urlArr = {
"https://www.bashkortostan.ru/presscenter/news/rss/", "https://www.bashkortostan.ru/presscenter/news/rss/",
"http://www.bashedu.ru/rss.xml", "http://www.bashedu.ru/rss.xml",
"http://www.bashinform.ru/rss/all.xml", "http://www.bashinform.ru/rss/all.xml",
"http://www.minkult-rb.ru/news/rss/", "http://www.minkult-rb.ru/news/rss/",
"http://02.mvd.ru/news/rss/" "http://02.mvd.ru/news/rss/"
}; }; */
public static final String [] urlArr = {
"https://news.yandex.ru/Ufa/index.rss",
};
private static NewsManager instance = null; private static NewsManager instance = null;
@ -353,12 +360,18 @@ public class NewsManager {
for (RssReader.Rss2Item rss2Item : rssReader.rss2ItemArr) for (RssReader.Rss2Item rss2Item : rssReader.rss2ItemArr)
{ {
String title = rss2Item.title.replace("'", "''").replace("\"", "\"\"");
String description = rss2Item.description.replace("'", "''").replace("\"", "\"\"");
String titleUp = title.toUpperCase(new Locale("ru"));
String descriptionUp = description.toUpperCase(new Locale("ru"));
ArticleRecordData newsArticle = new ArticleRecordData( ArticleRecordData newsArticle = new ArticleRecordData(
rss2Item.title.replace("'", "''").replace("\"", "\"\""), title,
ArticleManager.ARTICLE_TYPE_NEWS, ArticleManager.ARTICLE_TYPE_NEWS,
rss2Item.title.replace("'", "''").replace("\"", "\"\""), title,
rss2Item.description.replace("'", "''").replace("\"", "\"\""), description,
0, 0,
0, 0,
"", "",
@ -369,6 +382,27 @@ public class NewsManager {
0); 0);
AlbumManager.AddNewArticleToJournal(newsArticle, "news"); AlbumManager.AddNewArticleToJournal(newsArticle, "news");
//To perform search
MainActivity.getInstance().translationDataSource.CreateNewTranslation(new TranslationRecordData(
title,
title, //En
title, //Ru
title, //Zh
titleUp, //En Up
titleUp, //Ru Up
titleUp //Zh Up
));
MainActivity.getInstance().translationDataSource.CreateNewTranslation(new TranslationRecordData(
description,
description, //En
description, //Ru
description, //Zh
descriptionUp, //En Up
descriptionUp, //Ru Up
descriptionUp //Zh Up
));
//newsRecordArr.add(newsArticle); //newsRecordArr.add(newsArticle);
} }

1
android/src/fishrungames/bashgid/core/db/AlbumDataSource.java
View File

@ -310,7 +310,6 @@ public class AlbumDataSource
{ {
result.add(cursor.getString(0)); result.add(cursor.getString(0));
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close(); cursor.close();

2
android/src/fishrungames/bashgid/core/db/PhotoDataSource.java
View File

@ -21,7 +21,7 @@ public class PhotoDataSource
this.dbHelper = dbHelper; this.dbHelper = dbHelper;
} }
public void AddOrReplacePhoto(PhotoRecordData recordData) public void AddOrReplacePhoto(PhotoRecordData recordData)
{ {
SQLiteDatabase database = dbHelper.getWritableDatabase(); SQLiteDatabase database = dbHelper.getWritableDatabase();