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 2015-07-08 00:11:08 +00:00
parent 10e10d5814
commit b876b7b58e
23 changed files with 253 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fishrungames.bashgid" package="fishrungames.bashgid"
android:versionCode="4" android:versionCode="9"
android:versionName="1.03" > android:versionName="1.08" >
<uses-feature <uses-feature
android:glEsVersion="0x00020000" android:glEsVersion="0x00020000"

3
android/res/layout/article_text_element.xml
View File

@ -11,6 +11,7 @@
android:id="@+id/dateTextView" android:id="@+id/dateTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextView" /> android:text="TextView"
android:textSize="@dimen/article_content_text_size" />
</LinearLayout> </LinearLayout>

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

5
android/res/layout/fragment_grid_page.xml
View File

@ -2,6 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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:background="@color/bkg2"
android:orientation="vertical" > android:orientation="vertical" >
<ProgressBar <ProgressBar
@ -12,7 +15,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:indeterminate="true" /> android:indeterminate="true" />
<GridView <fishrungames.bashgid.StaticGridView
android:id="@+id/gridView" android:id="@+id/gridView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

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

@ -12,6 +12,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bkg2"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView

217
android/res/layout/fragment_welcome.xml
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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -7,117 +7,118 @@
android:padding="@dimen/large_margin" android:padding="@dimen/large_margin"
tools:context="fishrungames.bashgid.WelcomeFragment" > 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 <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <ImageView
android:id="@+id/textView1" android:id="@+id/logo_view"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/logo_height"
android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/logo_margin_top"
android:text="@string/lang_english" android:contentDescription="@string/RB_Coat"
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: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>
<LinearLayout </ScrollView>
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>

4
android/res/layout/grid_page_list_element.xml
View File

@ -9,7 +9,7 @@
android:orientation="vertical" android:orientation="vertical"
android:showDividers="middle" > android:showDividers="middle" >
<ImageView <fishrungames.bashgid.SquareImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -25,7 +25,7 @@
android:layout_gravity="clip_vertical" android:layout_gravity="clip_vertical"
android:layout_margin="@dimen/medium_margin" android:layout_margin="@dimen/medium_margin"
android:text="dsdsd" android:text="dsdsd"
android:textSize="@dimen/large_text_size" android:textSize="@dimen/small_text_size"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>

2
android/res/layout/main_page_header.xml
View File

@ -51,7 +51,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:background="@drawable/transparent" android:background="@color/button_default"
android:src="@drawable/ic_action_refresh" /> android:src="@drawable/ic_action_refresh" />
</LinearLayout> </LinearLayout>

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

@ -27,7 +27,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:background="@drawable/transparent" android:background="@color/button_default"
android:src="@drawable/ic_action_refresh" /> android:src="@drawable/ic_action_refresh" />
</LinearLayout> </LinearLayout>

2
android/res/layout/news_page_list_header.xml
View File

@ -28,7 +28,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:background="@drawable/transparent" android:background="@color/button_default"
android:src="@drawable/ic_action_refresh" /> android:src="@drawable/ic_action_refresh" />
</LinearLayout> </LinearLayout>

20
android/res/values-large/dimens.xml
View File

@ -27,29 +27,11 @@
<dimen name="small_margin">4dp</dimen> <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_horizontal_spacing">12dp</dimen>
<dimen name="grid_view_vertical_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> <dimen name="logo_margin_top">24dp</dimen>

18
android/res/values-normal/dimens.xml
View File

@ -27,29 +27,13 @@
<dimen name="small_margin">4dp</dimen> <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_horizontal_spacing">12dp</dimen>
<dimen name="grid_view_vertical_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> <dimen name="logo_margin_top">24dp</dimen>

18
android/res/values-small/dimens.xml
View File

@ -26,27 +26,13 @@
<dimen name="small_margin">4dp</dimen> <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_horizontal_spacing">12dp</dimen>
<dimen name="grid_view_vertical_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> <dimen name="logo_margin_top">24dp</dimen>

17
android/res/values-xlarge/dimens.xml
View File

@ -27,21 +27,6 @@
<dimen name="small_margin">4dp</dimen> <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_horizontal_spacing">12dp</dimen>
<dimen name="grid_view_vertical_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> <dimen name="logo_margin_top">24dp</dimen>

