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

Moved I2PTunnel code into separate package

Browse Source
This commit is contained in:
str4d
2013-08-24 06:26:51 +00:00
parent 449627be3d
commit a00c08bb49
9 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml.in
View File

@ -69,13 +69,13 @@
<meta-data android:name="android.app.searchable" <meta-data android:name="android.app.searchable"
android:resource="@xml/searchable_addressbook"/> android:resource="@xml/searchable_addressbook"/>
</activity> </activity>
<activity android:name=".activity.I2PTunnelActivity" <activity android:name="net.i2p.android.i2ptunnel.activity.TunnelListActivity"
android:label="I2PTunnel" android:label="I2PTunnel"
android:launchMode="singleTop" > android:launchMode="singleTop" >
</activity> </activity>
<activity android:name=".activity.I2PTunnelDetailActivity" <activity android:name="net.i2p.android.i2ptunnel.activity.TunnelDetailActivity"
android:label="I2PTunnel" android:label="I2PTunnel"
android:parentActivityName=".activity.I2PTunnelActivity" > android:parentActivityName="net.i2p.android.i2ptunnel.activity.TunnelListActivity" >
</activity> </activity>
<activity android:name=".activity.LogActivity" <activity android:name=".activity.LogActivity"
android:label="I2P Logs" android:label="I2P Logs"

11
src/net/i2p/android/router/activity/I2PTunnelDetailActivity.java → src/net/i2p/android/i2ptunnel/activity/TunnelDetailActivity.java
View File

