1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00

Updated AppCompat to 27.1.1 and removed Loader hacks which are no longer necessary

This commit is contained in:
Christophe Beyls 2018-06-17 18:11:37 +02:00
parent 65178e5b5a
commit df3ec2e7a6
9 changed files with 15 additions and 25 deletions

View file

@ -25,7 +25,7 @@ android {
} }
ext { ext {
supportLibraryVersion = '27.0.2' supportLibraryVersion = '27.1.1'
} }
dependencies { dependencies {

View file

@ -1,17 +0,0 @@
package be.digitalia.fosdem.activities;
import android.support.v4.app.SafeLoadersUtils;
import android.support.v7.app.AppCompatActivity;
/**
* Common activity code with fragment loaders fix.
*/
public abstract class BaseActivity extends AppCompatActivity {
@Override
public Object onRetainCustomNonConfigurationInstance() {
// TODO Remove when support-fragment Loaders bug is fixed
SafeLoadersUtils.onRetainCustomNonConfigurationInstance(this);
return super.onRetainCustomNonConfigurationInstance();
}
}

View file

@ -11,6 +11,7 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.NavUtils; import android.support.v4.app.NavUtils;
import android.support.v4.app.TaskStackBuilder; import android.support.v4.app.TaskStackBuilder;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.Toast; import android.widget.Toast;
@ -27,7 +28,7 @@ import be.digitalia.fosdem.viewmodels.EventViewModel;
* *
* @author Christophe Beyls * @author Christophe Beyls
*/ */
public class EventDetailsActivity extends BaseActivity implements Observer<Event>, CreateNfcAppDataCallback { public class EventDetailsActivity extends AppCompatActivity implements Observer<Event>, CreateNfcAppDataCallback {
public static final String EXTRA_EVENT = "event"; public static final String EXTRA_EVENT = "event";

View file

@ -34,6 +34,7 @@ import android.support.v4.widget.DrawerLayout;
import android.support.v4.widget.TextViewCompat; import android.support.v4.widget.TextViewCompat;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.content.res.AppCompatResources; import android.support.v7.content.res.AppCompatResources;
import android.support.v7.widget.SearchView; import android.support.v7.widget.SearchView;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
@ -69,7 +70,7 @@ import be.digitalia.fosdem.widgets.AdapterLinearLayout;
* *
* @author Christophe Beyls * @author Christophe Beyls
*/ */
public class MainActivity extends BaseActivity { public class MainActivity extends AppCompatActivity {
public static final String ACTION_SHORTCUT_BOOKMARKS = BuildConfig.APPLICATION_ID + ".intent.action.SHORTCUT_BOOKMARKS"; public static final String ACTION_SHORTCUT_BOOKMARKS = BuildConfig.APPLICATION_ID + ".intent.action.SHORTCUT_BOOKMARKS";
public static final String ACTION_SHORTCUT_LIVE = BuildConfig.APPLICATION_ID + ".intent.action.SHORTCUT_LIVE"; public static final String ACTION_SHORTCUT_LIVE = BuildConfig.APPLICATION_ID + ".intent.action.SHORTCUT_LIVE";

View file

@ -3,6 +3,7 @@ package be.digitalia.fosdem.activities;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.TextView; import android.widget.TextView;
@ -11,7 +12,7 @@ import be.digitalia.fosdem.R;
import be.digitalia.fosdem.fragments.PersonInfoListFragment; import be.digitalia.fosdem.fragments.PersonInfoListFragment;
import be.digitalia.fosdem.model.Person; import be.digitalia.fosdem.model.Person;
public class PersonInfoActivity extends BaseActivity { public class PersonInfoActivity extends AppCompatActivity {
public static final String EXTRA_PERSON = "person"; public static final String EXTRA_PERSON = "person";

View file

@ -9,6 +9,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.customtabs.CustomTabsIntent; import android.support.customtabs.CustomTabsIntent;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.Spanned; import android.text.Spanned;
@ -31,7 +32,7 @@ import be.digitalia.fosdem.utils.StringUtils;
* *
* @author Christophe Beyls * @author Christophe Beyls
*/ */
public class RoomImageDialogActivity extends BaseActivity { public class RoomImageDialogActivity extends AppCompatActivity {
public static final String EXTRA_ROOM_NAME = "roomName"; public static final String EXTRA_ROOM_NAME = "roomName";
public static final String EXTRA_ROOM_IMAGE_RESOURCE_ID = "imageResId"; public static final String EXTRA_ROOM_IMAGE_RESOURCE_ID = "imageResId";

View file

@ -5,6 +5,7 @@ import android.app.SearchManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SearchView; import android.support.v7.widget.SearchView;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@ -13,7 +14,7 @@ import be.digitalia.fosdem.R;
import be.digitalia.fosdem.fragments.MessageDialogFragment; import be.digitalia.fosdem.fragments.MessageDialogFragment;
import be.digitalia.fosdem.fragments.SearchResultListFragment; import be.digitalia.fosdem.fragments.SearchResultListFragment;
public class SearchResultActivity extends BaseActivity { public class SearchResultActivity extends AppCompatActivity {
public static final int MIN_SEARCH_LENGTH = 3; public static final int MIN_SEARCH_LENGTH = 3;

View file

@ -7,6 +7,7 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.app.NavUtils; import android.support.v4.app.NavUtils;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.ImageView; import android.widget.ImageView;
@ -27,7 +28,7 @@ import be.digitalia.fosdem.utils.ThemeUtils;
* *
* @author Christophe Beyls * @author Christophe Beyls
*/ */
public class TrackScheduleActivity extends BaseActivity public class TrackScheduleActivity extends AppCompatActivity
implements TrackScheduleListFragment.Callbacks, implements TrackScheduleListFragment.Callbacks,
EventDetailsFragment.FloatingActionButtonProvider, EventDetailsFragment.FloatingActionButtonProvider,
CreateNfcAppDataCallback { CreateNfcAppDataCallback {

View file

@ -11,6 +11,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem; import android.view.MenuItem;
import com.viewpagerindicator.UnderlinePageIndicator; import com.viewpagerindicator.UnderlinePageIndicator;
@ -31,7 +32,7 @@ import be.digitalia.fosdem.widgets.ContentLoadingProgressBar;
* *
* @author Christophe Beyls * @author Christophe Beyls
*/ */
public class TrackScheduleEventActivity extends BaseActivity implements LoaderCallbacks<Cursor>, CreateNfcAppDataCallback { public class TrackScheduleEventActivity extends AppCompatActivity implements LoaderCallbacks<Cursor>, CreateNfcAppDataCallback {
public static final String EXTRA_DAY = "day"; public static final String EXTRA_DAY = "day";
public static final String EXTRA_TRACK = "track"; public static final String EXTRA_TRACK = "track";