From df3ec2e7a616ff36d26f365d2a468aeec50af48e Mon Sep 17 00:00:00 2001 From: Christophe Beyls Date: Sun, 17 Jun 2018 18:11:37 +0200 Subject: [PATCH] Updated AppCompat to 27.1.1 and removed Loader hacks which are no longer necessary --- app/build.gradle | 2 +- .../fosdem/activities/BaseActivity.java | 17 ----------------- .../fosdem/activities/EventDetailsActivity.java | 3 ++- .../fosdem/activities/MainActivity.java | 3 ++- .../fosdem/activities/PersonInfoActivity.java | 3 ++- .../activities/RoomImageDialogActivity.java | 3 ++- .../fosdem/activities/SearchResultActivity.java | 3 ++- .../activities/TrackScheduleActivity.java | 3 ++- .../activities/TrackScheduleEventActivity.java | 3 ++- 9 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 app/src/main/java/be/digitalia/fosdem/activities/BaseActivity.java diff --git a/app/build.gradle b/app/build.gradle index 288a8ba..241af3c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { } ext { - supportLibraryVersion = '27.0.2' + supportLibraryVersion = '27.1.1' } dependencies { diff --git a/app/src/main/java/be/digitalia/fosdem/activities/BaseActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/BaseActivity.java deleted file mode 100644 index 6a96b1e..0000000 --- a/app/src/main/java/be/digitalia/fosdem/activities/BaseActivity.java +++ /dev/null @@ -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(); - } -} diff --git a/app/src/main/java/be/digitalia/fosdem/activities/EventDetailsActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/EventDetailsActivity.java index 8e3b41f..c7d14bb 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/EventDetailsActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/EventDetailsActivity.java @@ -11,6 +11,7 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.NavUtils; import android.support.v4.app.TaskStackBuilder; import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import android.widget.Toast; @@ -27,7 +28,7 @@ import be.digitalia.fosdem.viewmodels.EventViewModel; * * @author Christophe Beyls */ -public class EventDetailsActivity extends BaseActivity implements Observer, CreateNfcAppDataCallback { +public class EventDetailsActivity extends AppCompatActivity implements Observer, CreateNfcAppDataCallback { public static final String EXTRA_EVENT = "event"; diff --git a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java index d0a2eec..477f3cd 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java @@ -34,6 +34,7 @@ import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.TextViewCompat; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatActivity; import android.support.v7.content.res.AppCompatResources; import android.support.v7.widget.SearchView; import android.support.v7.widget.Toolbar; @@ -69,7 +70,7 @@ import be.digitalia.fosdem.widgets.AdapterLinearLayout; * * @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_LIVE = BuildConfig.APPLICATION_ID + ".intent.action.SHORTCUT_LIVE"; diff --git a/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java index 5182bc9..0d54799 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java @@ -3,6 +3,7 @@ package be.digitalia.fosdem.activities; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.widget.TextView; @@ -11,7 +12,7 @@ import be.digitalia.fosdem.R; import be.digitalia.fosdem.fragments.PersonInfoListFragment; import be.digitalia.fosdem.model.Person; -public class PersonInfoActivity extends BaseActivity { +public class PersonInfoActivity extends AppCompatActivity { public static final String EXTRA_PERSON = "person"; diff --git a/app/src/main/java/be/digitalia/fosdem/activities/RoomImageDialogActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/RoomImageDialogActivity.java index 10ecdd5..d8199ac 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/RoomImageDialogActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/RoomImageDialogActivity.java @@ -9,6 +9,7 @@ import android.net.Uri; import android.os.Bundle; import android.support.customtabs.CustomTabsIntent; import android.support.v4.content.ContextCompat; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.text.SpannableString; import android.text.Spanned; @@ -31,7 +32,7 @@ import be.digitalia.fosdem.utils.StringUtils; * * @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_IMAGE_RESOURCE_ID = "imageResId"; diff --git a/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java index 47baa1a..bfd0613 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java @@ -5,6 +5,7 @@ import android.app.SearchManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.SearchView; import android.view.Menu; import android.view.MenuItem; @@ -13,7 +14,7 @@ import be.digitalia.fosdem.R; import be.digitalia.fosdem.fragments.MessageDialogFragment; import be.digitalia.fosdem.fragments.SearchResultListFragment; -public class SearchResultActivity extends BaseActivity { +public class SearchResultActivity extends AppCompatActivity { public static final int MIN_SEARCH_LENGTH = 3; diff --git a/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleActivity.java index 654e759..2dc1190 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleActivity.java @@ -7,6 +7,7 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.widget.ImageView; @@ -27,7 +28,7 @@ import be.digitalia.fosdem.utils.ThemeUtils; * * @author Christophe Beyls */ -public class TrackScheduleActivity extends BaseActivity +public class TrackScheduleActivity extends AppCompatActivity implements TrackScheduleListFragment.Callbacks, EventDetailsFragment.FloatingActionButtonProvider, CreateNfcAppDataCallback { diff --git a/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleEventActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleEventActivity.java index f00ee01..ff06b78 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleEventActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/TrackScheduleEventActivity.java @@ -11,6 +11,7 @@ import android.support.v4.content.ContextCompat; import android.support.v4.content.Loader; import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import com.viewpagerindicator.UnderlinePageIndicator; @@ -31,7 +32,7 @@ import be.digitalia.fosdem.widgets.ContentLoadingProgressBar; * * @author Christophe Beyls */ -public class TrackScheduleEventActivity extends BaseActivity implements LoaderCallbacks, CreateNfcAppDataCallback { +public class TrackScheduleEventActivity extends AppCompatActivity implements LoaderCallbacks, CreateNfcAppDataCallback { public static final String EXTRA_DAY = "day"; public static final String EXTRA_TRACK = "track";