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

ActionBarActivity -> AppCompatActivity

Browse Source
This commit is contained in:
str4d
2015-05-28 12:01:53 +00:00
parent a813ea25f8
commit bcfc02b01a
17 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,8 @@ import android.support.annotation.NonNull;
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.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
@@ -45,7 +45,7 @@ import i2p.bote.folder.EmailFolder;
import i2p.bote.folder.FolderListener;
import i2p.bote.network.NetworkStatusListener;
public class EmailListActivity extends ActionBarActivity implements
public class EmailListActivity extends AppCompatActivity implements
FolderListAdapter.OnFolderSelectedListener,
EmailListFragment.OnEmailSelectedListener,
MoveToDialogFragment.MoveToDialogListener,

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

@@ -9,7 +9,7 @@ import android.support.v4.app.DialogFragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.view.ActionMode;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -38,10 +38,10 @@ import i2p.bote.I2PBote;
import i2p.bote.android.util.AuthenticatedFragment;
import i2p.bote.android.util.BetterAsyncTaskLoader;
import i2p.bote.android.util.BoteHelper;
import i2p.bote.android.widget.DividerItemDecoration;
import i2p.bote.android.widget.LoadingRecyclerView;
import i2p.bote.android.util.MoveToDialogFragment;
import i2p.bote.android.util.MultiSelectionUtil;
import i2p.bote.android.widget.DividerItemDecoration;
import i2p.bote.android.widget.LoadingRecyclerView;
import i2p.bote.android.widget.MultiSwipeRefreshLayout;
import i2p.bote.email.Email;
import i2p.bote.fileencryption.PasswordException;
@@ -155,7 +155,7 @@ public class EmailListFragment extends AuthenticatedFragment implements
// ModalChoiceListener (see below)
mModalChoiceListener = new ModalChoiceListener();
mMultiSelectController = MultiSelectionUtil
.attachMultiSelectionController(mEmailsList, (ActionBarActivity) getActivity(),
.attachMultiSelectionController(mEmailsList, (AppCompatActivity) getActivity(),
mModalChoiceListener);
// Allow the Controller to restore itself

4
app/src/main/java/i2p/bote/android/HelpActivity.java
View File

@@ -5,12 +5,12 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import com.viewpagerindicator.TitlePageIndicator;
public class HelpActivity extends ActionBarActivity {
public class HelpActivity extends AppCompatActivity {
/**
* The {@link android.support.v4.view.PagerAdapter} that will provide
* fragments for each of the sections. We use a

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

@@ -1,10 +1,10 @@
package i2p.bote.android;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
public class NetworkInfoActivity extends ActionBarActivity {
public class NetworkInfoActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

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

@@ -1,11 +1,11 @@
package i2p.bote.android;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
public class NewEmailActivity extends ActionBarActivity implements
public class NewEmailActivity extends AppCompatActivity implements
NewEmailFragment.Callbacks {
@Override
protected void onCreate(Bundle savedInstanceState) {

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

@@ -1,5 +1,17 @@
package i2p.bote.android;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.List;
@@ -10,19 +22,8 @@ import i2p.bote.email.Email;
import i2p.bote.fileencryption.PasswordException;
import i2p.bote.folder.EmailFolder;
import i2p.bote.folder.FolderListener;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
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
public class ViewEmailActivity extends AppCompatActivity implements
LoaderManager.LoaderCallbacks<List<String>> {
public static final String FOLDER_NAME = "folder_name";
public static final String MESSAGE_ID = "message_id";

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

@@ -1,19 +1,20 @@
package i2p.bote.android.addressbook;
import i2p.bote.android.Constants;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
import i2p.bote.packet.dht.Contact;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
public class AddressBookActivity extends ActionBarActivity implements
import i2p.bote.android.Constants;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
import i2p.bote.packet.dht.Contact;
public class AddressBookActivity extends AppCompatActivity implements
AddressBookFragment.OnContactSelectedListener {
static final int ALTER_CONTACT_LIST = 1;

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

@@ -6,7 +6,7 @@ import android.nfc.NdefRecord;
import android.nfc.NfcAdapter;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import java.util.Arrays;
@@ -15,7 +15,7 @@ import i2p.bote.android.Constants;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class EditContactActivity extends ActionBarActivity {
public class EditContactActivity extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

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

@@ -6,11 +6,11 @@ import android.nfc.NfcAdapter;
import android.nfc.NfcEvent;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import i2p.bote.android.InitActivities;
public class ViewContactActivity extends ActionBarActivity {
public class ViewContactActivity extends AppCompatActivity {
NfcAdapter mNfcAdapter;
@SuppressLint("NewApi")

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

@@ -1,13 +1,14 @@
package i2p.bote.android.config;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
public class SetPasswordActivity extends ActionBarActivity implements
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class SetPasswordActivity extends AppCompatActivity implements
SetPasswordFragment.Callbacks {
@Override
public void onCreate(Bundle savedInstanceState) {

9
app/src/main/java/i2p/bote/android/identities/EditIdentityActivity.java
View File

@@ -1,13 +1,14 @@
package i2p.bote.android.identities;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
public class EditIdentityActivity extends ActionBarActivity implements
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class EditIdentityActivity extends AppCompatActivity implements
EditIdentityFragment.Callbacks {
@Override
public void onCreate(Bundle savedInstanceState) {

4
app/src/main/java/i2p/bote/android/identities/IdentityShipActivity.java
View File

@@ -1,14 +1,14 @@
package i2p.bote.android.identities;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
public class IdentityShipActivity extends ActionBarActivity implements
public class IdentityShipActivity extends AppCompatActivity implements
IdentityShipFragment.Callbacks {
public static final String EXPORTING = "exporting";

4
app/src/main/java/i2p/bote/android/identities/ViewIdentityActivity.java
View File

@@ -6,11 +6,11 @@ import android.nfc.NfcAdapter;
import android.nfc.NfcEvent;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import i2p.bote.android.InitActivities;
public class ViewIdentityActivity extends ActionBarActivity {
public class ViewIdentityActivity extends AppCompatActivity {
NfcAdapter mNfcAdapter;
@SuppressLint("NewApi")

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

@@ -7,6 +7,7 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -17,7 +18,7 @@ import com.viewpagerindicator.LinePageIndicator;
import i2p.bote.android.R;
public class IntroActivity extends ActionBarActivity {
public class IntroActivity extends AppCompatActivity {
/**
* The {@link android.support.v4.view.PagerAdapter} that will provide

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

@@ -3,7 +3,7 @@ package i2p.bote.android.intro;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.View;
@@ -11,10 +11,10 @@ import android.view.ViewGroup;
import android.widget.Toast;
import i2p.bote.android.R;
import i2p.bote.android.identities.EditIdentityActivity;
import i2p.bote.android.config.SetPasswordActivity;
import i2p.bote.android.identities.EditIdentityActivity;
public class SetupActivity extends ActionBarActivity {
public class SetupActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {

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

@@ -18,7 +18,7 @@
package i2p.bote.android.util;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.view.ActionMode;
import android.support.v7.widget.RecyclerView;
import android.util.Pair;
@@ -33,7 +33,7 @@ import java.util.List;
/**
* Utilities for handling multiple selection in list views. Contains functionality similar to {@link
* AbsListView#CHOICE_MODE_MULTIPLE_MODAL} which works with {@link ActionBarActivity} and
* AbsListView#CHOICE_MODE_MULTIPLE_MODAL} which works with {@link AppCompatActivity} and
* backward-compatible action bars.
*/
public class MultiSelectionUtil {
@@ -48,7 +48,7 @@ public class MultiSelectionUtil {
* @return the attached Controller instance.
*/
public static Controller attachMultiSelectionController(final RecyclerView recyclerView,
final ActionBarActivity activity, final MultiChoiceModeListener listener) {
final AppCompatActivity activity, final MultiChoiceModeListener listener) {
if (!(recyclerView.getAdapter() instanceof SelectableAdapter))
throw new IllegalArgumentException("Adapter must extend SelectableAdapter");
@@ -68,7 +68,7 @@ public class MultiSelectionUtil {
private final RecyclerView mRecyclerView;
private final SelectableAdapter mAdapter;
private final ActionBarActivity mActivity;
private final AppCompatActivity mActivity;
private final MultiChoiceModeListener mListener;
private final Callbacks mCallbacks;
@@ -78,7 +78,7 @@ public class MultiSelectionUtil {
// Keeps record of any items that should be checked on the next action mode creation
private HashSet<Pair<Integer, Long>> mItemsToCheck;
private Controller(RecyclerView recyclerView, ActionBarActivity activity,
private Controller(RecyclerView recyclerView, AppCompatActivity activity,
MultiChoiceModeListener listener) {
mRecyclerView = recyclerView;
mAdapter = (SelectableAdapter) recyclerView.getAdapter();
@@ -129,7 +129,7 @@ public class MultiSelectionUtil {
}
/**
* This method should be called from your {@link ActionBarActivity} or
* This method should be called from your {@link AppCompatActivity} or
* {@link android.support.v4.app.Fragment Fragment} to allow the controller to restore any
* instance state.
*
@@ -150,7 +150,7 @@ public class MultiSelectionUtil {
/**
* This method should be called from
* {@link ActionBarActivity#onSaveInstanceState(android.os.Bundle)} or
* {@link AppCompatActivity#onSaveInstanceState(android.os.Bundle)} or
* {@link android.support.v4.app.Fragment#onSaveInstanceState(android.os.Bundle)
* Fragment.onSaveInstanceState(Bundle)} to allow the controller to save its instance
* state.

4
app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java
View File

@@ -16,7 +16,7 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
@@ -136,7 +136,7 @@ public abstract class ViewAddressFragment extends Fragment {
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
ActionBarActivity activity = ((ActionBarActivity) getActivity());
AppCompatActivity activity = ((AppCompatActivity) getActivity());
// Set the action bar
activity.setSupportActionBar(mToolbar);