I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit cd315703 authored by str4d's avatar str4d
Browse files

Fragmented LicenseActivity, turned TextResourceFragment into a DialogFragment

parent 9359c7a7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 77 additions and 48 deletions
res/layout/activity_addressbook.xml → res/layout/fragment_listview.xml
+ 1
− 1
View file @ cd315703
<?xml version="1.0" encoding="utf-8"?>
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/addressbook_list"
android:id="@+id/listview"
android:layout_width="match_parent"
android:layout_height="match_parent" >
......
src/net/i2p/android/router/activity/LicenseActivity.java
+ 11
− 38
View file @ cd315703
package net.i2p.android.router.activity;
import android.app.ListActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import net.i2p.android.router.R;
import net.i2p.android.router.fragment.TextResourceFragment;
public class LicenseActivity extends ListActivity {
private static final String[] names = {
"Android Application License", "Apache 2.0",
"Router License Overview", "Blockfile", "Crypto Filters", "ElGamal / DSA",
"GPLv2", "LGPLv2.1", "GPLv3", "LGPLv3", "FatCowIcons",
"Ministreaming",
"InstallCert", "SHA-256", "SNTP", "Addressbook"};
private static final int[] files = {
R.raw.license_app_txt, R.raw.license_apache20_txt,
R.raw.licenses_txt, R.raw.license_blockfile_txt, R.raw.license_bsd_txt, R.raw.license_elgamaldsa_txt,
R.raw.license_gplv2_txt, R.raw.license_lgplv2_1_txt, R.raw.license_gplv3_txt, R.raw.license_lgplv3_txt,
R.raw.license_fatcowicons_txt, R.raw.license_bsd_txt,
R.raw.license_installcert_txt, R.raw.license_sha256_txt, R.raw.license_sntp_txt, R.raw.license_addressbook_txt};
import net.i2p.android.router.fragment.LicenseFragment;
import android.os.Bundle;
public class LicenseActivity extends I2PActivityBase {
@Override
public void onCreate(Bundle savedInstanceState)
{
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, names));
ListView lv = getListView();
// set the callback
lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView parent, View view, int pos, long id) {
Intent intent = new Intent(view.getContext(), TextResourceFragment.class);
intent.putExtra(TextResourceFragment.TEXT_RESOURCE_ID, files[pos]);
startActivity(intent);
}
});
// Start with the base view
if (savedInstanceState == null) {
LicenseFragment f = new LicenseFragment();
f.setArguments(getIntent().getExtras());
getSupportFragmentManager().beginTransaction()
.add(R.id.main_content, f).commit();
}
}
}
src/net/i2p/android/router/fragment/AddressbookFragment.java
+ 2
− 2
View file @ cd315703
......@@ -35,7 +35,7 @@ public class AddressbookFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.activity_addressbook, container, false);
View v = inflater.inflate(R.layout.fragment_listview, container, false);
// Grab context if router has started, otherwise create new
// FIXME dup contexts, locking, ...
......@@ -62,7 +62,7 @@ public class AddressbookFragment extends Fragment {
tv.setText("1 host in address book.");
else
tv.setText("No hosts in address book, or your router is not up.");
ListView lv = (ListView) v.findViewById(R.id.addressbook_list);
ListView lv = (ListView) v.findViewById(R.id.listview);
lv.addHeaderView(tv, "", false);
// set the list
......
src/net/i2p/android/router/fragment/LicenseFragment.java 0 → 100644
+ 51
− 0
View file @ cd315703
package net.i2p.android.router.fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import net.i2p.android.router.R;
public class LicenseFragment extends Fragment {
private static final String[] names = {
"Android Application License", "Apache 2.0",
"Router License Overview", "Blockfile", "Crypto Filters", "ElGamal / DSA",
"GPLv2", "LGPLv2.1", "GPLv3", "LGPLv3", "FatCowIcons",
"Ministreaming",
"InstallCert", "SHA-256", "SNTP", "Addressbook"};
private static final int[] files = {
R.raw.license_app_txt, R.raw.license_apache20_txt,
R.raw.licenses_txt, R.raw.license_blockfile_txt, R.raw.license_bsd_txt, R.raw.license_elgamaldsa_txt,
R.raw.license_gplv2_txt, R.raw.license_lgplv2_1_txt, R.raw.license_gplv3_txt, R.raw.license_lgplv3_txt,
R.raw.license_fatcowicons_txt, R.raw.license_bsd_txt,
R.raw.license_installcert_txt, R.raw.license_sha256_txt, R.raw.license_sntp_txt, R.raw.license_addressbook_txt};
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_listview, container, false);
ListView lv = (ListView) v.findViewById(R.id.listview);
lv.setAdapter(new ArrayAdapter<String>(getActivity(), android.R.layout.simple_list_item_1, names));
// set the callback
lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView parent, View view, int pos, long id) {
TextResourceDialog dialog = new TextResourceDialog();
Bundle args = new Bundle();
args.putString(TextResourceDialog.TEXT_DIALOG_TITLE, names[pos]);
args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, files[pos]);
dialog.setArguments(args);
dialog.show(getActivity().getSupportFragmentManager(), "license");
}
});
return v;
}
}
src/net/i2p/android/router/fragment/MainFragment.java
+ 2
− 2
View file @ cd315703
......@@ -74,9 +74,9 @@ public class MainFragment extends I2PFragmentBase {
b.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
TextResourceFragment f = new TextResourceFragment();
TextResourceDialog f = new TextResourceDialog();
Bundle args = new Bundle();
args.putInt(TextResourceFragment.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
f.setArguments(args);
getActivity().getSupportFragmentManager()
.beginTransaction()
......
src/net/i2p/android/router/fragment/TextResourceFragment.java → src/net/i2p/android/router/fragment/TextResourceDialog.java
+ 6
− 1
View file @ cd315703
......@@ -2,6 +2,7 @@ package net.i2p.android.router.fragment;
import android.content.res.Resources;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.text.method.ScrollingMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
......@@ -18,8 +19,9 @@ import net.i2p.android.router.util.Util;
* Display a raw text resource.
* The resource ID must be passed as an extra in the intent.
*/
public class TextResourceFragment extends I2PFragmentBase {
public class TextResourceDialog extends DialogFragment {
public static final String TEXT_DIALOG_TITLE = "text_title";
public final static String TEXT_RESOURCE_ID = "text_resource_id";
@Override
......@@ -29,6 +31,9 @@ public class TextResourceFragment extends I2PFragmentBase {
View v = inflater.inflate(R.layout.text_resource, container, false);
TextView tv = (TextView) v.findViewById(R.id.text_resource_text);
tv.setMovementMethod(ScrollingMovementMethod.getInstance());
String title = getArguments().getString(TEXT_DIALOG_TITLE);
if (title != null)
getDialog().setTitle(title);
int id = getArguments().getInt(TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
if (id == R.raw.releasenotes_txt)
tv.setText("Release Notes for Release " + Util.getOurVersion(getActivity()) + "\n\n" +
......
src/net/i2p/android/router/fragment/VersionDialog.java
+ 4
− 4
View file @ cd315703
......@@ -65,9 +65,9 @@ public class VersionDialog extends DialogFragment {
.findFragmentById(R.id.main_content);
fb.setPref(MainFragment.PREF_INSTALLED_VERSION, currentVersion);
dialog.cancel();
TextResourceFragment f = new TextResourceFragment();
TextResourceDialog f = new TextResourceDialog();
Bundle args = new Bundle();
args.putInt(TextResourceFragment.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
f.setArguments(args);
getActivity().getSupportFragmentManager()
.beginTransaction()
......@@ -116,9 +116,9 @@ public class VersionDialog extends DialogFragment {
dialog.dismiss();
} catch(Exception e) {
}
TextResourceFragment f = new TextResourceFragment();
TextResourceDialog f = new TextResourceDialog();
Bundle args = new Bundle();
args.putInt(TextResourceFragment.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
f.setArguments(args);
getActivity().getSupportFragmentManager()
.beginTransaction()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]