From 73286f43f6ba2b6fa596a88b8b4b5d76a7fcfafb Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 14 Aug 2013 04:22:58 +0000
Subject: [PATCH] Moved licenses button into nav drawer
Temporary; will eventually be in an about menu in settings
---
res/layout/fragment_main.xml | 7 -------
res/values/arrays.xml | 5 +----
.../i2p/android/router/activity/I2PActivityBase.java | 5 +++--
src/net/i2p/android/router/fragment/MainFragment.java | 11 -----------
4 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/res/layout/fragment_main.xml b/res/layout/fragment_main.xml
index 120cd6663..3571f3ddc 100644
--- a/res/layout/fragment_main.xml
+++ b/res/layout/fragment_main.xml
@@ -115,13 +115,6 @@
android:text="@string/label_release_notes"
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
android:id="@+id/textView5"
android:layout_width="wrap_content"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4f320bdaf..1e96579d7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<item>@string/label_home</item>
<item>@string/label_addressbook</item>
+ <item>@string/label_licenses</item>
</string-array>
<string-array name="setting0to3">
<item>0</item>
diff --git a/src/net/i2p/android/router/activity/I2PActivityBase.java b/src/net/i2p/android/router/activity/I2PActivityBase.java
index b1385c479..5864f7e42 100644
--- a/src/net/i2p/android/router/activity/I2PActivityBase.java
+++ b/src/net/i2p/android/router/activity/I2PActivityBase.java
@@ -25,9 +25,10 @@ public class I2PActivityBase extends ActionBarActivity {
private CharSequence mDrawerTitle;
private CharSequence mTitle;
- private final Class[] mActivities = {
+ private static final Class[] mActivities = {
MainActivity.class,
- AddressbookActivity.class
+ AddressbookActivity.class,
+ LicenseActivity.class,
};
private String[] mActivityTitles;
diff --git a/src/net/i2p/android/router/fragment/MainFragment.java b/src/net/i2p/android/router/fragment/MainFragment.java
index 1b55062f2..b60e43015 100644
--- a/src/net/i2p/android/router/fragment/MainFragment.java
+++ b/src/net/i2p/android/router/fragment/MainFragment.java
@@ -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.setOnClickListener(new View.OnClickListener() {
--
GitLab