I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Material theme: main toolbar

Browse Source
This commit is contained in:
str4d
2014-10-19 23:22:39 +00:00
parent 9ceae6e2e8
commit d2d322e547
25 changed files with 284 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/i2p/bote/android/EmailListActivity.java
View File

@@ -12,11 +12,12 @@ import android.content.res.Configuration;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.ActionBarDrawerToggle;
import android.support.v4.app.DialogFragment;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -80,6 +81,10 @@ public class EmailListActivity extends ActionBarActivity implements
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Initialize variables
mHelper = new I2PAndroidHelper(this);
mTitle = mDrawerTitle = getTitle();
@@ -101,13 +106,9 @@ public class EmailListActivity extends ActionBarActivity implements
// Set the list's click listener
mFolderList.setOnItemClickListener(new DrawerItemClickListener());
// Enable ActionBar app icon to behave as action to toggle nav drawer
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeButtonEnabled(true);
// Set up drawer toggle
mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
R.drawable.ic_menu_white_24dp, R.string.drawer_open, R.string.drawer_close) {
R.string.drawer_open, R.string.drawer_close) {
private boolean wasDragged = false;
/** Called when a drawer has settled in a completely closed state. */
@@ -192,7 +193,6 @@ public class EmailListActivity extends ActionBarActivity implements
mDrawerLayout.openDrawer(mDrawerOuter);
// If first start, go to introduction and setup wizard
if (mSharedPrefs.getBoolean(PREF_FIRST_START, true)) {
mSharedPrefs.edit().putBoolean(PREF_FIRST_START, false).apply();
Intent i = new Intent(EmailListActivity.this, IntroActivity.class);
startActivityForResult(i, SHOW_INTRODUCTION);

8
app/src/main/java/i2p/bote/android/NetworkInfoActivity.java
View File

@@ -2,24 +2,30 @@ package i2p.bote.android;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
public class NetworkInfoActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
setTitle(R.string.network_status);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
NetworkInfoFragment f = new NetworkInfoFragment();
getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, f).commit();
.add(R.id.container, f).commit();
}
}
}

8
app/src/main/java/i2p/bote/android/NewEmailActivity.java
View File

@@ -2,6 +2,7 @@ package i2p.bote.android;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
public class NewEmailActivity extends ActionBarActivity implements
@@ -9,12 +10,17 @@ public class NewEmailActivity extends ActionBarActivity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
setTitle(R.string.compose);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -32,7 +38,7 @@ public class NewEmailActivity extends ActionBarActivity implements
}
f = NewEmailFragment.newInstance(quoteMsgFolder, quoteMsgId, quoteMsgType);
getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, f).commit();
.add(R.id.container, f).commit();
}
}

5
app/src/main/java/i2p/bote/android/ViewEmailActivity.java
View File

@@ -20,6 +20,7 @@ import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
public class ViewEmailActivity extends ActionBarActivity implements
LoaderManager.LoaderCallbacks<List<String>> {
@@ -43,6 +44,10 @@ public class ViewEmailActivity extends ActionBarActivity implements
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

10
app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
View File

@@ -7,6 +7,7 @@ import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
public class AddressBookActivity extends ActionBarActivity implements
AddressBookFragment.OnContactSelectedListener {
@@ -15,19 +16,24 @@ public class AddressBookActivity extends ActionBarActivity implements
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
setTitle(R.string.address_book);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
AddressBookFragment f = new AddressBookFragment();
getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, f).commit();
.add(R.id.container, f).commit();
}
}
@@ -49,7 +55,7 @@ public class AddressBookActivity extends ActionBarActivity implements
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == ALTER_CONTACT_LIST) {
if (resultCode == Activity.RESULT_OK) {
AddressBookFragment f = (AddressBookFragment) getSupportFragmentManager().findFragmentById(android.R.id.content);
AddressBookFragment f = (AddressBookFragment) getSupportFragmentManager().findFragmentById(R.id.container);
f.updateContactList();
}
} else {

11
app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
View File

@@ -8,18 +8,25 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class EditContactActivity extends ActionBarActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -30,7 +37,7 @@ public class EditContactActivity extends ActionBarActivity {
destination = args.getString(EditContactFragment.CONTACT_DESTINATION);
EditContactFragment f = EditContactFragment.newInstance(destination);
getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, f).commit();
.add(R.id.container, f).commit();
}
}
@@ -73,6 +80,6 @@ public class EditContactActivity extends ActionBarActivity {
EditContactFragment f = EditContactFragment.newInstance(
name, destination);
getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content, f).commit();
.replace(R.id.container, f).commit();
}
}

