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

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

Moved licenses button into nav drawer

Temporary; will eventually be in an about menu in settings
parent cd315703
No related branches found
No related tags found
No related merge requests found
...@@ -115,13 +115,6 @@ ...@@ -115,13 +115,6 @@
android:text="@string/label_release_notes" android:text="@string/label_release_notes"
android:drawableLeft="@drawable/information_icon" /> android:drawableLeft="@drawable/information_icon" />
<Button
android:id="@+id/licenses_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/label_licenses"
android:drawableLeft="@drawable/information_icon" />
<TextView <TextView
android:id="@+id/textView5" android:id="@+id/textView5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<resources> <resources>
<string-array name="navdrawer_activities">
<item>net.i2p.android.router.activity.MainActivity</item>
<item>net.i2p.android.router.activity.AddressbookActivity</item>
</string-array>
<string-array name="navdrawer_activity_titles"> <string-array name="navdrawer_activity_titles">
<item>@string/label_home</item> <item>@string/label_home</item>
<item>@string/label_addressbook</item> <item>@string/label_addressbook</item>
<item>@string/label_licenses</item>
</string-array> </string-array>
<string-array name="setting0to3"> <string-array name="setting0to3">
<item>0</item> <item>0</item>
......
...@@ -25,9 +25,10 @@ public class I2PActivityBase extends ActionBarActivity { ...@@ -25,9 +25,10 @@ public class I2PActivityBase extends ActionBarActivity {
private CharSequence mDrawerTitle; private CharSequence mDrawerTitle;
private CharSequence mTitle; private CharSequence mTitle;
private final Class[] mActivities = { private static final Class[] mActivities = {
MainActivity.class, MainActivity.class,
AddressbookActivity.class AddressbookActivity.class,
LicenseActivity.class,
}; };
private String[] mActivityTitles; private String[] mActivityTitles;
......
...@@ -86,17 +86,6 @@ public class MainFragment extends I2PFragmentBase { ...@@ -86,17 +86,6 @@ public class MainFragment extends I2PFragmentBase {
} }
}); });
b = (Button) v.findViewById(R.id.licenses_button);
b.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
Intent intent = new Intent(view.getContext(), LicenseActivity.class);
//Intent intent = new Intent(view.getContext(), TextResourceActivity.class);
//intent.putExtra(TextResourceActivity.TEXT_RESOURCE_ID, R.raw.licenses_txt);
startActivity(intent);
}
});
b = (Button) v.findViewById(R.id.website_button); b = (Button) v.findViewById(R.id.website_button);
b.setOnClickListener(new View.OnClickListener() { b.setOnClickListener(new View.OnClickListener() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment