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

Moved licenses button into nav drawer

Browse Source 
Temporary; will eventually be in an about menu in settings
This commit is contained in:
str4d
2013-08-14 04:22:58 +00:00
parent cd3157038c
commit 73286f43f6
4 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/fragment_main.xml
View File

@ -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"

5
res/values/arrays.xml
View File

@ -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>

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

@ -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;

11
src/net/i2p/android/router/fragment/MainFragment.java
View File

@ -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() {