I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Hide Help page until it is finished

Browse Source
This commit is contained in:
str4d
2014-04-07 22:48:40 +00:00
parent ccd5ae45df
commit 7218b79643
8 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/menu/activity_base_actions.xml
View File

@ -5,8 +5,9 @@
android:icon="@android:drawable/ic_menu_preferences"
i2pandroid:showAsAction="never" >
</item>
<!-- Hide for now
<item android:title="@string/menu_help"
android:id="@+id/menu_help"
i2pandroid:showAsAction="never" >
</item>
</item> -->
</menu>

7
res/menu/activity_main_actions.xml
View File

@ -4,4 +4,11 @@
android:id="@+id/menu_about"
i2pandroid:showAsAction="never" >
</item>
<!-- Show directly here for now -->
<item android:id="@+id/menu_help_licenses"
android:title="@string/label_licenses"
i2pandroid:showAsAction="never" />
<item android:id="@+id/menu_help_release_notes"
android:title="@string/label_release_notes"
i2pandroid:showAsAction="never" />
</menu>

3
res/menu/fragment_addressbook_actions.xml
View File

@ -13,7 +13,8 @@
<item android:id="@+id/action_addressbook_settings"
android:title="@string/menu_settings"
i2pandroid:showAsAction="never" />
<!-- Hide for now
<item android:id="@+id/action_addressbook_help"
android:title="@string/menu_help"
i2pandroid:showAsAction="never" />
i2pandroid:showAsAction="never" /> -->
</menu>

3
res/menu/fragment_i2ptunnel_list_actions.xml
View File

@ -14,8 +14,9 @@
<item android:id="@+id/action_restart_all_tunnels"
android:title="@string/action_i2ptunnel_restart_all"
i2pandroid:showAsAction="never" />
<!-- Hide for now
<item android:id="@+id/action_i2ptunnel_help"
android:title="@string/menu_help"
i2pandroid:showAsAction="never" />
i2pandroid:showAsAction="never" /> -->
</menu>

11
src/net/i2p/android/i2ptunnel/TunnelListFragment.java
View File

@ -187,11 +187,12 @@ public class TunnelListFragment extends ListFragment implements
case R.id.action_restart_all_tunnels:
msgs = mGroup.restartAllControllers();
break;
case R.id.action_i2ptunnel_help:
Intent hi = new Intent(getActivity(), HelpActivity.class);
hi.putExtra(HelpActivity.REFERRER, "i2ptunnel");
startActivity(hi);
return true;
// TODO: Enable when Help page finished
//case R.id.action_i2ptunnel_help:
// Intent hi = new Intent(getActivity(), HelpActivity.class);
// hi.putExtra(HelpActivity.REFERRER, "i2ptunnel");
// startActivity(hi);
// return true;
default:
return super.onOptionsItemSelected(item);
}

25
src/net/i2p/android/router/MainActivity.java
View File

@ -15,6 +15,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import net.i2p.android.router.R;
import net.i2p.android.router.dialog.AboutDialog;
import net.i2p.android.router.dialog.TextResourceDialog;
import net.i2p.android.router.service.IRouterState;
import net.i2p.android.router.service.IRouterStateCallback;
import net.i2p.android.router.service.RouterService;
@ -91,10 +92,26 @@ public class MainActivity extends I2PActivityBase implements
dialog.show(getSupportFragmentManager(), "about");
return true;
case R.id.menu_help:
Intent hi = new Intent(MainActivity.this, HelpActivity.class);
hi.putExtra(HelpActivity.REFERRER, "main");
startActivity(hi);
// TODO: Unhide when Help page finished
//case R.id.menu_help:
// Intent hi = new Intent(MainActivity.this, HelpActivity.class);
// hi.putExtra(HelpActivity.REFERRER, "main");
// startActivity(hi);
// return true;
// TODO: Remove when help page finished
case R.id.menu_help_licenses:
Intent lic = new Intent(MainActivity.this, LicenseActivity.class);
startActivity(lic);
return true;
case R.id.menu_help_release_notes:
TextResourceDialog rDdialog = new TextResourceDialog();
Bundle args = new Bundle();
args.putString(TextResourceDialog.TEXT_DIALOG_TITLE,
getResources().getString(R.string.label_release_notes));
args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
rDdialog.setArguments(args);
rDdialog.show(getSupportFragmentManager(), "release_notes");
return true;
default:

11
src/net/i2p/android/router/addressbook/AddressbookFragment.java
View File

@ -180,11 +180,12 @@ public class AddressbookFragment extends ListFragment implements
Intent si = new Intent(getActivity(), AddressbookSettingsActivity.class);
startActivity(si);
return true;
case R.id.action_addressbook_help:
Intent hi = new Intent(getActivity(), HelpActivity.class);
hi.putExtra(HelpActivity.REFERRER, "addressbook");
startActivity(hi);
return true;
// TODO: Enable when Help page finished
//case R.id.action_addressbook_help:
// Intent hi = new Intent(getActivity(), HelpActivity.class);
// hi.putExtra(HelpActivity.REFERRER, "addressbook");
// startActivity(hi);
// return true;
default:
return super.onOptionsItemSelected(item);
}

3
src/net/i2p/android/router/log/LogActivity.java
View File

@ -78,7 +78,8 @@ public class LogActivity extends I2PActivityBase implements
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.activity_base_actions, menu);
// Help menu not needed (yet), hide
menu.findItem(R.id.menu_help).setVisible(false);
// TODO: Unhide when Help finished
//menu.findItem(R.id.menu_help).setVisible(false);
return super.onCreateOptionsMenu(menu);
}