14
app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
View File

@@ -1,17 +1,16 @@
package i2p.bote.android.addressbook;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.nfc.NdefMessage;
import android.nfc.NdefRecord;
import android.nfc.NfcAdapter;
import android.nfc.NfcEvent;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class ViewContactActivity extends ActionBarActivity {
NfcAdapter mNfcAdapter;
@@ -20,11 +19,16 @@ public class ViewContactActivity extends ActionBarActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -35,7 +39,7 @@ public class ViewContactActivity extends ActionBarActivity {
destination = args.getString(ViewContactFragment.CONTACT_DESTINATION);
ViewContactFragment f = ViewContactFragment.newInstance(destination);
getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, f).commit();
.add(R.id.container, f).commit();
}
// NFC send only works on API 10+
@@ -65,7 +69,7 @@ public class ViewContactActivity extends ActionBarActivity {
private NdefMessage getNdefMessage() {
ViewContactFragment f = (ViewContactFragment) getSupportFragmentManager()
.findFragmentById(android.R.id.content);
.findFragmentById(R.id.container);
return f.createNdefMessage();
}

5
app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
View File

@@ -4,6 +4,7 @@ import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
public class EditIdentityActivity extends ActionBarActivity implements
@@ -17,6 +18,10 @@ public class EditIdentityActivity extends ActionBarActivity implements
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

5
app/src/main/java/i2p/bote/android/config/IdentityShipActivity.java
View File

@@ -2,6 +2,7 @@ package i2p.bote.android.config;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
import i2p.bote.android.InitActivities;
@@ -22,6 +23,10 @@ public class IdentityShipActivity extends ActionBarActivity implements
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

5
app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
View File

@@ -4,6 +4,7 @@ import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
public class SetPasswordActivity extends ActionBarActivity implements
@@ -18,6 +19,10 @@ public class SetPasswordActivity extends ActionBarActivity implements
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}

11
app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
View File

@@ -7,8 +7,10 @@ import android.nfc.NfcEvent;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class ViewIdentityActivity extends ActionBarActivity {
NfcAdapter mNfcAdapter;
@@ -17,11 +19,16 @@ public class ViewIdentityActivity extends ActionBarActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -32,7 +39,7 @@ public class ViewIdentityActivity extends ActionBarActivity {
key = args.getString(ViewIdentityFragment.IDENTITY_KEY);
ViewIdentityFragment f = ViewIdentityFragment.newInstance(key);
getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, f).commit();
.add(R.id.container, f).commit();
}
// NFC send only works on API 10+
@@ -62,7 +69,7 @@ public class ViewIdentityActivity extends ActionBarActivity {
private NdefMessage getNdefMessage() {
ViewIdentityFragment f = (ViewIdentityFragment) getSupportFragmentManager()
.findFragmentById(android.R.id.content);
.findFragmentById(R.id.container);
return f.createNdefMessage();
}

3
app/src/main/java/i2p/bote/android/intro/IntroActivity.java
View File

@@ -39,9 +39,6 @@ public class IntroActivity extends ActionBarActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_intro);
// Take up the entire screen.
getSupportActionBar().hide();
// Create the sections adapter.
mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());

7
app/src/main/java/i2p/bote/android/intro/SetupActivity.java
View File

@@ -4,6 +4,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -18,7 +19,11 @@ public class SetupActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_setup);
setContentView(R.layout.activity_toolbar);
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// If a user has chosen to enter the setup wizard, don't let them
// accidentally exit it early.