11
android/res/values/dimens.xml
View File

@ -27,8 +27,8 @@
<dimen name="small_margin">4dp</dimen> <dimen name="small_margin">4dp</dimen>
<dimen name="xxlarge_text_size">40sp</dimen> <dimen name="xxlarge_text_size">36sp</dimen>
<dimen name="xlarge_text_size">30sp</dimen> <dimen name="xlarge_text_size">24sp</dimen>
<dimen name="large_text_size">24sp</dimen> <dimen name="large_text_size">24sp</dimen>
@ -38,10 +38,9 @@
<dimen name="xsmall_text_size">14sp</dimen> <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">24sp</dimen>
<dimen name="article_content_text_size">20sp</dimen>
@ -49,7 +48,7 @@
<dimen name="grid_view_horizontal_spacing">12dp</dimen> <dimen name="grid_view_horizontal_spacing">12dp</dimen>
<dimen name="grid_view_vertical_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> <dimen name="logo_margin_top">24dp</dimen>

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

@ -330,11 +330,17 @@ public class ArticleFragment extends Fragment
View view; View view;
if (convertView == null) if (convertView == null)
{ // if it's not recycled, initialize some attributes { // if it's not recycled, initialize some attributes
if (getItemViewType(position) == 0 || getItemViewType(position) == 1) if (getItemViewType(position) == 0)
{
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = inflater.inflate(R.layout.article_title_element, null);
}
else if (getItemViewType(position) == 1)
{ {
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = inflater.inflate(R.layout.article_text_element, null); view = inflater.inflate(R.layout.article_text_element, null);
} else if (getItemViewType(position) == 2) }
else if (getItemViewType(position) == 2)
{ {
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = inflater.inflate(R.layout.article_photo_element, null); view = inflater.inflate(R.layout.article_photo_element, null);
@ -366,16 +372,17 @@ public class ArticleFragment extends Fragment
textView.setText(articleLayout.get(position).value); textView.setText(articleLayout.get(position).value);
/*
if (article.type == ArticleManager.ARTICLE_TYPE_NEWS) if (article.type == ArticleManager.ARTICLE_TYPE_NEWS)
{ {
textView.setTextSize(getResources().getDimension(R.dimen.large_text_size)); textView.setTextSize(getResources().getDimension(R.dimen.large_text_size));
} else } else
{ {
textView.setTextSize(getResources().getDimension(R.dimen.xlarge_text_size)); textView.setTextSize(getResources().getDimension(R.dimen.xlarge_text_size));
} }*/
textView.setTypeface(null, Typeface.BOLD); //textView.setTypeface(null, Typeface.BOLD);
textView.setGravity(Gravity.CENTER_HORIZONTAL); //textView.setGravity(Gravity.CENTER_HORIZONTAL);
} else if (getItemViewType(position) == 1) } else if (getItemViewType(position) == 1)
{ {
@ -383,9 +390,9 @@ public class ArticleFragment extends Fragment
textView.setText(articleLayout.get(position).value); textView.setText(articleLayout.get(position).value);
textView.setTextSize(getResources().getDimension(R.dimen.article_content_text_size)); //textView.setTextSize(getResources().getDimension(R.dimen.article_content_text_size));
textView.setTypeface(null, Typeface.NORMAL); //textView.setTypeface(null, Typeface.NORMAL);
textView.setGravity(Gravity.LEFT); //textView.setGravity(Gravity.LEFT);
} else if (getItemViewType(position) == 2) } else if (getItemViewType(position) == 2)
{ {

22
android/src/fishrungames/bashgid/BashgidApplication.java
View File

@ -325,11 +325,30 @@ public class BashgidApplication extends android.app.Application {
} }
public static void DownloadDatabase() public static void DownloadDatabase()
{
if (databaseDownloadTask == null)
{
if (MainActivity.getInstance() != null)
{
if (!MainActivity.getInstance().databaseAlreadyLoaded)
{
ForceDownloadDatabase();
MainActivity.getInstance().databaseAlreadyLoaded = true;
}
}
}
}
public static void ForceDownloadDatabase()
{ {
if (databaseDownloadTask != null) if (databaseDownloadTask != null)
{ {
return; CancelDownloadDatabaseTask();
} }
databaseDownloadTask = new DatabaseDownloadTask(); databaseDownloadTask = new DatabaseDownloadTask();
@ -520,6 +539,7 @@ public class BashgidApplication extends android.app.Application {
return settings.getInt("lastLanguage", 0); return settings.getInt("lastLanguage", 0);
} }
public static String DateFormattedForLocale(Date date) public static String DateFormattedForLocale(Date date)
{ {
return DateUtils.formatDateTime(instance, date.getTime(), DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_YEAR); return DateUtils.formatDateTime(instance, date.getTime(), DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_YEAR);

2
android/src/fishrungames/bashgid/CatalogFragment.java
View File

@ -189,7 +189,7 @@ public class CatalogFragment extends Fragment
HListView hListView = (HListView) view.findViewById(R.id.hListView); HListView hListView = (HListView) view.findViewById(R.id.hListView);
hListView.setAdapter(new MainPageHListViewAdapters.JournalElementAdapter(getActivity(), journalList.get(position))); hListView.setAdapter(new MainPageHListViewAdapters.JournalElementAdapter(getActivity(), journalList.get(position), MainActivity.TAG_BACK_TO_CATALOGFRAGMENT));
textView.setText(journalList.get(position).title); textView.setText(journalList.get(position).title);

47
android/src/fishrungames/bashgid/MainActivity.java
View File

@ -79,6 +79,8 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
private int postnotedDrawerSelection = 0; private int postnotedDrawerSelection = 0;
public boolean databaseAlreadyLoaded = false;
@Override @Override
protected void onCreate(Bundle savedInstanceState) protected void onCreate(Bundle savedInstanceState)
{ {
@ -433,6 +435,11 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenMainScreen(boolean fromSavedInstanceState) public void OpenMainScreen(boolean fromSavedInstanceState)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(1);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
mainPageFragment = new MainPageFragment(); mainPageFragment = new MainPageFragment();
@ -447,11 +454,15 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
} }
mNavigationDrawerFragment.EnableDrawer(); mNavigationDrawerFragment.EnableDrawer();
} }
public void OpenNewsScreen(boolean fromSavedInstanceState) public void OpenNewsScreen(boolean fromSavedInstanceState)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(2);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
@ -475,6 +486,11 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenCatalogScreen(boolean fromSavedInstanceState) public void OpenCatalogScreen(boolean fromSavedInstanceState)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(3);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
@ -488,6 +504,11 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenJournalScreen(boolean fromSavedInstanceState, String journalName, String tag) public void OpenJournalScreen(boolean fromSavedInstanceState, String journalName, String tag)
{ {
if (mNavigationDrawerFragment != null && journalName.equals("investor"))
{
mNavigationDrawerFragment.selectItemWithoutCall(7);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
@ -500,6 +521,12 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenSettingsScreen(boolean fromSavedInstanceState) public void OpenSettingsScreen(boolean fromSavedInstanceState)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(8);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
@ -562,6 +589,10 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenMapScreen(boolean fromSavedInstanceState, String filter, String tag) public void OpenMapScreen(boolean fromSavedInstanceState, String filter, String tag)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(4);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
mapHolderFragment = new OsmMapHolderFragment(0, filter); mapHolderFragment = new OsmMapHolderFragment(0, filter);
@ -572,6 +603,10 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenMapScreen(ArticleFullData articleFullData, String tag) public void OpenMapScreen(ArticleFullData articleFullData, String tag)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(4);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
mapHolderFragment = new OsmMapHolderFragment(articleFullData); mapHolderFragment = new OsmMapHolderFragment(articleFullData);
@ -582,6 +617,11 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenPhotoAlbumListScreen(boolean fromSavedInstanceState) public void OpenPhotoAlbumListScreen(boolean fromSavedInstanceState)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(6);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
albumListFragment = new AlbumListFragment(); albumListFragment = new AlbumListFragment();
@ -638,6 +678,11 @@ public class MainActivity extends ActionBarActivity implements NavigationDrawerF
public void OpenVideoListScreen(boolean fromSavedInstanceState, String channelName) public void OpenVideoListScreen(boolean fromSavedInstanceState, String channelName)
{ {
if (mNavigationDrawerFragment != null)
{
mNavigationDrawerFragment.selectItemWithoutCall(5);
}
ClearAllFragmentLinks(); ClearAllFragmentLinks();
videoListFragment = new VideoListFragment(channelName); videoListFragment = new VideoListFragment(channelName);

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

@ -132,7 +132,7 @@ public class MainPageFragment extends Fragment
public void onClick(View v) public void onClick(View v)
{ {
BashgidApplication.CancelDownloadDatabaseTask(); BashgidApplication.CancelDownloadDatabaseTask();
BashgidApplication.DownloadDatabase(); BashgidApplication.ForceDownloadDatabase();
} }
}); });
@ -384,7 +384,7 @@ public class MainPageFragment extends Fragment
HListView hListView = (HListView) view.findViewById(R.id.hListView); HListView hListView = (HListView) view.findViewById(R.id.hListView);
hListView.setAdapter(new MainPageHListViewAdapters.JournalElementAdapter(getActivity(), journalList.get(position))); hListView.setAdapter(new MainPageHListViewAdapters.JournalElementAdapter(getActivity(), journalList.get(position), MainActivity.TAG_BACK_TO_MAINFRAGMENT));
textView.setText(journalList.get(position).title); textView.setText(journalList.get(position).title);

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

@ -25,7 +25,7 @@ public class MainPageHListViewAdapters
private Context mContext; private Context mContext;
AlbumFullData albumFullData; AlbumFullData albumFullData;
public PhotoAlbumElementAdapter(Context c, AlbumFullData albumFullData) public PhotoAlbumElementAdapter(Context c, AlbumFullData albumFullData)
{ {
this.mContext = c; this.mContext = c;
@ -82,11 +82,15 @@ public class MainPageHListViewAdapters
private Context mContext; private Context mContext;
JournalSemiFullData journal; JournalSemiFullData journal;
String tag;
public JournalElementAdapter(Context c, JournalSemiFullData journal)
public JournalElementAdapter(Context c, JournalSemiFullData journal, String tag)
{ {
this.mContext = c; this.mContext = c;
this.journal = journal; this.journal = journal;
this.tag = tag;
} }
@ -142,8 +146,7 @@ public class MainPageHListViewAdapters
@Override @Override
public void onClick(View v) public void onClick(View v)
{ {
MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position).name, MainActivity.getInstance().OpenArticleScreen(journal.articleArr.get(position).name, tag);
MainActivity.TAG_BACK_TO_MAINFRAGMENT);
} }
}); });