@ -1,18 +1,19 @@
package net.i2p.android.router.activity; package net.i2p.android.i2ptunnel.activity;
import net.i2p.android.i2ptunnel.fragment.TunnelDetailFragment;
import net.i2p.android.router.R; import net.i2p.android.router.R;
import net.i2p.android.router.fragment.I2PTunnelDetailFragment; import net.i2p.android.router.activity.I2PActivityBase;
import android.os.Bundle; import android.os.Bundle;
public class I2PTunnelDetailActivity extends I2PActivityBase { public class TunnelDetailActivity extends I2PActivityBase {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mDrawerToggle.setDrawerIndicatorEnabled(false); mDrawerToggle.setDrawerIndicatorEnabled(false);
if (savedInstanceState == null) { if (savedInstanceState == null) {
int tunnelId = getIntent().getIntExtra(I2PTunnelDetailFragment.TUNNEL_ID, 0); int tunnelId = getIntent().getIntExtra(TunnelDetailFragment.TUNNEL_ID, 0);
I2PTunnelDetailFragment detailFrag = I2PTunnelDetailFragment.newInstance(tunnelId); TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.add(R.id.main_fragment, detailFrag).commit(); .add(R.id.main_fragment, detailFrag).commit();
} }

25
src/net/i2p/android/router/activity/I2PTunnelActivity.java → src/net/i2p/android/i2ptunnel/activity/TunnelListActivity.java
View File

@ -1,15 +1,16 @@
package net.i2p.android.router.activity; package net.i2p.android.i2ptunnel.activity;
import net.i2p.android.i2ptunnel.fragment.TunnelDetailFragment;
import net.i2p.android.i2ptunnel.fragment.TunnelListFragment;
import net.i2p.android.router.R; import net.i2p.android.router.R;
import net.i2p.android.router.fragment.I2PTunnelDetailFragment; import net.i2p.android.router.activity.I2PActivityBase;
import net.i2p.android.router.fragment.I2PTunnelListFragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBar.Tab; import android.support.v7.app.ActionBar.Tab;
public class I2PTunnelActivity extends I2PActivityBase public class TunnelListActivity extends I2PActivityBase
implements I2PTunnelListFragment.OnTunnelSelectedListener { implements TunnelListFragment.OnTunnelSelectedListener {
/** /**
* Whether or not the activity is in two-pane mode, i.e. running on a tablet * Whether or not the activity is in two-pane mode, i.e. running on a tablet
* device. * device.
@ -30,9 +31,9 @@ public class I2PTunnelActivity extends I2PActivityBase
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
// Client tunnels tab // Client tunnels tab
I2PTunnelListFragment cf = new I2PTunnelListFragment(); TunnelListFragment cf = new TunnelListFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putBoolean(I2PTunnelListFragment.SHOW_CLIENT_TUNNELS, true); args.putBoolean(TunnelListFragment.SHOW_CLIENT_TUNNELS, true);
cf.setArguments(args); cf.setArguments(args);
Tab tab = actionBar.newTab() Tab tab = actionBar.newTab()
.setText(R.string.label_i2ptunnel_client) .setText(R.string.label_i2ptunnel_client)
@ -40,9 +41,9 @@ public class I2PTunnelActivity extends I2PActivityBase
actionBar.addTab(tab); actionBar.addTab(tab);
// Server tunnels tab // Server tunnels tab
I2PTunnelListFragment sf = new I2PTunnelListFragment(); TunnelListFragment sf = new TunnelListFragment();
args = new Bundle(); args = new Bundle();
args.putBoolean(I2PTunnelListFragment.SHOW_CLIENT_TUNNELS, false); args.putBoolean(TunnelListFragment.SHOW_CLIENT_TUNNELS, false);
sf.setArguments(args); sf.setArguments(args);
tab = actionBar.newTab() tab = actionBar.newTab()
.setText(R.string.label_i2ptunnel_server) .setText(R.string.label_i2ptunnel_server)
@ -70,14 +71,14 @@ public class I2PTunnelActivity extends I2PActivityBase
// In two-pane mode, show the detail view in this activity by // In two-pane mode, show the detail view in this activity by
// adding or replacing the detail fragment using a // adding or replacing the detail fragment using a
// fragment transaction. // fragment transaction.
I2PTunnelDetailFragment detailFrag = I2PTunnelDetailFragment.newInstance(tunnelId); TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(R.id.detail_fragment, detailFrag).commit(); .replace(R.id.detail_fragment, detailFrag).commit();
} else { } else {
// In single-pane mode, simply start the detail activity // In single-pane mode, simply start the detail activity
// for the selected item ID. // for the selected item ID.
Intent detailIntent = new Intent(this, I2PTunnelDetailActivity.class); Intent detailIntent = new Intent(this, TunnelDetailActivity.class);
detailIntent.putExtra(I2PTunnelDetailFragment.TUNNEL_ID, tunnelId); detailIntent.putExtra(TunnelDetailFragment.TUNNEL_ID, tunnelId);
startActivity(detailIntent); startActivity(detailIntent);
} }
} }

4
src/net/i2p/android/router/adapter/TunnelEntryAdapter.java → src/net/i2p/android/i2ptunnel/adapter/TunnelEntryAdapter.java
View File

@ -1,9 +1,9 @@
package net.i2p.android.router.adapter; package net.i2p.android.i2ptunnel.adapter;
import java.util.List; import java.util.List;
import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.router.R; import net.i2p.android.router.R;
import net.i2p.android.router.loader.TunnelEntry;
import android.content.Context; import android.content.Context;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

10
src/net/i2p/android/router/fragment/I2PTunnelDetailFragment.java → src/net/i2p/android/i2ptunnel/fragment/TunnelDetailFragment.java
View File

@ -1,7 +1,7 @@
package net.i2p.android.router.fragment; package net.i2p.android.i2ptunnel.fragment;
import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.router.R; import net.i2p.android.router.R;
import net.i2p.android.router.loader.TunnelEntry;
import net.i2p.i2ptunnel.TunnelControllerGroup; import net.i2p.i2ptunnel.TunnelControllerGroup;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
@ -10,13 +10,13 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
public class I2PTunnelDetailFragment extends Fragment { public class TunnelDetailFragment extends Fragment {
public static final String TUNNEL_ID = "tunnel_id"; public static final String TUNNEL_ID = "tunnel_id";
private TunnelEntry mTunnel; private TunnelEntry mTunnel;
public static I2PTunnelDetailFragment newInstance(int tunnelId) { public static TunnelDetailFragment newInstance(int tunnelId) {
I2PTunnelDetailFragment f = new I2PTunnelDetailFragment(); TunnelDetailFragment f = new TunnelDetailFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putInt(TUNNEL_ID, tunnelId); args.putInt(TUNNEL_ID, tunnelId);
f.setArguments(args); f.setArguments(args);

10
src/net/i2p/android/router/fragment/I2PTunnelListFragment.java → src/net/i2p/android/i2ptunnel/fragment/TunnelListFragment.java
View File

@ -1,11 +1,11 @@
package net.i2p.android.router.fragment; package net.i2p.android.i2ptunnel.fragment;
import java.util.List; import java.util.List;
import net.i2p.android.i2ptunnel.adapter.TunnelEntryAdapter;
import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.i2ptunnel.loader.TunnelEntryLoader;
import net.i2p.android.router.R; import net.i2p.android.router.R;
import net.i2p.android.router.adapter.TunnelEntryAdapter;
import net.i2p.android.router.loader.TunnelEntryLoader;
import net.i2p.android.router.loader.TunnelEntry;
import net.i2p.i2ptunnel.TunnelControllerGroup; import net.i2p.i2ptunnel.TunnelControllerGroup;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
@ -18,7 +18,7 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ListView; import android.widget.ListView;
public class I2PTunnelListFragment extends ListFragment public class TunnelListFragment extends ListFragment
implements LoaderManager.LoaderCallbacks<List<TunnelEntry>> { implements LoaderManager.LoaderCallbacks<List<TunnelEntry>> {
public static final String SHOW_CLIENT_TUNNELS = "show_client_tunnels"; public static final String SHOW_CLIENT_TUNNELS = "show_client_tunnels";

2
src/net/i2p/android/router/loader/TunnelEntry.java → src/net/i2p/android/i2ptunnel/loader/TunnelEntry.java
View File

@ -1,4 +1,4 @@
package net.i2p.android.router.loader; package net.i2p.android.i2ptunnel.loader;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;

2
src/net/i2p/android/router/loader/TunnelEntryLoader.java → src/net/i2p/android/i2ptunnel/loader/TunnelEntryLoader.java
View File

@ -1,4 +1,4 @@
package net.i2p.android.router.loader; package net.i2p.android.i2ptunnel.loader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

3
src/net/i2p/android/router/activity/I2PActivityBase.java
View File

@ -1,5 +1,6 @@
package net.i2p.android.router.activity; package net.i2p.android.router.activity;
import net.i2p.android.i2ptunnel.activity.TunnelListActivity;
import net.i2p.android.router.R; import net.i2p.android.router.R;
import net.i2p.android.router.fragment.I2PFragmentBase; import net.i2p.android.router.fragment.I2PFragmentBase;
import android.app.Activity; import android.app.Activity;
@ -128,7 +129,7 @@ public class I2PActivityBase extends ActionBarActivity {
startActivity(ab); startActivity(ab);
break; break;
case 2: case 2:
Intent itb = new Intent(I2PActivityBase.this, I2PTunnelActivity.class); Intent itb = new Intent(I2PActivityBase.this, TunnelListActivity.class);
startActivity(itb); startActivity(itb);
break; break;
case 3: case 3: