Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Attach fragment to activity

Browse source
This commit is contained in:
Victor Shcherb 2015-11-07 19:27:02 +01:00
parent c376f0600e
commit f4bd925867
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
View file

@ -23,7 +23,9 @@ import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -31,13 +33,16 @@ import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ExpandableListView; import android.widget.ExpandableListView;
import android.widget.FrameLayout;
import android.widget.FrameLayout.LayoutParams;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
public class HelpActivity extends OsmandActionBarActivity { public class HelpActivity extends OsmandActionBarActivity {
public static final String DIALOG = "dialog"; // public static final String DIALOG = "dialog";
public static final int DIALOG = 5;
final static HelpMenuCategory[] categories = HelpMenuCategory.values(); final static HelpMenuCategory[] categories = HelpMenuCategory.values();
public static final String OSMAND_POLL_HTML = "http://osmand.net/android-poll.html"; public static final String OSMAND_POLL_HTML = "http://osmand.net/android-poll.html";
public static final String OSMAND_MAP_LEGEND = "http://osmand.net/help/map-legend_default.png"; public static final String OSMAND_MAP_LEGEND = "http://osmand.net/help/map-legend_default.png";
@ -45,9 +50,18 @@ public class HelpActivity extends OsmandActionBarActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (getSupportFragmentManager().findFragmentByTag(DIALOG) == null) { FrameLayout frame = new FrameLayout(this);
new HelpScreenDialogFragment().show(getSupportFragmentManager(), DIALOG); frame.setId(DIALOG);
setContentView(frame, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
if (savedInstanceState == null) {
Fragment newFragment = new HelpScreenDialogFragment();
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.add(DIALOG, newFragment).commit();
} }
// if (getSupportFragmentManager().findFragmentByTag(DIALOG) == null) {
// new HelpScreenDialogFragment().show(getSupportFragmentManager(), DIALOG);
// }
} }
public static class HelpScreenDialogFragment extends DialogFragment implements ExpandableListView.OnChildClickListener { public static class HelpScreenDialogFragment extends DialogFragment implements ExpandableListView.OnChildClickListener {