9
android/src/fishrungames/bashgid/NavigationDrawerFragment.java
View File

@ -273,6 +273,15 @@ public class NavigationDrawerFragment extends Fragment
mCallbacks.onNavigationDrawerItemSelected(position, true); mCallbacks.onNavigationDrawerItemSelected(position, true);
} }
} }
public void selectItemWithoutCall(int position)
{
mCurrentSelectedPosition = position;
if (mDrawerListView != null)
{
mDrawerListView.setItemChecked(position, true);
}
}
@Override @Override
public void onAttach(Activity activity) public void onAttach(Activity activity)

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

@ -116,24 +116,12 @@ public class VideoListFragment extends Fragment
public void OnDatabaseDonwloadProgress(Integer percent) public void OnDatabaseDonwloadProgress(Integer percent)
{ {
/*
databaseDownloadProgressBar.setProgress(percent);
if (percent >= 100)
{
databaseDownloadProgressBar.setVisibility(View.GONE);
}
else
{
databaseDownloadProgressBar.setVisibility(View.VISIBLE);
}
*/
if (databaseGetChannelTask == null || percent == 100) if (databaseGetChannelTask == null || percent == 100)
{ {
RestoreChannel(); RestoreChannel();
} }
//SetJournalList(r.journalList);
} }
void RestoreChannel() void RestoreChannel()
@ -245,9 +233,6 @@ public class VideoListFragment extends Fragment
ImageView imageView = (ImageView)view.findViewById(R.id.imageView); ImageView imageView = (ImageView)view.findViewById(R.id.imageView);
TextView nameTextView = (TextView) view.findViewById(R.id.nameTextView); TextView nameTextView = (TextView) view.findViewById(R.id.nameTextView);
//ImageManager.getInstance().ApplyImageToImageView(imageView, channelFullData.videoRecordArr.get(position).previewImageUrl);
if (channelFullData.videoRecordArr.get(position) != null) if (channelFullData.videoRecordArr.get(position) != null)
{ {