From 55b8cd640a530054cbfb6b8a56e122dd016eade1 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Sun, 26 Jan 2020 15:35:15 +0800 Subject: [PATCH] Migrate to AndroidX --- build.gradle | 13 +- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- twidere.component.common/build.gradle | 6 +- .../callback/FanfouUserStreamCallback.java | 4 +- .../SimpleFanfouUserStreamCallback.java | 4 +- .../fanfou/model/FanfouStreamObject.java | 2 +- .../mastodon/annotation/AuthScope.java | 2 +- .../mastodon/annotation/StatusVisibility.java | 2 +- .../mastodon/api/AccountsResources.java | 2 +- .../library/mastodon/api/AppsResources.java | 2 +- .../callback/MastodonUserStreamCallback.java | 2 +- .../LinkHeaderList$$JsonObjectMapper.java | 2 +- .../mastodon/model/LinkHeaderList.java | 4 +- .../mastodon/model/LinkHeaderResponse.java | 4 +- .../library/mastodon/model/Notification.java | 4 +- .../library/mastodon/model/Results.java | 4 +- .../twitter/annotation/MediaCategory.java | 2 +- .../twitter/annotation/StreamWith.java | 2 +- .../twitter/auth/BasicAuthorization.java | 2 +- .../twitter/auth/BearerAuthorization.java | 2 +- .../twitter/auth/EmptyAuthorization.java | 2 +- .../callback/SimpleUserStreamCallback.java | 2 +- .../twitter/callback/UserStreamCallback.java | 2 +- .../library/twitter/model/Activity.java | 4 +- .../library/twitter/model/CardDataMap.java | 2 +- .../library/twitter/model/DMResponse.java | 2 +- .../twitter/model/ExtendedProfile.java | 2 +- .../library/twitter/model/GeoLocation.java | 2 +- .../library/twitter/model/GeoQuery.java | 2 +- .../twitter/model/IDs$$JsonObjectMapper.java | 2 +- .../microblog/library/twitter/model/IDs.java | 2 +- .../library/twitter/model/MediaEntity.java | 4 +- .../twitter/model/MediaUploadResponse.java | 4 +- ...ageableResponseList$$JsonObjectMapper.java | 2 +- .../twitter/model/PageableResponseList.java | 2 +- .../library/twitter/model/Place.java | 2 +- .../library/twitter/model/ResponseCode.java | 2 +- .../library/twitter/model/ResponseList.java | 2 +- .../library/twitter/model/SavedSearch.java | 2 +- .../twitter/model/ScheduledStatus.java | 2 +- .../library/twitter/model/SearchQuery.java | 2 +- .../library/twitter/model/Status.java | 4 +- .../library/twitter/model/StatusUpdate.java | 4 +- .../library/twitter/model/Trends.java | 2 +- .../twitter/model/TwitterResponse.java | 2 +- .../twitter/model/TwitterStreamObject.java | 2 +- .../twitter/model/UniversalSearchQuery.java | 2 +- .../twitter/model/UniversalSearchResult.java | 2 +- .../microblog/library/twitter/model/User.java | 4 +- .../library/twitter/model/UserList.java | 4 +- .../util/OAuthTokenResponseConverter.java | 2 +- .../util/ThreadLocalSimpleDateFormat.java | 2 +- .../twidere/annotation/AccountType.java | 2 +- .../twidere/annotation/AuthTypeInt.java | 2 +- .../twidere/annotation/CustomTabType.java | 2 +- .../twidere/annotation/FilterScope.java | 2 +- .../twidere/model/AccountDetails.java | 4 +- .../twidere/model/ConsumerKeyType.java | 2 +- .../org/mariotaku/twidere/model/Draft.java | 4 +- .../mariotaku/twidere/model/FiltersData.java | 2 +- .../twidere/model/ParcelableActivity.java | 2 +- .../twidere/model/ParcelableCardEntity.java | 4 +- .../twidere/model/ParcelableGroup.java | 2 +- .../twidere/model/ParcelableLocation.java | 4 +- .../twidere/model/ParcelableMedia.java | 6 +- .../twidere/model/ParcelableMediaUpdate.java | 4 +- .../twidere/model/ParcelableMessage.java | 2 +- .../model/ParcelableMessageConversation.java | 4 +- .../twidere/model/ParcelableStatus.java | 9 +- .../twidere/model/ParcelableStatusUpdate.java | 4 +- .../twidere/model/ParcelableUser.java | 4 +- .../twidere/model/ParcelableUserList.java | 2 +- .../org/mariotaku/twidere/model/SpanItem.java | 2 +- .../java/org/mariotaku/twidere/model/Tab.java | 2 +- .../org/mariotaku/twidere/model/UserKey.java | 4 +- .../twidere/model/account/AccountExtras.java | 4 +- .../model/account/cred/Credentials.java | 2 +- .../twidere/model/message/MessageExtras.java | 4 +- .../twidere/model/message/StickerExtras.java | 2 +- .../conversation/ConversationExtras.java | 4 +- .../model/tab/argument/TabArguments.java | 6 +- .../tab/argument/TextQueryArguments.java | 2 +- .../model/tab/argument/UserArguments.java | 2 +- .../model/tab/argument/UserListArguments.java | 2 +- .../twidere/model/tab/extra/TabExtras.java | 6 +- .../model/util/DraftExtrasFieldConverter.java | 2 +- .../twidere/provider/TwidereDataStore.java | 2 +- .../twidere/util/JsonSerializer.java | 4 +- .../filter/FiltersSubscriptionProvider.java | 2 +- twidere.component.nyan/build.gradle | 6 +- .../twidere/nyan/NyanDrawingHelper.java | 2 +- twidere/build.gradle | 42 ++--- .../twidere/activity/ComposeActivityTest.kt | 4 +- .../activity/ComposeActivityTestRule.kt | 2 +- .../twidere/extension/FileExtensionsTest.kt | 4 +- .../twidere/extension/ViewExtensionsKtTest.kt | 2 +- .../extension/model/DraftExtensionsTest.kt | 4 +- .../model/FiltersDataExtensionsTest.kt | 2 +- .../text/twitter/ExtractorExtensionsTest.kt | 4 +- .../model/util/ParcelableStatusUtilsTest.kt | 4 +- .../twidere/provider/TwidereDataStoreTest.kt | 4 +- .../twidere/util/DataStoreUtilsTest.kt | 4 +- .../twidere/util/MapFragmentFactoryTest.kt | 4 +- .../twidere/util/ObjectCursorTest.kt | 2 +- .../util/StatusShortenerInterfaceTest.kt | 6 +- .../twidere/util/TestAccountUtils.kt | 2 +- .../org/mariotaku/twidere/util/TestCommons.kt | 2 +- .../org/mariotaku/twidere/util/UtilsTest.kt | 4 +- .../UrlFiltersSubscriptionProviderTest.kt | 4 +- .../preview/provider/InstagramProviderTest.kt | 2 +- .../twidere/util/DebugModeUtils.java | 23 +-- .../activity/CrashReportDialogActivity.kt | 2 +- .../fragment/OpenStreetMapViewerFragment.kt | 6 +- .../twidere/util/OSMMapFragmentFactory.kt | 2 +- twidere/src/main/AndroidManifest.xml | 2 +- .../widget/DrawerLayoutAccessor.java | 4 +- .../fragment}/app/FragmentAccessor.java | 4 +- .../fragment}/app/ListFragmentAccessor.java | 4 +- .../loader}/content/LoaderAccessor.java | 4 +- .../widget/FixedLinearLayoutManager.java | 4 +- .../widget/RecyclerViewAccessor.java | 4 +- .../java/io/nayuki/qrcodegen/BitBuffer.java | 2 +- .../main/java/io/nayuki/qrcodegen/QrCode.java | 2 +- .../java/io/nayuki/qrcodegen/QrSegment.java | 2 +- .../abstask/library/ManualTaskStarter.java | 4 +- .../library/twitter/model/IDsAccessor.java | 2 +- .../twidere/adapter/ArrayAdapter.java | 2 +- .../ExtendedDividerItemDecoration.java | 10 +- .../twidere/annotation/AutoRefreshType.java | 2 +- .../twidere/annotation/CacheFileType.java | 2 +- .../twidere/annotation/ContentType.java | 2 +- .../twidere/annotation/ImageShapeStyle.java | 2 +- .../twidere/annotation/NavbarStyle.java | 2 +- .../twidere/annotation/NotificationType.java | 2 +- .../twidere/annotation/PreviewStyle.java | 2 +- .../twidere/annotation/ProfileImageSize.java | 2 +- .../twidere/annotation/ReadPositionTag.java | 2 +- .../twidere/annotation/TabAccountFlags.java | 2 +- ...xportImportTypeSelectorDialogFragment.java | 8 +- .../fragment/FileSelectorDialogFragment.java | 16 +- .../fragment/KeyboardShortcutsFragment.java | 10 +- ...medListPreferenceDialogFragmentCompat.java | 4 +- .../graphic/ActionBarColorDrawable.java | 2 +- .../twidere/graphic/ActionIconDrawable.java | 4 +- .../twidere/graphic/EmptyDrawable.java | 2 +- .../twidere/graphic/PaddingDrawable.java | 2 +- .../graphic/like/LikeAnimationDrawable.java | 8 +- .../like/layer/AnimationLayerDrawable.java | 2 +- .../like/layer/CircleLayerDrawable.java | 2 +- .../like/layer/ParticleLayerDrawable.java | 2 +- .../graphic/like/layer/ScalableDrawable.java | 2 +- .../like/layer/ShineLayerDrawable.java | 2 +- .../twidere/loader/ObjectCursorLoader.java | 6 +- .../twidere/menu/AccountToggleProvider.java | 4 +- .../twidere/model/CronExpression.java | 4 +- .../twidere/model/CursorReference.java | 2 +- .../twidere/model/CustomAPIConfig.java | 4 +- .../mariotaku/twidere/model/ListResponse.java | 4 +- .../twidere/model/ParcelableAccount.java | 2 +- .../twidere/model/ParcelableCredentials.java | 2 +- .../model/event/FavoriteTaskEvent.java | 4 +- .../model/event/FriendshipTaskEvent.java | 4 +- .../model/event/FriendshipUpdatedEvent.java | 2 +- .../model/event/GetActivitiesTaskEvent.java | 2 +- .../model/event/GetMessagesTaskEvent.java | 4 +- .../model/event/GetStatusesTaskEvent.java | 2 +- .../model/event/ProfileUpdatedEvent.java | 2 +- .../model/event/UserListCreatedEvent.java | 2 +- .../model/event/UserListDestroyedEvent.java | 2 +- .../event/UserListMembersChangedEvent.java | 4 +- .../event/UserListSubscriptionEvent.java | 4 +- .../model/event/UserListUpdatedEvent.java | 2 +- .../model/pagination/CursorPagination.java | 2 +- .../model/pagination/PagePagination.java | 2 +- .../model/pagination/PaginatedArrayList.java | 2 +- .../model/pagination/SinceMaxPagination.java | 2 +- .../presentation/LaunchPresentation.java | 4 +- .../twidere/model/tab/BooleanHolder.java | 4 +- .../twidere/model/tab/DrawableHolder.java | 6 +- .../twidere/model/tab/StringHolder.java | 4 +- .../twidere/model/util/AccountUtils.java | 4 +- .../model/util/ParcelableLocationUtils.java | 2 +- .../preference/AppVersionPreference.java | 2 +- .../preference/ComponentStatePreference.java | 4 +- .../preference/MultiSelectListPreference.java | 10 +- .../NotificationTypePreference.java | 10 +- .../preference/RingtonePreference.java | 2 +- .../preference/SeekBarDialogPreference.java | 6 +- .../SettingsImportExportPreference.java | 10 +- .../preference/ThemeBackgroundPreference.java | 10 +- .../twidere/provider/ShareProvider.java | 6 +- .../text/validator/UserListNameValidator.java | 2 +- .../twidere/util/AbsServiceInterface.java | 2 +- .../mariotaku/twidere/util/CheckUtils.java | 2 +- .../twidere/util/CustomTabUtils.java | 8 +- .../twidere/util/DataImportExportUtils.java | 4 +- .../twidere/util/EditTextEnterHandler.java | 4 +- .../util/InternalTwitterContentUtils.java | 4 +- .../util/KeyboardShortcutsHandler.java | 6 +- .../twidere/util/MediaUploaderInterface.java | 2 +- .../twidere/util/MicroBlogAPIFactory.java | 9 +- .../util/MouseScrollDirectionDecider.java | 2 +- .../util/RecyclerViewNavigationHelper.java | 12 +- .../twidere/util/RecyclerViewUtils.java | 6 +- .../twidere/util/SimpleDrawerCallback.java | 2 +- .../util/StatusShortenerInterface.java | 2 +- .../SwipeDismissListViewTouchListener.java | 2 +- .../twidere/util/TwidereArrayUtils.java | 2 +- .../twidere/util/TwidereLinkify.java | 6 +- .../twidere/util/TwidereStringUtils.java | 2 +- .../org/mariotaku/twidere/util/UriUtils.java | 4 +- .../twidere/util/UserAgentUtils.java | 6 +- .../util/collection/CompactHashSet.java | 2 +- .../util/content/ContentResolverUtils.java | 4 +- .../SupportFragmentReloadCursorObserver.java | 6 +- .../util/io/ContentLengthInputStream.java | 2 +- .../util/media/TwidereMediaDownloader.java | 4 +- .../media/preview/PreviewMediaExtractor.java | 6 +- .../media/preview/provider/ImgurProvider.java | 4 +- .../preview/provider/InstagramProvider.java | 6 +- .../util/media/preview/provider/Provider.java | 6 +- .../provider/TwitterMediaProvider.java | 4 +- .../twidere/util/menu/TwidereMenuInfo.java | 2 +- .../twidere/util/net/SimpleCookieJar.java | 2 +- .../twidere/util/support/WindowSupport.java | 2 +- .../mariotaku/twidere/view/BirthdayView.java | 2 +- .../twidere/view/CheckableLinearLayout.java | 2 +- .../twidere/view/ColorLabelFrameLayout.java | 2 +- .../twidere/view/ColorLabelLinearLayout.java | 2 +- .../twidere/view/ForegroundColorView.java | 2 +- .../twidere/view/ForegroundImageView.java | 4 +- .../twidere/view/HeaderDrawerLayout.java | 6 +- .../twidere/view/HomeDrawerLayout.java | 2 +- .../twidere/view/LinePageIndicator.java | 6 +- .../twidere/view/MediaPreviewImageView.java | 6 +- .../twidere/view/ProfileBannerSpace.java | 4 +- .../twidere/view/ShapedImageView.java | 8 +- .../mariotaku/twidere/view/SquareSpace.java | 2 +- .../twidere/view/TabPagerIndicator.java | 20 +-- .../helper/SimpleItemTouchHelperCallback.java | 4 +- .../twidere/view/iface/IColorLabelView.java | 2 +- .../twidere/view/iface/IForegroundView.java | 6 +- .../twidere/view/iface/PagerIndicator.java | 2 +- .../support/v4/app/LoaderManagerExtensions.kt | 16 -- .../appcompat}/app/TwilightManagerAccessor.kt | 2 +- .../app/WindowDecorActionBarAccessor.kt | 6 +- .../view/menu/TwidereActionMenuItemView.kt | 2 +- .../widget/TwidereActionMenuView.kt | 4 +- .../appcompat}/widget/TwidereToolbar.kt | 2 +- .../core}/os/LocaleHelperAccessor.kt | 10 +- .../core}/view/WindowInsetsCompatAccessor.kt | 2 +- .../loader/app/LoaderManagerExtensions.kt | 20 +++ .../loader}/content/FixedAsyncTaskLoader.kt | 3 +- .../widget/RecyclerViewAccessor.kt | 4 +- .../ktextension/ActivityExtensions.kt | 2 +- .../mariotaku/ktextension/ColorExtensions.kt | 2 +- .../ktextension/ConfigurationExtensions.kt | 4 +- .../ktextension/ContextExtensions.kt | 2 +- .../ktextension/FragmentManagerExtensions.kt | 4 +- .../mariotaku/ktextension/MenuExtensions.kt | 8 +- .../ktextension/RecyclerViewExtension.kt | 4 +- .../ktextension/SparseArrayExtensions.kt | 2 +- .../ktextension/WindowInsetsExtensions.kt | 2 +- .../twidere/activity/BaseActivity.kt | 22 +-- .../twidere/activity/ComposeActivity.kt | 39 +++-- .../twidere/activity/DataExportActivity.kt | 2 +- .../twidere/activity/DataImportActivity.kt | 2 +- .../twidere/activity/FileSelectorActivity.kt | 4 +- .../activity/FragmentContentActivity.kt | 2 +- .../activity/HiddenSettingsActivity.kt | 2 +- .../twidere/activity/HomeActivity.kt | 36 ++-- .../activity/InvalidAccountAlertActivity.kt | 32 ++-- .../twidere/activity/LinkHandlerActivity.kt | 20 +-- .../twidere/activity/MainActivity.kt | 6 +- .../twidere/activity/MediaViewerActivity.kt | 34 ++-- .../activity/PremiumDashboardActivity.kt | 8 +- .../activity/QuickSearchBarActivity.kt | 12 +- .../twidere/activity/SettingsActivity.kt | 24 +-- .../twidere/activity/SignInActivity.kt | 28 +-- .../TrendsLocationSelectorActivity.kt | 16 +- .../activity/UserListSelectorActivity.kt | 18 +- .../twidere/activity/UserSelectorActivity.kt | 12 +- .../twidere/activity/iface/IBaseActivity.kt | 2 +- .../shortcut/AbsShortcutCreatorActivity.kt | 4 +- .../ComposeShortcutCreatorActivity.kt | 6 +- .../twidere/adapter/AccountDetailsAdapter.kt | 2 +- .../twidere/adapter/ArrayRecyclerAdapter.kt | 2 +- .../twidere/adapter/BaseArrayAdapter.kt | 2 +- .../adapter/BaseRecyclerViewAdapter.kt | 4 +- .../adapter/ComposeAutoCompleteAdapter.kt | 2 +- .../twidere/adapter/DraftsAdapter.kt | 4 +- .../twidere/adapter/DummyItemAdapter.kt | 4 +- .../twidere/adapter/LoadMoreSupportAdapter.kt | 2 +- .../twidere/adapter/MediaPreviewAdapter.kt | 2 +- .../adapter/MessagesConversationAdapter.kt | 4 +- .../twidere/adapter/MessagesEntriesAdapter.kt | 2 +- .../adapter/ParcelableActivitiesAdapter.kt | 4 +- .../adapter/ParcelableGroupsAdapter.kt | 2 +- .../adapter/ParcelableStatusesAdapter.kt | 4 +- .../adapter/ParcelableUserListsAdapter.kt | 2 +- .../twidere/adapter/ParcelableUsersAdapter.kt | 2 +- .../twidere/adapter/RecyclerPagerAdapter.kt | 6 +- .../twidere/adapter/SelectableUsersAdapter.kt | 4 +- .../adapter/SourceAutoCompleteAdapter.kt | 2 +- .../twidere/adapter/StatusDetailsAdapter.kt | 16 +- .../SupportFixedFragmentStatePagerAdapter.kt | 8 +- .../twidere/adapter/SupportTabsAdapter.kt | 8 +- .../twidere/adapter/TrendsAdapter.kt | 2 +- .../adapter/UserAutoCompleteAdapter.kt | 2 +- .../twidere/adapter/VariousItemsAdapter.kt | 2 +- .../adapter/iface/ContentCardClickListener.kt | 2 +- .../twidere/adapter/iface/IContentAdapter.kt | 2 +- .../adapter/iface/ILoadMoreSupportAdapter.kt | 4 +- .../twidere/app/TwidereApplication.kt | 2 +- .../twidere/constant/PreferenceKeys.kt | 4 +- .../twidere/extension/DialogExtensions.kt | 4 +- .../twidere/extension/FragmentExtensions.kt | 6 +- .../extension/IBaseActivityExtensions.kt | 2 +- .../extension/IBaseFragmentExtensions.kt | 2 +- .../twidere/extension/PreferenceExtension.kt | 6 +- .../twidere/extension/RectExtensions.kt | 2 +- .../twidere/extension/ResourcesExtensions.kt | 2 +- .../StaggeredGridLayoutManagerExtensions.kt | 4 +- .../twidere/extension/ViewExtensions.kt | 2 +- .../extension/model/AccountExtensions.kt | 4 +- .../model/DefaultFeaturesExtensions.kt | 2 +- .../model/LaunchPresentationExtensions.kt | 2 +- .../NotificationChannelSpecsExtensions.kt | 2 +- .../view/ActionMenuViewExtensions.kt | 4 +- .../extension/view/RecyclerViewExtensions.kt | 6 +- .../fragment/APIEditorDialogFragment.kt | 38 ++-- .../twidere/fragment/AbsActivitiesFragment.kt | 60 ++++--- .../AbsContentListRecyclerViewFragment.kt | 8 +- .../fragment/AbsContentListViewFragment.kt | 10 +- .../AbsContentRecyclerViewFragment.kt | 23 ++- .../fragment/AbsMediaStatusesFragment.kt | 26 +-- .../twidere/fragment/AbsStatusesFragment.kt | 72 ++++---- .../fragment/AbsToolbarTabPagesFragment.kt | 14 +- .../AbsUserMuteBlockDialogFragment.kt | 6 +- .../AccountStreamingSettingsFragment.kt | 2 +- .../fragment/AccountsDashboardFragment.kt | 93 +++++----- .../fragment/AccountsManagerFragment.kt | 34 ++-- .../fragment/AddStatusFilterDialogFragment.kt | 27 +-- .../fragment/AddUserFilterDialogFragment.kt | 4 +- .../fragment/BaseAccountPreferenceFragment.kt | 6 +- .../twidere/fragment/BaseDialogFragment.kt | 10 +- .../twidere/fragment/BaseFragment.kt | 12 +- .../fragment/BasePreferenceFragment.kt | 4 +- .../twidere/fragment/BaseWebViewFragment.kt | 2 +- .../fragment/ColorPickerDialogFragment.kt | 18 +- .../fragment/CreateUserBlockDialogFragment.kt | 2 +- .../fragment/CreateUserListDialogFragment.kt | 6 +- .../fragment/CreateUserMuteDialogFragment.kt | 2 +- .../fragment/CursorActivitiesFragment.kt | 23 +-- .../fragment/CursorStatusesFragment.kt | 27 +-- .../twidere/fragment/CustomTabsFragment.kt | 66 +++---- .../fragment/DateTimePickerDialogFragment.kt | 4 +- .../DeleteUserListMembersDialogFragment.kt | 12 +- .../DestroyFriendshipDialogFragment.kt | 8 +- .../DestroySavedSearchDialogFragment.kt | 12 +- .../fragment/DestroyUserListDialogFragment.kt | 8 +- ...stroyUserListSubscriptionDialogFragment.kt | 10 +- .../fragment/EditAltTextDialogFragment.kt | 10 +- .../fragment/EditUserListDialogFragment.kt | 14 +- .../fragment/ExtensionsListFragment.kt | 14 +- ...ExtraFeaturesIntroductionDialogFragment.kt | 27 +-- .../twidere/fragment/GroupFragment.kt | 16 +- .../fragment/HostMappingsListFragment.kt | 12 +- .../fragment/InteractionsTimelineFragment.kt | 4 +- .../twidere/fragment/ItemsListFragment.kt | 42 +++-- .../twidere/fragment/MessageDialogFragment.kt | 8 +- .../fragment/NetworkDiagnosticsFragment.kt | 4 +- .../fragment/ParcelableGroupsFragment.kt | 20 +-- .../fragment/ParcelableStatusesFragment.kt | 16 +- .../fragment/ParcelableUserListsFragment.kt | 20 +-- .../fragment/ParcelableUsersFragment.kt | 28 +-- .../fragment/PermissionRequestDialog.kt | 18 +- .../PhishingLinkWarningDialogFragment.kt | 4 +- .../fragment/ProgressDialogFragment.kt | 2 +- .../fragment/ReportUserSpamDialogFragment.kt | 2 +- .../fragment/SavedSearchesListFragment.kt | 14 +- .../SensitiveContentWarningDialogFragment.kt | 4 +- .../fragment/SetUserNicknameDialogFragment.kt | 10 +- .../fragment/SettingsDetailsFragment.kt | 15 +- .../twidere/fragment/StubFragment.kt | 4 +- ...dEditTextPreferenceDialogFragmentCompat.kt | 4 +- .../ThemedPreferenceDialogFragmentCompat.kt | 6 +- .../fragment/TrendsSuggestionsFragment.kt | 18 +- .../twidere/fragment/UserFragment.kt | 164 +++++++++--------- .../twidere/fragment/UserGroupsFragment.kt | 2 +- .../twidere/fragment/UserListFragment.kt | 61 ++++--- .../fragment/UserListMembershipsFragment.kt | 4 +- .../fragment/UserListSubscriptionsFragment.kt | 4 +- .../fragment/UserListsOwnershipsFragment.kt | 12 +- .../fragment/UserProfileEditorFragment.kt | 69 ++++---- .../twidere/fragment/UserQrDialogFragment.kt | 10 +- .../fragment/drafts/DraftsListFragment.kt | 30 ++-- .../fragment/filter/AddEditItemFragment.kt | 38 ++-- .../fragment/filter/BaseFiltersFragment.kt | 26 +-- .../filter/BaseFiltersImportFragment.kt | 30 ++-- .../fragment/filter/FilteredUsersFragment.kt | 24 +-- .../filter/FiltersSubscriptionsFragment.kt | 66 +++---- .../twidere/fragment/iface/IBaseFragment.kt | 2 +- .../iface/ISupportDialogFragmentCallback.kt | 2 +- .../fragment/iface/IToolBarSupportFragment.kt | 4 +- .../fragment/iface/SupportFragmentCallback.kt | 2 +- .../fragment/media/ExoPlayerPageFragment.kt | 8 +- .../media/ExternalBrowserPageFragment.kt | 2 +- .../twidere/fragment/media/GifPageFragment.kt | 6 +- .../fragment/media/ImagePageFragment.kt | 6 +- .../fragment/media/VideoPageFragment.kt | 22 +-- .../MessageConversationInfoFragment.kt | 68 ++++---- .../message/MessageNewConversationFragment.kt | 33 ++-- .../message/MessagesConversationFragment.kt | 62 ++++--- .../message/MessagesEntriesFragment.kt | 20 ++- .../fragment/search/MastodonSearchFragment.kt | 6 +- .../twidere/fragment/search/SearchFragment.kt | 9 +- .../AbsSimpleStatusOperationDialogFragment.kt | 6 +- .../status/AbsStatusDialogFragment.kt | 14 +- .../status/BlockStatusUsersDialogFragment.kt | 8 +- .../status/DestroyStatusDialogFragment.kt | 2 +- .../status/FavoriteConfirmDialogFragment.kt | 11 +- .../status/MuteStatusUsersDialogFragment.kt | 8 +- .../status/RetweetQuoteDialogFragment.kt | 26 +-- .../twidere/fragment/status/StatusFragment.kt | 85 +++++---- .../TranslationDestinationDialogFragment.kt | 8 +- .../statuses/GroupTimelineFragment.kt | 27 +-- .../statuses/MediaStatusesSearchFragment.kt | 4 +- .../statuses/NetworkPublicTimelineFragment.kt | 4 +- .../statuses/PublicTimelineFragment.kt | 4 +- .../statuses/StatusesSearchFragment.kt | 13 +- .../statuses/UserFavoritesFragment.kt | 5 +- .../statuses/UserListTimelineFragment.kt | 7 +- .../statuses/UserMediaTimelineFragment.kt | 2 +- .../fragment/statuses/UserMentionsFragment.kt | 6 +- .../fragment/statuses/UserTimelineFragment.kt | 15 +- .../fragment/sync/SyncSettingsFragment.kt | 8 +- .../users/IncomingFriendshipsFragment.kt | 2 +- .../fragment/users/UserListMembersFragment.kt | 4 +- .../twidere/graphic/BadgeDrawable.kt | 2 +- .../twidere/loader/AccountDetailsLoader.kt | 2 +- .../twidere/loader/DefaultAPIConfigLoader.kt | 2 +- .../twidere/loader/ExtensionsListLoader.kt | 2 +- .../twidere/loader/MastodonSearchLoader.kt | 2 +- .../twidere/loader/ParcelableStatusLoader.kt | 2 +- .../twidere/loader/ParcelableUserLoader.kt | 6 +- .../twidere/loader/SavedSearchesLoader.kt | 2 +- .../twidere/loader/group/BaseGroupsLoader.kt | 2 +- .../statuses/AbsRequestStatusesLoader.kt | 2 +- .../loader/statuses/ConversationLoader.kt | 2 +- .../loader/statuses/GroupTimelineLoader.kt | 2 +- .../statuses/MediaStatusesSearchLoader.kt | 2 +- .../loader/statuses/MediaTimelineLoader.kt | 2 +- .../statuses/NetworkPublicTimelineLoader.kt | 2 +- .../statuses/ParcelableStatusesLoader.kt | 2 +- .../loader/statuses/PublicTimelineLoader.kt | 2 +- .../loader/statuses/TweetSearchLoader.kt | 2 +- .../loader/statuses/UserFavoritesLoader.kt | 2 +- .../loader/statuses/UserListTimelineLoader.kt | 2 +- .../loader/statuses/UserTimelineLoader.kt | 2 +- .../loader/userlists/BaseUserListsLoader.kt | 2 +- .../loader/users/ParcelableUsersLoader.kt | 2 +- .../twidere/loader/users/UserBlocksLoader.kt | 2 +- .../twidere/menu/AccountActionProvider.kt | 2 +- .../twidere/menu/FavoriteItemProvider.kt | 8 +- .../twidere/menu/RetweetItemProvider.kt | 6 +- .../menu/SupportStatusShareProvider.kt | 2 +- .../twidere/model/AccountPreferences.kt | 2 +- .../model/ActivityTitleSummaryMessage.kt | 2 +- .../mariotaku/twidere/model/SupportTabSpec.kt | 2 +- .../notification/NotificationChannelSpec.kt | 2 +- .../twidere/model/tab/TabConfiguration.kt | 6 +- .../model/util/ParcelableMessageUtils.kt | 2 +- .../model/util/ParcelableRelationshipUtils.kt | 2 +- .../preference/AccountsListPreference.kt | 10 +- .../twidere/preference/AsyncTaskPreference.kt | 2 +- .../preference/CardPreviewPreference.kt | 6 +- .../preference/ColorPickerPreference.kt | 17 +- .../preference/DefaultAPIPreference.kt | 6 +- .../FavoriteConfirmSwitchPreference.kt | 4 +- .../HiddenSettingEntryPreference.kt | 4 +- .../preference/KeyboardShortcutPreference.kt | 12 +- .../preference/PremiumEntryPreference.kt | 6 +- .../RandomizeAccountNamePreference.kt | 18 +- .../preference/RefreshIntervalPreference.kt | 2 +- .../preference/ThemedEditTextPreference.kt | 6 +- .../preference/ThemedListPreference.kt | 6 +- .../preference/TintedPreferenceCategory.kt | 4 +- .../preference/iface/IDialogPreference.kt | 2 +- .../AccountNotificationChannelsPreference.kt | 6 +- .../preference/sync/SyncItemPreference.kt | 2 +- .../twidere/provider/CacheProvider.kt | 6 +- .../twidere/provider/TwidereDataProvider.kt | 2 +- .../receiver/ConnectivityStateReceiver.kt | 2 +- .../service/LengthyOperationsService.kt | 6 +- .../twidere/service/StreamingService.kt | 8 +- .../twidere/task/ProgressSaveFileTask.kt | 2 +- .../twidere/task/UpdateAccountInfoTask.kt | 2 +- .../task/cache/CacheTimelineResultTask.kt | 2 +- .../twidere/task/twitter/GetActivitiesTask.kt | 2 +- .../twidere/task/twitter/GetTrendsTask.kt | 2 +- .../twidere/task/twitter/UpdateStatusTask.kt | 11 +- .../twidere/util/ContentScrollHandler.kt | 2 +- .../twidere/util/DataStoreFunctions.kt | 4 +- .../mariotaku/twidere/util/DataStoreUtils.kt | 2 +- .../org/mariotaku/twidere/util/DeviceUtils.kt | 2 +- .../util/DirectMessageOnLinkClickHandler.kt | 2 +- .../mariotaku/twidere/util/ErrorInfoStore.kt | 2 +- .../twidere/util/ExternalThemeManager.kt | 2 +- .../org/mariotaku/twidere/util/IntentUtils.kt | 6 +- .../twidere/util/MapFragmentFactory.kt | 2 +- .../org/mariotaku/twidere/util/MenuUtils.kt | 16 +- .../twidere/util/OnLinkClickHandler.kt | 2 +- .../twidere/util/PreviewGridItemDecoration.kt | 4 +- .../twidere/util/RecyclerViewScrollHandler.kt | 6 +- .../util/StatusAdapterLinkClickHandler.kt | 2 +- .../twidere/util/TaskServiceRunner.kt | 2 +- .../org/mariotaku/twidere/util/ThemeUtils.kt | 24 +-- .../twidere/util/TwidereViewUtils.kt | 2 +- .../twidere/util/UserColorNameManager.kt | 4 +- .../org/mariotaku/twidere/util/Utils.kt | 14 +- .../util/api/TwitterConverterFactory.kt | 2 +- .../twidere/util/cache/DiskLRUFileCache.kt | 3 +- .../twidere/util/dagger/ApplicationModule.kt | 4 +- .../twidere/util/dagger/GeneralComponent.kt | 2 +- .../PauseRecyclerViewOnScrollListener.kt | 4 +- .../twidere/util/net/SystemDnsFetcher.kt | 2 +- .../ContentNotificationManager.kt | 2 +- .../util/premium/ExtraFeaturesService.kt | 2 +- .../refresh/LegacyAutoRefreshController.kt | 2 +- .../util/schedule/StatusScheduleProvider.kt | 2 +- .../twidere/util/shortcut/ShortcutCreator.kt | 13 +- .../TwitterTimelineStreamCallback.kt | 2 +- .../util/support/AccountManagerSupport.kt | 2 +- .../util/sync/FileBasedDraftsSyncAction.kt | 2 +- .../twidere/util/sync/ISyncAction.kt | 2 +- .../twidere/util/sync/LegacySyncController.kt | 2 +- .../twidere/util/sync/TimelineSyncManager.kt | 5 +- .../twidere/util/view/AppBarChildBehavior.kt | 10 +- .../twidere/view/ActionIconThemedTextView.kt | 2 +- .../mariotaku/twidere/view/BoundsImageView.kt | 2 +- .../mariotaku/twidere/view/ComposeEditText.kt | 6 +- .../twidere/view/ExtendedFrameLayout.kt | 2 +- .../twidere/view/ExtendedImageView.kt | 4 +- .../twidere/view/ExtendedLinearLayout.kt | 2 +- .../twidere/view/ExtendedRecyclerView.kt | 2 +- .../twidere/view/ExtendedRelativeLayout.kt | 4 +- .../view/ExtendedSwipeRefreshLayout.kt | 2 +- .../twidere/view/ExtendedViewPager.kt | 2 +- .../twidere/view/IconActionButton.kt | 6 +- .../mariotaku/twidere/view/IconActionView.kt | 6 +- .../org/mariotaku/twidere/view/NameView.kt | 2 +- .../twidere/view/ProfileBannerImageView.kt | 2 +- .../mariotaku/twidere/view/ShortTimeView.kt | 2 +- .../twidere/view/StatusTextCountView.kt | 4 +- .../twidere/view/TintedStatusFrameLayout.kt | 4 +- .../view/TintedStatusRelativeLayout.kt | 4 +- .../premium/SyncStatusViewController.kt | 8 +- .../twitter/card/CardPollViewController.kt | 2 +- .../twidere/view/holder/AccountViewHolder.kt | 2 +- .../holder/ActivityTitleSummaryViewHolder.kt | 4 +- .../twidere/view/holder/DraftViewHolder.kt | 2 +- .../twidere/view/holder/EmptyViewHolder.kt | 2 +- .../twidere/view/holder/GapViewHolder.kt | 2 +- .../twidere/view/holder/GroupViewHolder.kt | 2 +- .../view/holder/LoadIndicatorViewHolder.kt | 2 +- .../view/holder/MediaStatusViewHolder.kt | 2 +- .../view/holder/SimpleUserListViewHolder.kt | 2 +- .../view/holder/SimpleUserViewHolder.kt | 2 +- .../twidere/view/holder/StatusViewHolder.kt | 10 +- .../holder/TimelineFilterHeaderViewHolder.kt | 2 +- .../view/holder/TwoLineWithIconViewHolder.kt | 2 +- .../twidere/view/holder/UserListViewHolder.kt | 2 +- .../twidere/view/holder/UserViewHolder.kt | 2 +- .../holder/compose/MediaPreviewViewHolder.kt | 2 +- .../holder/message/AbsMessageViewHolder.kt | 4 +- .../holder/message/MessageEntryViewHolder.kt | 2 +- .../holder/status/DetailStatusViewHolder.kt | 20 +-- .../twidere/view/iface/IExtendedView.kt | 2 +- .../twidere/view/iface/IIconActionButton.kt | 2 +- .../AccountsSelectorTransformer.kt | 2 +- .../view/viewer/MediaSwipeCloseContainer.kt | 12 +- .../layout-sw600dp/activity_link_handler.xml | 4 +- .../src/main/res/layout/activity_compose.xml | 2 +- .../main/res/layout/activity_home_content.xml | 6 +- .../main/res/layout/activity_link_handler.xml | 2 +- .../res/layout/activity_quick_search_bar.xml | 6 +- .../src/main/res/layout/activity_settings.xml | 4 +- .../src/main/res/layout/activity_sign_in.xml | 2 +- .../adapter_item_extra_feature_normal.xml | 4 +- .../res/layout/adapter_item_media_status.xml | 4 +- .../layout/dialog_auto_complete_textview.xml | 2 +- .../res/layout/dialog_filter_rule_editor.xml | 4 +- .../layout/dialog_status_quote_retweet.xml | 2 +- .../layout/fragment_accounts_dashboard.xml | 2 +- .../layout/fragment_messages_conversation.xml | 4 +- .../fragment_messages_conversation_info.xml | 18 +- .../fragment_messages_conversation_new.xml | 2 +- .../res/layout/fragment_toolbar_tab_pages.xml | 2 +- twidere/src/main/res/layout/fragment_user.xml | 2 +- .../layout/header_drawer_account_selector.xml | 2 +- .../header_message_conversation_info.xml | 6 +- ...message_conversation_info_button_space.xml | 6 +- twidere/src/main/res/layout/header_status.xml | 4 +- .../res/layout/layout_actionbar_content.xml | 2 +- .../layout_actionbar_message_user_picker.xml | 4 +- .../main/res/layout/layout_menu_item_icon.xml | 2 +- .../layout_preference_switch_indicator.xml | 2 +- .../src/main/res/layout/list_item_account.xml | 2 +- .../list_item_conversation_info_add_user.xml | 4 +- .../list_item_conversation_info_space.xml | 2 +- .../list_item_conversation_info_user.xml | 4 +- ...ference_widget_account_preference_item.xml | 2 +- 614 files changed, 2219 insertions(+), 2016 deletions(-) rename twidere/src/main/java/{android/support/v4 => androidx/drawerlayout}/widget/DrawerLayoutAccessor.java (92%) rename twidere/src/main/java/{android/support/v4 => androidx/fragment}/app/FragmentAccessor.java (73%) rename twidere/src/main/java/{android/support/v4 => androidx/fragment}/app/ListFragmentAccessor.java (72%) rename twidere/src/main/java/{android/support/v4 => androidx/loader}/content/LoaderAccessor.java (93%) rename twidere/src/main/java/{android/support/v7 => androidx/recyclerview}/widget/FixedLinearLayoutManager.java (94%) rename twidere/src/main/java/{android/support/v7 => androidx/recyclerview}/widget/RecyclerViewAccessor.java (71%) delete mode 100644 twidere/src/main/kotlin/android/support/v4/app/LoaderManagerExtensions.kt rename twidere/src/main/kotlin/{android/support/v7 => androidx/appcompat}/app/TwilightManagerAccessor.kt (92%) rename twidere/src/main/kotlin/{android/support/v7 => androidx/appcompat}/app/WindowDecorActionBarAccessor.kt (51%) rename twidere/src/main/kotlin/{android/support/v7 => androidx/appcompat}/view/menu/TwidereActionMenuItemView.kt (87%) rename twidere/src/main/kotlin/{android/support/v7 => androidx/appcompat}/widget/TwidereActionMenuView.kt (92%) rename twidere/src/main/kotlin/{android/support/v7 => androidx/appcompat}/widget/TwidereToolbar.kt (98%) rename twidere/src/main/kotlin/{android/support/v4 => androidx/core}/os/LocaleHelperAccessor.kt (75%) rename twidere/src/main/kotlin/{android/support/v4 => androidx/core}/view/WindowInsetsCompatAccessor.kt (92%) create mode 100644 twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt rename twidere/src/main/kotlin/{android/support/v4 => androidx/loader}/content/FixedAsyncTaskLoader.kt (90%) rename twidere/src/main/kotlin/{android/support/v7 => androidx/recyclerview}/widget/RecyclerViewAccessor.kt (90%) diff --git a/build.gradle b/build.gradle index bbd9fe268..4e0d31c45 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,11 @@ allprojects { projectVersionName = '3.7.8' globalCompileSdkVersion = 29 - globalBuildToolsVersion = '28.0.3' + globalBuildToolsVersion = '29.0.2' + + + globalMinSdkVersion = 19 + globalTargetSdkVersion = 29 } repositories { @@ -29,6 +33,7 @@ allprojects { jcenter() maven { url 'https://maven.google.com' } maven { url 'https://jitpack.io' } + google() } } @@ -36,7 +41,7 @@ allprojects { subprojects { buildscript { ext { - kotlinVersion = '1.3.50' + kotlinVersion = '1.3.61' pluginVersions = [ AndroidSvgDrawable: '3.0.0', PlayServices : '3.1.1', @@ -60,7 +65,7 @@ subprojects { OkHttp : '3.8.1', Stetho : '1.5.0', OSMDroid : '5.6.5', - LeakCanary : '1.5.1', + LeakCanary : '2.1', TwitterText : '1.14.7', MediaViewerLibrary : '0.9.23', MultiValueSwitch : '0.9.8', @@ -69,7 +74,7 @@ subprojects { KPreferences : '0.9.7', Kovenant : '3.3.0', ParcelablePlease : '1.0.2', - Chameleon : '0.9.22', + Chameleon : '0.9.27', UniqR : '0.9.4', SQLiteQB : '0.9.15', Glide : '3.7.0', diff --git a/gradle.properties b/gradle.properties index fd4504aac..0dc9a03d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ org.gradle.jvmargs=-Xmx3584m #https://github.com/TwidereProject/Twidere-Android/issues/963 -android.enableAapt2=false \ No newline at end of file +android.enableAapt2=false +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1037cc00b..5f55637d5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index a47b7ebb5..4e5a36a3d 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -49,8 +49,8 @@ android { buildToolsVersion globalBuildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 29 + minSdkVersion globalMinSdkVersion + targetSdkVersion globalTargetSdkVersion versionCode projectVersionCode versionName projectVersionName } @@ -73,7 +73,7 @@ dependencies { annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}" annotationProcessor "com.github.mariotaku.ExportablePreferences:processor:${libVersions['ExportablePreferences']}" - implementation "com.android.support:support-annotations:${libVersions['SupportLib']}" + implementation 'androidx.annotation:annotation:1.1.0' implementation "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}" implementation "com.fasterxml.jackson.core:jackson-core:2.7.4" implementation "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}" diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java index 9d0baa451..6a829ccb8 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.fanfou.callback; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.mariotaku.microblog.library.MicroBlogException; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java index 1d0a9ae64..8a0a9c00d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.fanfou.callback; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mariotaku.microblog.library.twitter.model.Status; import org.mariotaku.microblog.library.twitter.model.User; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java index 08df2d13a..84635a99b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.fanfou.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/AuthScope.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/AuthScope.java index a8bf2e96d..234c11d64 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/AuthScope.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/AuthScope.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.mastodon.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/StatusVisibility.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/StatusVisibility.java index 82cbaa619..ee404c634 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/StatusVisibility.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/StatusVisibility.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.mastodon.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AccountsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AccountsResources.java index 888e01808..267a9aba3 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AccountsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AccountsResources.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.mastodon.api; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.microblog.library.MicroBlogException; import org.mariotaku.microblog.library.mastodon.model.Account; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AppsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AppsResources.java index b7d4d1fff..e8703e46e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AppsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AppsResources.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.mastodon.api; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.microblog.library.MicroBlogException; import org.mariotaku.microblog.library.mastodon.model.RegisteredApplication; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/callback/MastodonUserStreamCallback.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/callback/MastodonUserStreamCallback.java index 74abb2f03..acd66e01e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/callback/MastodonUserStreamCallback.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/callback/MastodonUserStreamCallback.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.mastodon.callback; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.mariotaku.microblog.library.MicroBlogException; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java index 09b7c6992..d996d1bf9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.mastodon.model; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList.java index be7ba0fcf..45b7d3793 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.mastodon.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mariotaku.restfu.http.HttpResponse; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderResponse.java index 1882d59b2..fdb43554e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderResponse.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderResponse.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.mastodon.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.mariotaku.restfu.http.HttpResponse; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Notification.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Notification.java index 899798146..1e4e7a739 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Notification.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Notification.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.mastodon.model; -import android.support.annotation.Nullable; -import android.support.annotation.StringDef; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Results.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Results.java index 0a53c4f24..9c9cc5434 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Results.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Results.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.mastodon.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/MediaCategory.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/MediaCategory.java index efac472df..77800f3c3 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/MediaCategory.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/MediaCategory.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/StreamWith.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/StreamWith.java index 8878d8e1e..ebe73666e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/StreamWith.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/StreamWith.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BasicAuthorization.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BasicAuthorization.java index 1de3f1868..c2e184ecc 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BasicAuthorization.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BasicAuthorization.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.auth; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import org.mariotaku.restfu.RestRequest; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BearerAuthorization.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BearerAuthorization.java index 6452e10e1..ae1895590 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BearerAuthorization.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BearerAuthorization.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.auth; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.restfu.RestRequest; import org.mariotaku.restfu.http.Authorization; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/EmptyAuthorization.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/EmptyAuthorization.java index 75a678243..2a275b752 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/EmptyAuthorization.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/EmptyAuthorization.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.auth; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.restfu.RestRequest; import org.mariotaku.restfu.http.Authorization; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/SimpleUserStreamCallback.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/SimpleUserStreamCallback.java index a054a898d..3f6d694b3 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/SimpleUserStreamCallback.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/SimpleUserStreamCallback.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.callback; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.microblog.library.twitter.model.DeletionEvent; import org.mariotaku.microblog.library.twitter.model.DirectMessage; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/UserStreamCallback.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/UserStreamCallback.java index f01d1f4b1..549ccb713 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/UserStreamCallback.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/UserStreamCallback.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.callback; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.mariotaku.microblog.library.MicroBlogException; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity.java index 36857d359..4976c58d4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity.java @@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.StringDef; +import androidx.annotation.NonNull; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java index 244c1bc4e..ab83d32d1 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.LoganSquare; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DMResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DMResponse.java index 422bc6863..b47accd53 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DMResponse.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DMResponse.java @@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedProfile.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedProfile.java index f803d0c52..97b31b5c8 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedProfile.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedProfile.java @@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoLocation.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoLocation.java index 473dfb426..d6aaecea6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoLocation.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoLocation.java @@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoQuery.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoQuery.java index 4e06506fb..ea4a3ca4c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoQuery.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoQuery.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.restfu.http.ValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java index 95c9b4292..2d3798f31 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.bluelinelabs.logansquare.JsonMapper; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java index dedf3dd40..abf71a486 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java @@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaEntity.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaEntity.java index e13192601..4221e066e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaEntity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaEntity.java @@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.StringDef; +import androidx.annotation.IntDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaUploadResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaUploadResponse.java index 4aae4487e..24babc11c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaUploadResponse.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaUploadResponse.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.Nullable; -import android.support.annotation.StringDef; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java index 12ce7a0b9..3231476d0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java index 784f28e2c..6c8cc20cc 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.Keep; +import androidx.annotation.Keep; /** * Response list supports cursor pagination diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Place.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Place.java index 004407d22..e0231eddd 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Place.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Place.java @@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseCode.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseCode.java index 719f26666..97200a17a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseCode.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseCode.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.microblog.library.MicroBlogException; import org.mariotaku.restfu.RestConverter; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java index 32215988c..880938d82 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import org.mariotaku.microblog.library.twitter.util.InternalParseUtil; import org.mariotaku.restfu.http.HttpResponse; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SavedSearch.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SavedSearch.java index 14b5b06ab..b25436f27 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SavedSearch.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SavedSearch.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ScheduledStatus.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ScheduledStatus.java index 22122454a..928fb1076 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ScheduledStatus.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ScheduledStatus.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SearchQuery.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SearchQuery.java index 83bdf76a9..da4b4fbe4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SearchQuery.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SearchQuery.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java index e89ba93b9..904ef0f18 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java @@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.bluelinelabs.logansquare.annotation.JsonField; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusUpdate.java index 48272da3b..df20b11d1 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusUpdate.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mariotaku.restfu.RestFuUtils; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trends.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trends.java index a54052aeb..ad6dbd8b4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trends.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trends.java @@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponse.java index 4278d8367..cd67f9e6a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponse.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponse.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import org.mariotaku.restfu.http.HttpResponse; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterStreamObject.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterStreamObject.java index cf54c2e71..a069d18a2 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterStreamObject.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterStreamObject.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchQuery.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchQuery.java index 13aa9d4e2..2d2a73e1c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchQuery.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchQuery.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import org.mariotaku.microblog.library.twitter.util.InternalArrayUtil; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java index 9f0e3c88f..3eea4da04 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/User.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/User.java index 05590a608..8a0f73c63 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/User.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/User.java @@ -21,8 +21,8 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserList.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserList.java index 3bbeff3ee..1116f8e80 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserList.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserList.java @@ -20,8 +20,8 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.StringDef; +import androidx.annotation.NonNull; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/OAuthTokenResponseConverter.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/OAuthTokenResponseConverter.java index ba6737c1e..88e067cd2 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/OAuthTokenResponseConverter.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/OAuthTokenResponseConverter.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.microblog.library.MicroBlogException; import org.mariotaku.restfu.RestConverter; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/ThreadLocalSimpleDateFormat.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/ThreadLocalSimpleDateFormat.java index 28a68b618..f2e4a2762 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/ThreadLocalSimpleDateFormat.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/ThreadLocalSimpleDateFormat.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library.twitter.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.text.AttributedCharacterIterator; import java.text.DateFormat; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AccountType.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AccountType.java index bda9a8fb1..ce977271a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AccountType.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AccountType.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AuthTypeInt.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AuthTypeInt.java index e37a3d83e..e53ee65c3 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AuthTypeInt.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/AuthTypeInt.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/CustomTabType.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/CustomTabType.java index d1caa53b0..0deff1af8 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/CustomTabType.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/CustomTabType.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java index d3d988485..2d0392831 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/AccountDetails.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/AccountDetails.java index 3e87ac0c4..b31df26a9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/AccountDetails.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/AccountDetails.java @@ -21,8 +21,8 @@ package org.mariotaku.twidere.model; import android.accounts.Account; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.annotation.JsonField; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ConsumerKeyType.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ConsumerKeyType.java index 79fd4cbd4..549db2714 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ConsumerKeyType.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ConsumerKeyType.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by mariotaku on 15/4/20. diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Draft.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Draft.java index a1744947b..651007b15 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Draft.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Draft.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; -import android.support.annotation.StringDef; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/FiltersData.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/FiltersData.java index c9e594801..e5bb14bf0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/FiltersData.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/FiltersData.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.model; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableActivity.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableActivity.java index b385c3015..29865e891 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableActivity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableActivity.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableCardEntity.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableCardEntity.java index abed6274b..09769dd20 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableCardEntity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableCardEntity.java @@ -21,8 +21,8 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableGroup.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableGroup.java index 75cbc10b9..413f33bb5 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableGroup.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableGroup.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java index 5f88f889f..350975a6a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java @@ -22,8 +22,8 @@ import android.content.ContentValues; import android.database.Cursor; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java index e88cc5cbf..03c158424 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java @@ -20,9 +20,9 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java index c1c788ecb..07d652e6a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessage.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessage.java index 3221176e2..08accad7d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessage.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessage.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessageConversation.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessageConversation.java index 7f8d369ae..4e5985d6c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessageConversation.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMessageConversation.java @@ -21,8 +21,8 @@ package org.mariotaku.twidere.model; import android.content.ContentValues; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; -import android.support.annotation.StringDef; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java index f25152a9b..0239de25c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java @@ -20,9 +20,10 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.LongDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.bluelinelabs.logansquare.annotation.JsonField; @@ -582,7 +583,7 @@ public class ParcelableStatus implements Parcelable, Comparable * DO NOT CHANGE ONCE DEFINED! */ - @IntDef(value = { + @LongDef(value = { FilterFlags.QUOTE_NOT_AVAILABLE, FilterFlags.BLOCKING_USER, FilterFlags.BLOCKED_BY_USER, diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java index 9f16afdac..21433334c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java index 2af5bf43e..b21c2b281 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java index f3c85b312..9a9354896 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/SpanItem.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/SpanItem.java index ca93745c0..42d1c195c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/SpanItem.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/SpanItem.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Tab.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Tab.java index 658419cf5..847ffcc38 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Tab.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/Tab.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/UserKey.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/UserKey.java index 311c1a27f..e3ecd7900 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/UserKey.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/UserKey.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java index e17181dbb..876ebeced 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.model.account; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/cred/Credentials.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/cred/Credentials.java index ab0f109a4..66deaae63 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/cred/Credentials.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/cred/Credentials.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.account.cred; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/MessageExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/MessageExtras.java index 5db33b2b4..e10bd3bee 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/MessageExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/MessageExtras.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.model.message; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/StickerExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/StickerExtras.java index 7412a578f..b9e59b028 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/StickerExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/StickerExtras.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.message; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java index df4dac49c..345db02fc 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.model.message.conversation; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TabArguments.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TabArguments.java index a3f399d33..da9e205e8 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TabArguments.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TabArguments.java @@ -19,9 +19,9 @@ package org.mariotaku.twidere.model.tab.argument; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.annotation.JsonField; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TextQueryArguments.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TextQueryArguments.java index cb528e1f5..0228682ac 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TextQueryArguments.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/TextQueryArguments.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.tab.argument; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserArguments.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserArguments.java index 9d0f253f5..ba8fba18c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserArguments.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserArguments.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.tab.argument; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserListArguments.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserListArguments.java index 7075ecfa4..09ad87522 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserListArguments.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/argument/UserListArguments.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.tab.argument; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/extra/TabExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/extra/TabExtras.java index 6b6549d0f..cc5100001 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/extra/TabExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/tab/extra/TabExtras.java @@ -20,9 +20,9 @@ package org.mariotaku.twidere.model.tab.extra; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java index d0c45660e..f936f915b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/DraftExtrasFieldConverter.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.util; import android.content.ContentValues; import android.database.Cursor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java index af2c685ab..869921ec7 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.provider; import android.content.ContentResolver; import android.net.Uri; import android.provider.BaseColumns; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.DraftTableInfo; import org.mariotaku.twidere.model.FiltersData$BaseItemTableInfo; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/JsonSerializer.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/util/JsonSerializer.java index ad3285d15..b9c9a6f04 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/JsonSerializer.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/util/JsonSerializer.java @@ -18,8 +18,8 @@ package org.mariotaku.twidere.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.ParameterizedType; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/filter/FiltersSubscriptionProvider.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/util/filter/FiltersSubscriptionProvider.java index 3a0ad92b9..ce73e247c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/filter/FiltersSubscriptionProvider.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/util/filter/FiltersSubscriptionProvider.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.util.filter; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.twidere.model.FiltersData; diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index d1125c0a0..8ee004d73 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -27,8 +27,8 @@ android { buildToolsVersion globalBuildToolsVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 29 + minSdkVersion globalMinSdkVersion + targetSdkVersion globalTargetSdkVersion versionCode 1 versionName "1.0" } @@ -41,5 +41,5 @@ android { } dependencies { - implementation "com.android.support:support-compat:${libVersions['SupportLib']}" + implementation 'androidx.core:core:1.1.0' } diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java b/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java index 8e19c0873..c0357bd88 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java +++ b/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java @@ -33,7 +33,7 @@ import android.graphics.Shader.TileMode; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import java.util.ArrayList; import java.util.Calendar; diff --git a/twidere/build.gradle b/twidere/build.gradle index 34e307a72..f980b33be 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -33,8 +33,8 @@ android { defaultConfig { applicationId "org.mariotaku.twidere" - minSdkVersion 14 - targetSdkVersion 29 + minSdkVersion globalMinSdkVersion + targetSdkVersion globalTargetSdkVersion versionCode projectVersionCode versionName projectVersionName multiDexEnabled true @@ -42,7 +42,7 @@ android { buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("false")' buildConfigField 'boolean', 'SHOW_CUSTOM_TOKEN_DIALOG', 'Boolean.parseBoolean("false")' - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { @@ -192,26 +192,26 @@ dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation "com.android.support:support-annotations:${libVersions['SupportLib']}" - androidTestImplementation "com.android.support.test:runner:${libVersions['SupportTest']}" - androidTestImplementation "com.android.support.test:rules:${libVersions['SupportTest']}" + androidTestImplementation 'androidx.annotation:annotation:1.1.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test:rules:1.2.0' // https://g.co/androidstudio/app-test-app-conflict - androidTestImplementation "com.google.code.findbugs:jsr305:3.0.1" + androidTestImplementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.android.support:multidex:1.0.2' - implementation "com.android.support:support-annotations:${libVersions['SupportLib']}" - implementation "com.android.support:support-compat:${libVersions['SupportLib']}" - implementation "com.android.support:support-core-utils:${libVersions['SupportLib']}" - implementation "com.android.support:support-core-ui:${libVersions['SupportLib']}" - implementation "com.android.support:support-v13:${libVersions['SupportLib']}" - implementation "com.android.support:appcompat-v7:${libVersions['SupportLib']}" - implementation "com.android.support:cardview-v7:${libVersions['SupportLib']}" - implementation "com.android.support:recyclerview-v7:${libVersions['SupportLib']}" - implementation "com.android.support:palette-v7:${libVersions['SupportLib']}" - implementation "com.android.support:preference-v14:${libVersions['SupportLib']}" - implementation "com.android.support:customtabs:${libVersions['SupportLib']}" - implementation "com.android.support:design:${libVersions['SupportLib']}" - implementation "com.android.support:exifinterface:${libVersions['SupportLib']}" + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.core:core:1.1.0' + implementation 'androidx.legacy:legacy-support-core-utils:1.0.0' + implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' + implementation 'androidx.legacy:legacy-support-v13:1.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.legacy:legacy-preference-v14:1.0.0' + implementation 'androidx.browser:browser:1.2.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.1.0' implementation "com.twitter:twitter-text:${libVersions['TwitterText']}" implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' implementation 'com.squareup:otto:1.3.8' diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt index 0b08d957e..8965337d6 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTest.kt @@ -21,8 +21,8 @@ package org.mariotaku.twidere.activity import android.annotation.SuppressLint import android.content.Intent -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import kotlinx.android.synthetic.main.activity_compose.* import org.junit.Assert import org.junit.Rule diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTestRule.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTestRule.kt index e07a6d16f..fe6239fea 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTestRule.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/activity/ComposeActivityTestRule.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.activity -import android.support.test.rule.ActivityTestRule +import androidx.test.rule.ActivityTestRule import org.mariotaku.twidere.util.TestAccountUtils /** diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/FileExtensionsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/FileExtensionsTest.kt index 8217467f1..5e8262fc4 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/FileExtensionsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/FileExtensionsTest.kt @@ -19,8 +19,8 @@ package org.mariotaku.twidere.extension -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/ViewExtensionsKtTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/ViewExtensionsKtTest.kt index 24883f208..aa540572b 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/ViewExtensionsKtTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/ViewExtensionsKtTest.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension -import android.support.test.runner.AndroidJUnit4 +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/DraftExtensionsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/DraftExtensionsTest.kt index 20e204475..8ebeb86f8 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/DraftExtensionsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/DraftExtensionsTest.kt @@ -1,8 +1,8 @@ package org.mariotaku.twidere.extension.model import android.net.Uri -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensionsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensionsTest.kt index 20dd5806e..641b39d5f 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensionsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensionsTest.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.extension.model -import android.support.test.runner.AndroidJUnit4 +import androidx.test.ext.junit.runners.AndroidJUnit4 import android.util.Xml import org.junit.Assert import org.junit.Test diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt index 41d7ccff1..8b9aae90a 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt @@ -19,8 +19,8 @@ package org.mariotaku.twidere.extension.text.twitter -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.twitter.Extractor import org.junit.Assert import org.junit.Before diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/model/util/ParcelableStatusUtilsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/model/util/ParcelableStatusUtilsTest.kt index 489a70550..016f161cc 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/model/util/ParcelableStatusUtilsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/model/util/ParcelableStatusUtilsTest.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.model.util -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/provider/TwidereDataStoreTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/provider/TwidereDataStoreTest.kt index 66528e6aa..3d0ec7001 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/provider/TwidereDataStoreTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/provider/TwidereDataStoreTest.kt @@ -1,8 +1,8 @@ package org.mariotaku.twidere.provider import android.net.Uri -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/DataStoreUtilsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/DataStoreUtilsTest.kt index 93f1b09b9..8d63bb52f 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/DataStoreUtilsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/DataStoreUtilsTest.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/MapFragmentFactoryTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/MapFragmentFactoryTest.kt index f228fcc9b..51bab6bed 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/MapFragmentFactoryTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/MapFragmentFactoryTest.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/ObjectCursorTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/ObjectCursorTest.kt index 84cf97285..2054c465f 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/ObjectCursorTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/ObjectCursorTest.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import android.database.MatrixCursor -import android.support.test.runner.AndroidJUnit4 +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith import org.mariotaku.library.objectcursor.ObjectCursor diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/StatusShortenerInterfaceTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/StatusShortenerInterfaceTest.kt index e629d16d8..7df597592 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/StatusShortenerInterfaceTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/StatusShortenerInterfaceTest.kt @@ -2,9 +2,9 @@ package org.mariotaku.twidere.util import android.app.Application import android.content.Context -import android.support.test.InstrumentationRegistry -import android.support.test.filters.FlakyTest -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.filters.FlakyTest +import androidx.test.ext.junit.runners.AndroidJUnit4 import android.text.TextUtils import org.junit.Assert import org.junit.Test diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestAccountUtils.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestAccountUtils.kt index 12152d1e2..efff879c2 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestAccountUtils.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestAccountUtils.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import android.accounts.AccountManager -import android.support.test.InstrumentationRegistry +import androidx.test.platform.app.InstrumentationRegistry import org.mariotaku.twidere.extension.model.updateDetails import org.mariotaku.twidere.model.AccountDetails import org.mariotaku.twidere.model.util.AccountUtils diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestCommons.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestCommons.kt index c17f11b78..c01c27830 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestCommons.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/TestCommons.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import android.content.res.Resources -import android.support.annotation.RawRes +import androidx.annotation.RawRes /** * Created by mariotaku on 2017/4/16. diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/UtilsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/UtilsTest.kt index 8369ee972..396e23460 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/UtilsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/UtilsTest.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/filter/UrlFiltersSubscriptionProviderTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/filter/UrlFiltersSubscriptionProviderTest.kt index c4e746dba..5f187fd5e 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/filter/UrlFiltersSubscriptionProviderTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/filter/UrlFiltersSubscriptionProviderTest.kt @@ -2,8 +2,8 @@ package org.mariotaku.twidere.util.filter import android.content.Context import android.net.ConnectivityManager -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith import org.mariotaku.twidere.model.filter.UrlFiltersSubscriptionProviderArguments diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/media/preview/provider/InstagramProviderTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/media/preview/provider/InstagramProviderTest.kt index 46d2b89fe..0668c027e 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/media/preview/provider/InstagramProviderTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/util/media/preview/provider/InstagramProviderTest.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.util.media.preview.provider -import android.support.test.runner.AndroidJUnit4 +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/twidere/src/debug/java/org/mariotaku/twidere/util/DebugModeUtils.java b/twidere/src/debug/java/org/mariotaku/twidere/util/DebugModeUtils.java index e82562bf1..8c20de5a3 100644 --- a/twidere/src/debug/java/org/mariotaku/twidere/util/DebugModeUtils.java +++ b/twidere/src/debug/java/org/mariotaku/twidere/util/DebugModeUtils.java @@ -25,8 +25,6 @@ import android.webkit.WebView; import com.facebook.stetho.Stetho; import com.facebook.stetho.okhttp3.StethoInterceptor; -import com.squareup.leakcanary.LeakCanary; -import com.squareup.leakcanary.RefWatcher; import org.mariotaku.stethoext.bsh.BshRuntimeReplFactoryBuilder; import org.mariotaku.twidere.BuildConfig; @@ -41,8 +39,6 @@ import okhttp3.OkHttpClient; */ public class DebugModeUtils { - private static RefWatcher sRefWatcher; - private DebugModeUtils() { } @@ -67,25 +63,8 @@ public class DebugModeUtils { .runtimeRepl(new BshRuntimeReplFactoryBuilder(application).build()) .finish()) .build()); - initLeakCanary(application); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - WebView.setWebContentsDebuggingEnabled(true); +// WebView.setWebContentsDebuggingEnabled(true); } } - - static void initLeakCanary(Application application) { - if (!BuildConfig.LEAK_CANARY_ENABLED) return; - LeakCanary.enableDisplayLeakActivity(application); - if (LeakCanary.isInAnalyzerProcess(application)) { - // This process is dedicated to LeakCanary for heap analysis. - // You should not init your app in this process. - return; - } - sRefWatcher = LeakCanary.install(application); - } - - public static void watchReferenceLeak(final Object object) { - if (sRefWatcher == null) return; - sRefWatcher.watch(object); - } } diff --git a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt index 5707b7125..f67f98272 100644 --- a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt +++ b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.activity import android.os.Bundle -import android.support.v4.widget.TextViewCompat +import androidx.core.widget.TextViewCompat import android.view.View import android.widget.TextView import org.acra.dialog.CrashReportDialog diff --git a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt index 8283e5d76..2c50e5e61 100644 --- a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt +++ b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt @@ -23,7 +23,7 @@ import android.content.Context import android.graphics.Point import android.graphics.drawable.Drawable import android.os.Bundle -import android.support.v4.content.res.ResourcesCompat +import androidx.core.content.res.ResourcesCompat import android.view.* import kotlinx.android.synthetic.fdroid.activity_osm_viewer.* import org.mariotaku.ktextension.preferExternalCacheDir @@ -49,11 +49,11 @@ class OpenStreetMapViewerFragment : BaseFragment(), Constants { override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) - val args = arguments + val args = arguments ?: return val latitude = args.getDouble(EXTRA_LATITUDE, Double.NaN) val longitude = args.getDouble(EXTRA_LONGITUDE, Double.NaN) if (latitude.isNaN() || longitude.isNaN()) { - activity.finish() + activity?.finish() return } this.latitude = latitude diff --git a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/OSMMapFragmentFactory.kt b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/OSMMapFragmentFactory.kt index f6827b793..f79eb4754 100644 --- a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/OSMMapFragmentFactory.kt +++ b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/OSMMapFragmentFactory.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import android.content.Context -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import org.mariotaku.twidere.fragment.OpenStreetMapViewerFragment diff --git a/twidere/src/main/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml index 54303d9ed..0fba8b659 100644 --- a/twidere/src/main/AndroidManifest.xml +++ b/twidere/src/main/AndroidManifest.xml @@ -700,7 +700,7 @@ android:exported="true" tools:ignore="ExportedContentProvider"/> diff --git a/twidere/src/main/java/android/support/v4/widget/DrawerLayoutAccessor.java b/twidere/src/main/java/androidx/drawerlayout/widget/DrawerLayoutAccessor.java similarity index 92% rename from twidere/src/main/java/android/support/v4/widget/DrawerLayoutAccessor.java rename to twidere/src/main/java/androidx/drawerlayout/widget/DrawerLayoutAccessor.java index fbe882f10..36624ccf1 100644 --- a/twidere/src/main/java/android/support/v4/widget/DrawerLayoutAccessor.java +++ b/twidere/src/main/java/androidx/drawerlayout/widget/DrawerLayoutAccessor.java @@ -17,10 +17,12 @@ * along with this program. If not, see . */ -package android.support.v4.widget; +package androidx.drawerlayout.widget; import android.view.View; +import androidx.drawerlayout.widget.DrawerLayout; + /** * Created by mariotaku on 15/7/18. */ diff --git a/twidere/src/main/java/android/support/v4/app/FragmentAccessor.java b/twidere/src/main/java/androidx/fragment/app/FragmentAccessor.java similarity index 73% rename from twidere/src/main/java/android/support/v4/app/FragmentAccessor.java rename to twidere/src/main/java/androidx/fragment/app/FragmentAccessor.java index 1755335cf..277e21c53 100644 --- a/twidere/src/main/java/android/support/v4/app/FragmentAccessor.java +++ b/twidere/src/main/java/androidx/fragment/app/FragmentAccessor.java @@ -1,7 +1,9 @@ -package android.support.v4.app; +package androidx.fragment.app; import android.os.Bundle; +import androidx.fragment.app.Fragment; + public class FragmentAccessor { private FragmentAccessor() { diff --git a/twidere/src/main/java/android/support/v4/app/ListFragmentAccessor.java b/twidere/src/main/java/androidx/fragment/app/ListFragmentAccessor.java similarity index 72% rename from twidere/src/main/java/android/support/v4/app/ListFragmentAccessor.java rename to twidere/src/main/java/androidx/fragment/app/ListFragmentAccessor.java index 07067e20a..a4584bec5 100644 --- a/twidere/src/main/java/android/support/v4/app/ListFragmentAccessor.java +++ b/twidere/src/main/java/androidx/fragment/app/ListFragmentAccessor.java @@ -1,4 +1,6 @@ -package android.support.v4.app; +package androidx.fragment.app; + +import androidx.fragment.app.ListFragment; /** * Created by mariotaku on 2016/12/31. diff --git a/twidere/src/main/java/android/support/v4/content/LoaderAccessor.java b/twidere/src/main/java/androidx/loader/content/LoaderAccessor.java similarity index 93% rename from twidere/src/main/java/android/support/v4/content/LoaderAccessor.java rename to twidere/src/main/java/androidx/loader/content/LoaderAccessor.java index d9b29717a..a521ea3f7 100644 --- a/twidere/src/main/java/android/support/v4/content/LoaderAccessor.java +++ b/twidere/src/main/java/androidx/loader/content/LoaderAccessor.java @@ -17,7 +17,9 @@ * along with this program. If not, see . */ -package android.support.v4.content; +package androidx.loader.content; + +import androidx.loader.content.Loader; /** * Created by mariotaku on 15/7/5. diff --git a/twidere/src/main/java/android/support/v7/widget/FixedLinearLayoutManager.java b/twidere/src/main/java/androidx/recyclerview/widget/FixedLinearLayoutManager.java similarity index 94% rename from twidere/src/main/java/android/support/v7/widget/FixedLinearLayoutManager.java rename to twidere/src/main/java/androidx/recyclerview/widget/FixedLinearLayoutManager.java index c52ccdc3b..cece7a1cd 100644 --- a/twidere/src/main/java/android/support/v7/widget/FixedLinearLayoutManager.java +++ b/twidere/src/main/java/androidx/recyclerview/widget/FixedLinearLayoutManager.java @@ -17,11 +17,13 @@ * along with this program. If not, see . */ -package android.support.v7.widget; +package androidx.recyclerview.widget; import android.content.Context; import android.view.View; +import androidx.recyclerview.widget.LinearLayoutManager; + /** * Created by mariotaku on 15/3/24. */ diff --git a/twidere/src/main/java/android/support/v7/widget/RecyclerViewAccessor.java b/twidere/src/main/java/androidx/recyclerview/widget/RecyclerViewAccessor.java similarity index 71% rename from twidere/src/main/java/android/support/v7/widget/RecyclerViewAccessor.java rename to twidere/src/main/java/androidx/recyclerview/widget/RecyclerViewAccessor.java index a00823074..753f4e60d 100644 --- a/twidere/src/main/java/android/support/v7/widget/RecyclerViewAccessor.java +++ b/twidere/src/main/java/androidx/recyclerview/widget/RecyclerViewAccessor.java @@ -1,4 +1,6 @@ -package android.support.v7.widget; +package androidx.recyclerview.widget; + +import androidx.recyclerview.widget.RecyclerView; /** * Created by mariotaku on 2016/12/5. diff --git a/twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java b/twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java index 79a18b897..0173ddce1 100755 --- a/twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java +++ b/twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java @@ -23,7 +23,7 @@ package io.nayuki.qrcodegen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Arrays; diff --git a/twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java b/twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java index 6b2291fdc..51c2799b0 100755 --- a/twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java +++ b/twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java @@ -23,7 +23,7 @@ package io.nayuki.qrcodegen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Arrays; import java.util.Collections; diff --git a/twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java b/twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java index d780f3cff..417d1e49e 100755 --- a/twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java +++ b/twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java @@ -23,7 +23,7 @@ package io.nayuki.qrcodegen; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.nio.charset.Charset; import java.util.ArrayList; diff --git a/twidere/src/main/java/org/mariotaku/abstask/library/ManualTaskStarter.java b/twidere/src/main/java/org/mariotaku/abstask/library/ManualTaskStarter.java index 6801b6219..5bc78c181 100644 --- a/twidere/src/main/java/org/mariotaku/abstask/library/ManualTaskStarter.java +++ b/twidere/src/main/java/org/mariotaku/abstask/library/ManualTaskStarter.java @@ -1,7 +1,7 @@ package org.mariotaku.abstask.library; -import android.support.annotation.UiThread; -import android.support.annotation.WorkerThread; +import androidx.annotation.UiThread; +import androidx.annotation.WorkerThread; /** * Created by mariotaku on 16/5/25. diff --git a/twidere/src/main/java/org/mariotaku/microblog/library/twitter/model/IDsAccessor.java b/twidere/src/main/java/org/mariotaku/microblog/library/twitter/model/IDsAccessor.java index c3f1c209c..28cec7b69 100644 --- a/twidere/src/main/java/org/mariotaku/microblog/library/twitter/model/IDsAccessor.java +++ b/twidere/src/main/java/org/mariotaku/microblog/library/twitter/model/IDsAccessor.java @@ -20,7 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by mariotaku on 2017/4/1. diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java index 38c70eeaf..decef593e 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java @@ -17,7 +17,7 @@ package org.mariotaku.twidere.adapter; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java index 82e66e133..595d86935 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java @@ -20,11 +20,11 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Adapter; -import android.support.v7.widget.RecyclerView.State; -import android.support.v7.widget.TintTypedArray; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; +import androidx.recyclerview.widget.RecyclerView.State; +import androidx.appcompat.widget.TintTypedArray; import android.view.View; public class ExtendedDividerItemDecoration extends RecyclerView.ItemDecoration { diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/AutoRefreshType.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/AutoRefreshType.java index 0f4855358..00b3db295 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/AutoRefreshType.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/AutoRefreshType.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/CacheFileType.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/CacheFileType.java index fc91aa7d0..e19de871a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/CacheFileType.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/CacheFileType.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/ContentType.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/ContentType.java index 89f5fdb77..aed4db649 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/ContentType.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/ContentType.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/ImageShapeStyle.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/ImageShapeStyle.java index dcf8ec2c9..846256d10 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/ImageShapeStyle.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/ImageShapeStyle.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/NavbarStyle.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/NavbarStyle.java index fa132dd1f..27f047601 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/NavbarStyle.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/NavbarStyle.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/NotificationType.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/NotificationType.java index 2fc219b60..e00553514 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/NotificationType.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/NotificationType.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/PreviewStyle.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/PreviewStyle.java index 3c1add521..47d3ed21b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/PreviewStyle.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/PreviewStyle.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/ProfileImageSize.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/ProfileImageSize.java index a67e7f891..4f75960f7 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/ProfileImageSize.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/ProfileImageSize.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/ReadPositionTag.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/ReadPositionTag.java index c48ec100d..db37baa84 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/ReadPositionTag.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/ReadPositionTag.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/annotation/TabAccountFlags.java b/twidere/src/main/java/org/mariotaku/twidere/annotation/TabAccountFlags.java index fc062230f..0a8855c9c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/annotation/TabAccountFlags.java +++ b/twidere/src/main/java/org/mariotaku/twidere/annotation/TabAccountFlags.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.annotation; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java index 9a2e185b7..cd4ea42b0 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java @@ -26,10 +26,10 @@ import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnMultiChoiceClickListener; import android.content.DialogInterface.OnShowListener; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.appcompat.app.AlertDialog; import android.util.SparseBooleanArray; import android.view.View; import android.view.ViewGroup; diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java index 88d2315a8..e6569702d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java @@ -27,14 +27,14 @@ import android.content.res.Resources; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.LoaderManager.LoaderCallbacks; -import android.support.v4.content.FixedAsyncTaskLoader; -import android.support.v4.content.Loader; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.FixedAsyncTaskLoader; +import androidx.loader.content.Loader; +import androidx.core.content.res.ResourcesCompat; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils.TruncateAt; import android.view.View; import android.view.ViewGroup; diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java index 8d6e31ed3..da22ce032 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java @@ -27,11 +27,11 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java index c769edfc0..9cc1cb106 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java @@ -17,8 +17,8 @@ package org.mariotaku.twidere.fragment; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.ListPreference; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.ListPreference; public class ThemedListPreferenceDialogFragmentCompat extends ThemedPreferenceDialogFragmentCompat { private int mClickedDialogEntryIndex; diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionBarColorDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionBarColorDrawable.java index 0a11957de..d69b96cc8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionBarColorDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionBarColorDrawable.java @@ -23,7 +23,7 @@ import android.annotation.TargetApi; import android.graphics.Outline; import android.graphics.Rect; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by mariotaku on 14/12/8. diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionIconDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionIconDrawable.java index 01a595b1f..63ac78476 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionIconDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/ActionIconDrawable.java @@ -21,8 +21,8 @@ package org.mariotaku.twidere.graphic; import android.graphics.PorterDuff.Mode; import android.graphics.drawable.Drawable; -import android.support.v7.graphics.drawable.DrawableWrapper; -import android.support.v7.view.menu.TwidereActionMenuItemView; +import androidx.appcompat.graphics.drawable.DrawableWrapper; +import androidx.appcompat.view.menu.TwidereActionMenuItemView; import android.view.MenuItem; import org.mariotaku.twidere.util.menu.TwidereMenuInfo; diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/EmptyDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/EmptyDrawable.java index 9d9880295..ec3d11ee8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/EmptyDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/EmptyDrawable.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class EmptyDrawable extends Drawable { diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/PaddingDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/PaddingDrawable.java index a73fc6fab..ce7461528 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/PaddingDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/PaddingDrawable.java @@ -23,7 +23,7 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class PaddingDrawable extends Drawable { diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/LikeAnimationDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/LikeAnimationDrawable.java index 35784f13c..a80086ca5 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/LikeAnimationDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/LikeAnimationDrawable.java @@ -11,10 +11,10 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.v7.view.menu.TwidereActionMenuItemView; +import androidx.annotation.ColorInt; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.appcompat.view.menu.TwidereActionMenuItemView; import android.util.Property; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/AnimationLayerDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/AnimationLayerDrawable.java index 5d298c5a9..dcc802c9a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/AnimationLayerDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/AnimationLayerDrawable.java @@ -3,7 +3,7 @@ package org.mariotaku.twidere.graphic.like.layer; import android.graphics.ColorFilter; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable; diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/CircleLayerDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/CircleLayerDrawable.java index bda4141ed..993bf2a69 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/CircleLayerDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/CircleLayerDrawable.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable; diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ParticleLayerDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ParticleLayerDrawable.java index f37543936..64cd31f13 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ParticleLayerDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ParticleLayerDrawable.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable; diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ScalableDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ScalableDrawable.java index 782c20c38..1fb828a4f 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ScalableDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ScalableDrawable.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.Gravity; /** diff --git a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ShineLayerDrawable.java b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ShineLayerDrawable.java index bd40a3f19..6778d1099 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ShineLayerDrawable.java +++ b/twidere/src/main/java/org/mariotaku/twidere/graphic/like/layer/ShineLayerDrawable.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable; diff --git a/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java b/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java index 410b64224..9abba3bd6 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java +++ b/twidere/src/main/java/org/mariotaku/twidere/loader/ObjectCursorLoader.java @@ -22,9 +22,9 @@ package org.mariotaku.twidere.loader; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.v4.content.FixedAsyncTaskLoader; -import android.support.v4.content.LoaderAccessor; +import androidx.annotation.NonNull; +import androidx.loader.content.FixedAsyncTaskLoader; +import androidx.loader.content.LoaderAccessor; import org.mariotaku.library.objectcursor.ObjectCursor; diff --git a/twidere/src/main/java/org/mariotaku/twidere/menu/AccountToggleProvider.java b/twidere/src/main/java/org/mariotaku/twidere/menu/AccountToggleProvider.java index 62d9c602a..8ae71054a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/menu/AccountToggleProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/menu/AccountToggleProvider.java @@ -21,8 +21,8 @@ package org.mariotaku.twidere.menu; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.view.ActionProvider; +import androidx.annotation.NonNull; +import androidx.core.view.ActionProvider; import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java b/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java index bd2fc1117..f6321ccbc 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.text.ParseException; import java.util.ArrayList; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/CursorReference.java b/twidere/src/main/java/org/mariotaku/twidere/model/CursorReference.java index bd061cae9..3b64c4593 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/CursorReference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/CursorReference.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.Closeable; import java.io.IOException; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/CustomAPIConfig.java b/twidere/src/main/java/org/mariotaku/twidere/model/CustomAPIConfig.java index bb473fc56..7b9010781 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/CustomAPIConfig.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/CustomAPIConfig.java @@ -5,8 +5,8 @@ import android.content.res.AssetManager; import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/ListResponse.java b/twidere/src/main/java/org/mariotaku/twidere/model/ListResponse.java index d1f8fb2ab..ae3bc5e98 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/ListResponse.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/ListResponse.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.model; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.AbstractList; import java.util.Collections; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java b/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java index 63e4f6485..35c89ecb1 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.model; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.commons.objectcursor.LoganSquareCursorFieldConverter; import org.mariotaku.library.objectcursor.annotation.AfterCursorObjectCreated; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableCredentials.java b/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableCredentials.java index 017e01b4b..54c096bcd 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableCredentials.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/ParcelableCredentials.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.model; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.library.objectcursor.annotation.CursorField; import org.mariotaku.library.objectcursor.annotation.CursorObject; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/FavoriteTaskEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/FavoriteTaskEvent.java index 98dde5b33..3a308ece1 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/FavoriteTaskEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/FavoriteTaskEvent.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; import org.mariotaku.twidere.model.ParcelableStatus; import org.mariotaku.twidere.model.UserKey; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipTaskEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipTaskEvent.java index 53df59817..88d01ce57 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipTaskEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipTaskEvent.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.ParcelableUser; import org.mariotaku.twidere.model.UserKey; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipUpdatedEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipUpdatedEvent.java index 3d07b5cc7..3713cb535 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipUpdatedEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/FriendshipUpdatedEvent.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.mariotaku.twidere.model.ParcelableRelationship; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/GetActivitiesTaskEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/GetActivitiesTaskEvent.java index 3a4116e89..4dcab0e79 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/GetActivitiesTaskEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/GetActivitiesTaskEvent.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.event; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by mariotaku on 14/12/10. diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/GetMessagesTaskEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/GetMessagesTaskEvent.java index 956cc06dd..9ef2746e6 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/GetMessagesTaskEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/GetMessagesTaskEvent.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.model.event; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Created by mariotaku on 14/12/10. diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/GetStatusesTaskEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/GetStatusesTaskEvent.java index b7163c2cf..4e1953352 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/GetStatusesTaskEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/GetStatusesTaskEvent.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.event; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by mariotaku on 14/12/10. diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/ProfileUpdatedEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/ProfileUpdatedEvent.java index 4d73610b3..f54ad9f98 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/ProfileUpdatedEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/ProfileUpdatedEvent.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.ParcelableUser; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListCreatedEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListCreatedEvent.java index 13bae8f24..8c998189e 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListCreatedEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListCreatedEvent.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.ParcelableUserList; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListDestroyedEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListDestroyedEvent.java index f7ae43c49..87fd63d22 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListDestroyedEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListDestroyedEvent.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.ParcelableUserList; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListMembersChangedEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListMembersChangedEvent.java index 83a75466f..61e30eedc 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListMembersChangedEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListMembersChangedEvent.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.ParcelableUser; import org.mariotaku.twidere.model.ParcelableUserList; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListSubscriptionEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListSubscriptionEvent.java index b8d7d8bc0..a29e36efd 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListSubscriptionEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListSubscriptionEvent.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.ParcelableUserList; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListUpdatedEvent.java b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListUpdatedEvent.java index 00498244f..a58f1d708 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListUpdatedEvent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/event/UserListUpdatedEvent.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.model.event; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mariotaku.twidere.model.ParcelableUserList; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/CursorPagination.java b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/CursorPagination.java index 98813b7a8..c1d7b315d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/CursorPagination.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/CursorPagination.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.pagination; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PagePagination.java b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PagePagination.java index d0074aa57..6e4e656ce 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PagePagination.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PagePagination.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.pagination; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PaginatedArrayList.java b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PaginatedArrayList.java index 37841abba..0d22e6ed8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PaginatedArrayList.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/PaginatedArrayList.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.model.pagination; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Collection; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/SinceMaxPagination.java b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/SinceMaxPagination.java index a6c7a8cc1..31b52aaf7 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/SinceMaxPagination.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/SinceMaxPagination.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.pagination; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/presentation/LaunchPresentation.java b/twidere/src/main/java/org/mariotaku/twidere/model/presentation/LaunchPresentation.java index 616840871..bffe92e0f 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/presentation/LaunchPresentation.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/presentation/LaunchPresentation.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.model.presentation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/BooleanHolder.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/BooleanHolder.java index d8251b222..3d2745b3b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/BooleanHolder.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/BooleanHolder.java @@ -3,8 +3,8 @@ package org.mariotaku.twidere.model.tab; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.BoolRes; -import android.support.annotation.NonNull; +import androidx.annotation.BoolRes; +import androidx.annotation.NonNull; /** * Created by mariotaku on 2016/11/28. diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java index b220124e1..6249d6b75 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java @@ -2,9 +2,9 @@ package org.mariotaku.twidere.model.tab; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import org.mariotaku.kpreferences.SharedPreferencesExtensionsKt; import org.mariotaku.twidere.R; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/StringHolder.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/StringHolder.java index 9cc94e226..b072d11e4 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/StringHolder.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/StringHolder.java @@ -3,8 +3,8 @@ package org.mariotaku.twidere.model.tab; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; /** * Created by mariotaku on 2016/11/28. diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/util/AccountUtils.java b/twidere/src/main/java/org/mariotaku/twidere/model/util/AccountUtils.java index 73ba5b7f1..7a7a01985 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/util/AccountUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/util/AccountUtils.java @@ -3,8 +3,8 @@ package org.mariotaku.twidere.model.util; import android.accounts.Account; import android.accounts.AccountManager; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mariotaku.twidere.R; import org.mariotaku.twidere.annotation.AccountType; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableLocationUtils.java b/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableLocationUtils.java index 647961820..433825b54 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableLocationUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableLocationUtils.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.model.util; import android.location.Location; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.microblog.library.twitter.model.GeoLocation; import org.mariotaku.twidere.model.ParcelableLocation; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/AppVersionPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/AppVersionPreference.java index b99a5d502..25eeb9cbb 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/AppVersionPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/AppVersionPreference.java @@ -24,7 +24,7 @@ import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Handler; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.util.AttributeSet; import org.mariotaku.twidere.R; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/ComponentStatePreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/ComponentStatePreference.java index 96c7674c4..05ca11153 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/ComponentStatePreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/ComponentStatePreference.java @@ -5,8 +5,8 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.TypedArray; -import android.support.annotation.NonNull; -import android.support.v7.preference.SwitchPreferenceCompat; +import androidx.annotation.NonNull; +import androidx.preference.SwitchPreferenceCompat; import android.util.AttributeSet; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java index dbcff978b..40f003f7a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java @@ -26,11 +26,11 @@ import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnMultiChoiceClickListener; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceDialogFragmentCompat; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceDialogFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import android.util.AttributeSet; import org.mariotaku.twidere.R; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java index 139d1203b..bce4dc78b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java @@ -23,11 +23,11 @@ import android.content.Context; import android.content.DialogInterface; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceDialogFragmentCompat; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceDialogFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import android.util.AttributeSet; import org.mariotaku.twidere.Constants; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/RingtonePreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/RingtonePreference.java index b005d9b7b..9d03c99a4 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/RingtonePreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/RingtonePreference.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.preference; import android.content.Context; import android.content.res.TypedArray; import android.media.RingtoneManager; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.util.AttributeSet; import org.mariotaku.twidere.R; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java index 53876be06..d8ae0d29b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java @@ -24,9 +24,9 @@ import android.content.res.TypedArray; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.annotation.NonNull; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceFragmentCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java index f23519413..7c9bbdb74 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java @@ -24,11 +24,11 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceDialogFragmentCompat; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceDialogFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import android.util.AttributeSet; import org.mariotaku.twidere.R; diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java index 9a655179e..bc7346649 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java @@ -7,11 +7,11 @@ import android.content.DialogInterface.OnClickListener; import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceDialogFragmentCompat; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceDialogFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/twidere/src/main/java/org/mariotaku/twidere/provider/ShareProvider.java b/twidere/src/main/java/org/mariotaku/twidere/provider/ShareProvider.java index dd05d5292..aeb7713ee 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/provider/ShareProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/provider/ShareProvider.java @@ -11,9 +11,9 @@ import android.database.MatrixCursor; import android.net.Uri; import android.os.ParcelFileDescriptor; import android.provider.MediaStore.MediaColumns; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import java.io.File; import java.io.FileNotFoundException; diff --git a/twidere/src/main/java/org/mariotaku/twidere/text/validator/UserListNameValidator.java b/twidere/src/main/java/org/mariotaku/twidere/text/validator/UserListNameValidator.java index b118afb84..5aada0b68 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/text/validator/UserListNameValidator.java +++ b/twidere/src/main/java/org/mariotaku/twidere/text/validator/UserListNameValidator.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.text.validator; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.rengwuxian.materialedittext.validation.METValidator; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java b/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java index 9c655074e..254a2a412 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java @@ -26,7 +26,7 @@ import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; import android.os.IInterface; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.twidere.constant.IntentConstants; import org.mariotaku.twidere.util.ServiceUtils.ServiceToken; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/CheckUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/CheckUtils.java index 7818ba43c..43e7b57e8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/CheckUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/CheckUtils.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; /** diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/CustomTabUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/CustomTabUtils.java index 197ffa9da..effd1c795 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/CustomTabUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/CustomTabUtils.java @@ -24,10 +24,10 @@ import android.content.Context; import android.database.Cursor; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import org.mariotaku.library.objectcursor.ObjectCursor; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java index ff4875ba3..09ba124a8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java @@ -26,8 +26,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; import com.bluelinelabs.logansquare.LoganSquare; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/EditTextEnterHandler.java b/twidere/src/main/java/org/mariotaku/twidere/util/EditTextEnterHandler.java index e9b035057..da5d2445f 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/EditTextEnterHandler.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/EditTextEnterHandler.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java index 650b4c8cd..8690cdbfd 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.mariotaku.microblog.library.twitter.model.DMResponse; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java b/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java index 4af8ca62d..0dda6350d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.SparseArrayCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.SparseArrayCompat; import android.text.TextUtils; import android.view.KeyEvent; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/MediaUploaderInterface.java b/twidere/src/main/java/org/mariotaku/twidere/util/MediaUploaderInterface.java index 06df1654b..5557d7f11 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/MediaUploaderInterface.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/MediaUploaderInterface.java @@ -27,7 +27,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.IBinder; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.twidere.IMediaUploader; import org.mariotaku.twidere.model.MediaUploadResult; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/MicroBlogAPIFactory.java b/twidere/src/main/java/org/mariotaku/twidere/util/MicroBlogAPIFactory.java index 7810024df..456a15849 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/MicroBlogAPIFactory.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/MicroBlogAPIFactory.java @@ -6,9 +6,9 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import android.webkit.URLUtil; @@ -25,9 +25,6 @@ import org.mariotaku.twidere.model.ConsumerKeyType; import org.mariotaku.twidere.model.UserKey; import org.mariotaku.twidere.model.account.cred.Credentials; import org.mariotaku.twidere.model.util.AccountUtils; -import org.mariotaku.twidere.util.api.TwitterAndroidExtraHeaders; -import org.mariotaku.twidere.util.api.TwitterMacExtraHeaders; -import org.mariotaku.twidere.util.api.UserAgentExtraHeaders; import java.util.List; import java.util.Locale; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java b/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java index 121cf0341..071cc8103 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.util; import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.InputDevice; import android.view.MotionEvent; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java b/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java index ce8762c54..0d9fe69fb 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java @@ -19,12 +19,12 @@ package org.mariotaku.twidere.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Adapter; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.view.KeyEvent; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewUtils.java index 187adb007..41174f26b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewUtils.java @@ -19,9 +19,9 @@ package org.mariotaku.twidere.util; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewParent; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/SimpleDrawerCallback.java b/twidere/src/main/java/org/mariotaku/twidere/util/SimpleDrawerCallback.java index de03803cf..a860a8c58 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/SimpleDrawerCallback.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/SimpleDrawerCallback.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util; import android.os.SystemClock; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.MotionEvent; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/StatusShortenerInterface.java b/twidere/src/main/java/org/mariotaku/twidere/util/StatusShortenerInterface.java index 0037518f1..dbdf8bf6a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/StatusShortenerInterface.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/StatusShortenerInterface.java @@ -27,7 +27,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.IBinder; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.mariotaku.twidere.IStatusShortener; import org.mariotaku.twidere.model.ParcelableStatus; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java b/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java index 41356ae47..1e1d57991 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java @@ -25,7 +25,7 @@ import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.graphics.Rect; import android.os.SystemClock; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java index 0f396b0f9..bfd5008d8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.lang.reflect.Array; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java index 535318ed6..5ca16df63 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java @@ -19,9 +19,9 @@ package org.mariotaku.twidere.util; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spannable; import android.text.Spanned; import android.text.style.URLSpan; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereStringUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereStringUtils.java index c8a000ed9..571f9c37c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereStringUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereStringUtils.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spannable; import android.text.Spanned; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/UriUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/UriUtils.java index fe5d674f8..198b29f6a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/UriUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/UriUtils.java @@ -20,8 +20,8 @@ package org.mariotaku.twidere.util; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Created by mariotaku on 15/3/23. diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/UserAgentUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/UserAgentUtils.java index 746e09874..1864fa74e 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/UserAgentUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/UserAgentUtils.java @@ -25,9 +25,9 @@ import android.content.Context; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.annotation.WorkerThread; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.annotation.WorkerThread; import android.webkit.WebSettings; import android.webkit.WebView; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java b/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java index 3d16e6b82..c1d378e7e 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java @@ -23,7 +23,7 @@ package org.mariotaku.twidere.util.collection; // update CompactIdentityHashSet.java, UniqueSet.java and // SoftHashMapIndex.java accordingly. -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Collection; import java.util.ConcurrentModificationException; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java index 77f22dda7..371fcdce7 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java @@ -22,8 +22,8 @@ package org.mariotaku.twidere.util.content; import android.content.ContentResolver; import android.content.ContentValues; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.mariotaku.sqliteqb.library.Expression; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java b/twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java index acb229390..9f2633790 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java @@ -24,9 +24,9 @@ import android.database.Cursor; import android.net.Uri; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager.LoaderCallbacks; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.loader.app.LoaderManager.LoaderCallbacks; import org.mariotaku.twidere.TwidereConstants; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/io/ContentLengthInputStream.java b/twidere/src/main/java/org/mariotaku/twidere/util/io/ContentLengthInputStream.java index 6ad1b1de7..99c0e76f0 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/io/ContentLengthInputStream.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/io/ContentLengthInputStream.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.util.io; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.File; import java.io.FileInputStream; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/media/TwidereMediaDownloader.java b/twidere/src/main/java/org/mariotaku/twidere/util/media/TwidereMediaDownloader.java index a3f76fc2c..4213b3cda 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/media/TwidereMediaDownloader.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/media/TwidereMediaDownloader.java @@ -5,8 +5,8 @@ import android.accounts.AccountManager; import android.content.Context; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.mariotaku.mediaviewer.library.CacheDownloadLoader; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/PreviewMediaExtractor.java b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/PreviewMediaExtractor.java index 94db92956..678d47657 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/PreviewMediaExtractor.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/PreviewMediaExtractor.java @@ -1,8 +1,8 @@ package org.mariotaku.twidere.util.media.preview; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import org.mariotaku.restfu.http.RestHttpClient; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java index 94a822f80..59ab2d90a 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util.media.preview.provider; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mariotaku.restfu.http.RestHttpClient; import org.mariotaku.twidere.model.ParcelableMedia; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/InstagramProvider.java b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/InstagramProvider.java index 5990d6edb..4367b68ca 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/InstagramProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/InstagramProvider.java @@ -1,8 +1,8 @@ package org.mariotaku.twidere.util.media.preview.provider; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import org.mariotaku.restfu.http.RestHttpClient; import org.mariotaku.twidere.model.ParcelableMedia; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/Provider.java b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/Provider.java index afd0a8683..83b63af83 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/Provider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/Provider.java @@ -1,8 +1,8 @@ package org.mariotaku.twidere.util.media.preview.provider; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import org.mariotaku.restfu.http.RestHttpClient; import org.mariotaku.twidere.model.ParcelableMedia; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/TwitterMediaProvider.java b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/TwitterMediaProvider.java index 14d494b1c..d7f1b464d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/TwitterMediaProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/TwitterMediaProvider.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util.media.preview.provider; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.mariotaku.restfu.http.RestHttpClient; import org.mariotaku.twidere.model.ParcelableMedia; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/menu/TwidereMenuInfo.java b/twidere/src/main/java/org/mariotaku/twidere/util/menu/TwidereMenuInfo.java index e9f2af68e..6d40d0266 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/menu/TwidereMenuInfo.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/menu/TwidereMenuInfo.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.util.menu; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.view.ContextMenu.ContextMenuInfo; /** diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/net/SimpleCookieJar.java b/twidere/src/main/java/org/mariotaku/twidere/util/net/SimpleCookieJar.java index 6a4429e52..581e11918 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/net/SimpleCookieJar.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/net/SimpleCookieJar.java @@ -1,6 +1,6 @@ package org.mariotaku.twidere.util.net; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.List; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/WindowSupport.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/WindowSupport.java index abf198f9e..1824cd6ae 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/WindowSupport.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/WindowSupport.java @@ -2,7 +2,7 @@ package org.mariotaku.twidere.util.support; import android.annotation.TargetApi; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.Window; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java b/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java index 38ab88390..eaee40774 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java @@ -22,7 +22,7 @@ package org.mariotaku.twidere.view; import android.content.Context; import android.graphics.Rect; import android.graphics.Shader; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.view.Gravity; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/CheckableLinearLayout.java b/twidere/src/main/java/org/mariotaku/twidere/view/CheckableLinearLayout.java index 589c01ac7..39c624416 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/CheckableLinearLayout.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/CheckableLinearLayout.java @@ -3,7 +3,7 @@ package org.mariotaku.twidere.view; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.v4.view.accessibility.AccessibilityEventCompat; +import androidx.core.view.accessibility.AccessibilityEventCompat; import android.util.AttributeSet; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelFrameLayout.java b/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelFrameLayout.java index 6dca02447..0a4701019 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelFrameLayout.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelFrameLayout.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.view; import android.content.Context; import android.graphics.Canvas; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.widget.FrameLayout; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelLinearLayout.java b/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelLinearLayout.java index 781a25f1a..c1ac41e68 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelLinearLayout.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ColorLabelLinearLayout.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.view; import android.content.Context; import android.graphics.Canvas; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.widget.LinearLayout; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundColorView.java b/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundColorView.java index 5c1e564b6..e752dcf2b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundColorView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundColorView.java @@ -28,7 +28,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundImageView.java b/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundImageView.java index 924a22ec3..8357799fb 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundImageView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ForegroundImageView.java @@ -24,8 +24,8 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import org.mariotaku.twidere.view.iface.IForegroundView; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java b/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java index 89f465b58..f565663ac 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java @@ -23,9 +23,9 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.res.TypedArray; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.ViewDragHelper; +import androidx.annotation.NonNull; +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.GestureDetector.SimpleOnGestureListener; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/HomeDrawerLayout.java b/twidere/src/main/java/org/mariotaku/twidere/view/HomeDrawerLayout.java index 0000085ad..0a762cbed 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/HomeDrawerLayout.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/HomeDrawerLayout.java @@ -1,7 +1,7 @@ package org.mariotaku.twidere.view; import android.content.Context; -import android.support.v4.view.GravityCompat; +import androidx.core.view.GravityCompat; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/LinePageIndicator.java b/twidere/src/main/java/org/mariotaku/twidere/view/LinePageIndicator.java index 5ffcf8501..61b54ff27 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/LinePageIndicator.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/LinePageIndicator.java @@ -24,9 +24,9 @@ import android.graphics.Paint; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/MediaPreviewImageView.java b/twidere/src/main/java/org/mariotaku/twidere/view/MediaPreviewImageView.java index 1fb306572..e338fc01b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/MediaPreviewImageView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/MediaPreviewImageView.java @@ -5,9 +5,9 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import org.mariotaku.twidere.R; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ProfileBannerSpace.java b/twidere/src/main/java/org/mariotaku/twidere/view/ProfileBannerSpace.java index 8d626b7c9..297a2bf5c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ProfileBannerSpace.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ProfileBannerSpace.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java b/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java index e4fe6c377..36870e253 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java @@ -33,10 +33,10 @@ import android.graphics.PorterDuffXfermode; import android.graphics.RectF; import android.graphics.SweepGradient; import android.os.Build; -import android.support.annotation.FloatRange; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.FloatRange; +import androidx.annotation.NonNull; +import androidx.core.view.ViewCompat; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/SquareSpace.java b/twidere/src/main/java/org/mariotaku/twidere/view/SquareSpace.java index 6ae8b236e..59b827009 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/SquareSpace.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/SquareSpace.java @@ -20,7 +20,7 @@ package org.mariotaku.twidere.view; import android.content.Context; -import android.support.v4.widget.Space; +import androidx.legacy.widget.Space; import android.util.AttributeSet; import android.view.ViewGroup; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/TabPagerIndicator.java b/twidere/src/main/java/org/mariotaku/twidere/view/TabPagerIndicator.java index abdf8f121..cc45ecb3b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/TabPagerIndicator.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/TabPagerIndicator.java @@ -6,16 +6,16 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.view.ViewPager.OnPageChangeListener; -import android.support.v7.widget.FixedLinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ColorInt; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.FixedLinearLayoutManager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.core.view.ViewCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.util.SparseIntArray; import android.view.LayoutInflater; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/helper/SimpleItemTouchHelperCallback.java b/twidere/src/main/java/org/mariotaku/twidere/view/helper/SimpleItemTouchHelperCallback.java index 51e58add0..13cc2cc60 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/helper/SimpleItemTouchHelperCallback.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/helper/SimpleItemTouchHelperCallback.java @@ -19,8 +19,8 @@ package org.mariotaku.twidere.view.helper; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; /** * An implementation of {@link ItemTouchHelper.Callback} that enables basic drag & drop and diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/iface/IColorLabelView.java b/twidere/src/main/java/org/mariotaku/twidere/view/iface/IColorLabelView.java index e3527579b..8a3595a29 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/iface/IColorLabelView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/iface/IColorLabelView.java @@ -24,7 +24,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/iface/IForegroundView.java b/twidere/src/main/java/org/mariotaku/twidere/view/iface/IForegroundView.java index 278bc2992..8d2626a54 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/iface/IForegroundView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/iface/IForegroundView.java @@ -24,9 +24,9 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/iface/PagerIndicator.java b/twidere/src/main/java/org/mariotaku/twidere/view/iface/PagerIndicator.java index 15ea74e81..317783847 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/iface/PagerIndicator.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/iface/PagerIndicator.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.view.iface; import android.graphics.drawable.Drawable; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; /** * A PageIndicator is responsible to show an visual indicator on the total views diff --git a/twidere/src/main/kotlin/android/support/v4/app/LoaderManagerExtensions.kt b/twidere/src/main/kotlin/android/support/v4/app/LoaderManagerExtensions.kt deleted file mode 100644 index be241b1d7..000000000 --- a/twidere/src/main/kotlin/android/support/v4/app/LoaderManagerExtensions.kt +++ /dev/null @@ -1,16 +0,0 @@ -package android.support.v4.app - -/** - * Created by mariotaku on 2016/11/26. - */ - -fun LoaderManager.hasRunningLoadersSafe(): Boolean { - if (this !is LoaderManagerImpl) return false - var loadersRunning = false - val count = mLoaders.size() - for (i in 0 until count) { - val li = mLoaders.valueAt(i) ?: continue - loadersRunning = loadersRunning or (li.mStarted && !li.mDeliveredData) - } - return loadersRunning -} \ No newline at end of file diff --git a/twidere/src/main/kotlin/android/support/v7/app/TwilightManagerAccessor.kt b/twidere/src/main/kotlin/androidx/appcompat/app/TwilightManagerAccessor.kt similarity index 92% rename from twidere/src/main/kotlin/android/support/v7/app/TwilightManagerAccessor.kt rename to twidere/src/main/kotlin/androidx/appcompat/app/TwilightManagerAccessor.kt index 7305d2b59..83f9ca0d5 100644 --- a/twidere/src/main/kotlin/android/support/v7/app/TwilightManagerAccessor.kt +++ b/twidere/src/main/kotlin/androidx/appcompat/app/TwilightManagerAccessor.kt @@ -1,4 +1,4 @@ -package android.support.v7.app +package androidx.appcompat.app import android.content.Context diff --git a/twidere/src/main/kotlin/android/support/v7/app/WindowDecorActionBarAccessor.kt b/twidere/src/main/kotlin/androidx/appcompat/app/WindowDecorActionBarAccessor.kt similarity index 51% rename from twidere/src/main/kotlin/android/support/v7/app/WindowDecorActionBarAccessor.kt rename to twidere/src/main/kotlin/androidx/appcompat/app/WindowDecorActionBarAccessor.kt index 1e04b3577..9aa0f6d2b 100644 --- a/twidere/src/main/kotlin/android/support/v7/app/WindowDecorActionBarAccessor.kt +++ b/twidere/src/main/kotlin/androidx/appcompat/app/WindowDecorActionBarAccessor.kt @@ -1,7 +1,7 @@ -package android.support.v7.app +package androidx.appcompat.app -import android.support.v7.widget.ActionBarContainer -import android.support.v7.widget.DecorToolbar +import androidx.appcompat.widget.ActionBarContainer +import androidx.appcompat.widget.DecorToolbar val WindowDecorActionBar.containerView: ActionBarContainer get() = mContainerView val WindowDecorActionBar.decorToolbar: DecorToolbar get() = mDecorToolbar \ No newline at end of file diff --git a/twidere/src/main/kotlin/android/support/v7/view/menu/TwidereActionMenuItemView.kt b/twidere/src/main/kotlin/androidx/appcompat/view/menu/TwidereActionMenuItemView.kt similarity index 87% rename from twidere/src/main/kotlin/android/support/v7/view/menu/TwidereActionMenuItemView.kt rename to twidere/src/main/kotlin/androidx/appcompat/view/menu/TwidereActionMenuItemView.kt index 5fe7efa19..4907229e6 100644 --- a/twidere/src/main/kotlin/android/support/v7/view/menu/TwidereActionMenuItemView.kt +++ b/twidere/src/main/kotlin/androidx/appcompat/view/menu/TwidereActionMenuItemView.kt @@ -1,4 +1,4 @@ -package android.support.v7.view.menu +package androidx.appcompat.view.menu import android.content.Context import android.util.AttributeSet diff --git a/twidere/src/main/kotlin/android/support/v7/widget/TwidereActionMenuView.kt b/twidere/src/main/kotlin/androidx/appcompat/widget/TwidereActionMenuView.kt similarity index 92% rename from twidere/src/main/kotlin/android/support/v7/widget/TwidereActionMenuView.kt rename to twidere/src/main/kotlin/androidx/appcompat/widget/TwidereActionMenuView.kt index 0f0fed147..dad27aecc 100644 --- a/twidere/src/main/kotlin/android/support/v7/widget/TwidereActionMenuView.kt +++ b/twidere/src/main/kotlin/androidx/appcompat/widget/TwidereActionMenuView.kt @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package android.support.v7.widget +package androidx.appcompat.widget import android.content.Context -import android.support.v7.view.menu.TwidereActionMenuItemView +import androidx.appcompat.view.menu.TwidereActionMenuItemView import android.util.AttributeSet import android.view.View diff --git a/twidere/src/main/kotlin/android/support/v7/widget/TwidereToolbar.kt b/twidere/src/main/kotlin/androidx/appcompat/widget/TwidereToolbar.kt similarity index 98% rename from twidere/src/main/kotlin/android/support/v7/widget/TwidereToolbar.kt rename to twidere/src/main/kotlin/androidx/appcompat/widget/TwidereToolbar.kt index 3931eefd4..3032d1e84 100644 --- a/twidere/src/main/kotlin/android/support/v7/widget/TwidereToolbar.kt +++ b/twidere/src/main/kotlin/androidx/appcompat/widget/TwidereToolbar.kt @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package android.support.v7.widget +package androidx.appcompat.widget import android.content.Context import android.graphics.PorterDuff diff --git a/twidere/src/main/kotlin/android/support/v4/os/LocaleHelperAccessor.kt b/twidere/src/main/kotlin/androidx/core/os/LocaleHelperAccessor.kt similarity index 75% rename from twidere/src/main/kotlin/android/support/v4/os/LocaleHelperAccessor.kt rename to twidere/src/main/kotlin/androidx/core/os/LocaleHelperAccessor.kt index ec1d7a925..c830579e9 100644 --- a/twidere/src/main/kotlin/android/support/v4/os/LocaleHelperAccessor.kt +++ b/twidere/src/main/kotlin/androidx/core/os/LocaleHelperAccessor.kt @@ -17,13 +17,19 @@ * along with this program. If not, see . */ -package android.support.v4.os +package androidx.core.os import android.annotation.SuppressLint +import android.os.Build import java.util.* @SuppressLint("RestrictedApi") object LocaleHelperAccessor { - fun forLanguageTag(str: String): Locale = LocaleHelper.forLanguageTag(str) + fun forLanguageTag(str: String): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + Locale.forLanguageTag(str) + } else { + Locale(str)// TODO: Dose it work? +// TODO("VERSION.SDK_INT < LOLLIPOP") + } } diff --git a/twidere/src/main/kotlin/android/support/v4/view/WindowInsetsCompatAccessor.kt b/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt similarity index 92% rename from twidere/src/main/kotlin/android/support/v4/view/WindowInsetsCompatAccessor.kt rename to twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt index b8849c6a7..5f16bead3 100644 --- a/twidere/src/main/kotlin/android/support/v4/view/WindowInsetsCompatAccessor.kt +++ b/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package android.support.v4.view +package androidx.core.view fun WindowInsetsCompat(obj: Any) = WindowInsetsCompat.wrap(obj) diff --git a/twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt b/twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt new file mode 100644 index 000000000..3920617b1 --- /dev/null +++ b/twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt @@ -0,0 +1,20 @@ +package androidx.loader.app + +import androidx.loader.app.LoaderManager +import androidx.loader.app.LoaderManagerImpl + +/** + * Created by mariotaku on 2016/11/26. + */ + +fun LoaderManager.hasRunningLoadersSafe(): Boolean { + if (this !is LoaderManagerImpl) return false + return this.hasRunningLoaders() +// var loadersRunning = false +// val count = mLoaders.size() +// for (i in 0 until count) { +// val li = mLoaders.valueAt(i) ?: continue +// loadersRunning = loadersRunning or (li.mStarted && !li.mDeliveredData) +// } +// return loadersRunning +} \ No newline at end of file diff --git a/twidere/src/main/kotlin/android/support/v4/content/FixedAsyncTaskLoader.kt b/twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt similarity index 90% rename from twidere/src/main/kotlin/android/support/v4/content/FixedAsyncTaskLoader.kt rename to twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt index b94d5d034..fab5db6b5 100644 --- a/twidere/src/main/kotlin/android/support/v4/content/FixedAsyncTaskLoader.kt +++ b/twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt @@ -1,7 +1,8 @@ -package android.support.v4.content +package androidx.loader.content import android.content.Context import android.os.AsyncTask +import androidx.loader.content.AsyncTaskLoader import org.mariotaku.twidere.extension.set import org.mariotaku.twidere.util.Analyzer diff --git a/twidere/src/main/kotlin/android/support/v7/widget/RecyclerViewAccessor.kt b/twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt similarity index 90% rename from twidere/src/main/kotlin/android/support/v7/widget/RecyclerViewAccessor.kt rename to twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt index 64e2ed5c9..c0fe226db 100644 --- a/twidere/src/main/kotlin/android/support/v7/widget/RecyclerViewAccessor.kt +++ b/twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt @@ -17,6 +17,8 @@ * along with this program. If not, see . */ -package android.support.v7.widget +package androidx.recyclerview.widget + +import androidx.recyclerview.widget.RecyclerView val RecyclerView.LayoutManager.recyclerView: RecyclerView? get() = mRecyclerView diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/ActivityExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/ActivityExtensions.kt index 39ecb6a00..1f30d7334 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/ActivityExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/ActivityExtensions.kt @@ -23,7 +23,7 @@ import android.app.Activity import android.content.ComponentName import android.content.pm.ActivityInfo import android.graphics.drawable.Drawable -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat val Activity.activityIcon: Drawable? diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/ColorExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/ColorExtensions.kt index b5f08ecfe..9c95bc8e1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/ColorExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/ColorExtensions.kt @@ -1,6 +1,6 @@ package org.mariotaku.ktextension -import android.support.annotation.ColorInt +import androidx.annotation.ColorInt import java.util.* /** diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/ConfigurationExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/ConfigurationExtensions.kt index c448cd131..5d4e282ab 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/ConfigurationExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/ConfigurationExtensions.kt @@ -23,8 +23,8 @@ import android.annotation.TargetApi import android.content.res.Configuration import android.os.Build import android.os.LocaleList -import android.support.v4.os.ConfigurationCompat -import android.support.v4.os.LocaleListCompat +import androidx.core.os.ConfigurationCompat +import androidx.core.os.LocaleListCompat import java.util.* var Configuration.localesCompat: LocaleListCompat diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/ContextExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/ContextExtensions.kt index db4f6aec7..43bab2a44 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/ContextExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/ContextExtensions.kt @@ -3,7 +3,7 @@ package org.mariotaku.ktextension import android.content.BroadcastReceiver import android.content.Context import android.content.pm.PackageManager -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import java.io.File /** diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/FragmentManagerExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/FragmentManagerExtensions.kt index 7327d8c5b..261524fd4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/FragmentManagerExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/FragmentManagerExtensions.kt @@ -19,8 +19,8 @@ package org.mariotaku.ktextension -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentManager fun FragmentManager.dismissDialogFragment(tag: String): Boolean { val f = findFragmentByTag(tag) as? DialogFragment ?: return false diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/MenuExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/MenuExtensions.kt index 5283fb4b9..b5abd026d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/MenuExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/MenuExtensions.kt @@ -21,10 +21,10 @@ package org.mariotaku.ktextension import android.content.Context import android.graphics.drawable.Drawable -import android.support.annotation.DrawableRes -import android.support.v4.content.ContextCompat -import android.support.v4.view.ActionProvider -import android.support.v4.view.MenuItemCompat +import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat +import androidx.core.view.ActionProvider +import androidx.core.view.MenuItemCompat import android.view.Menu import android.view.MenuItem import android.view.SubMenu diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/RecyclerViewExtension.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/RecyclerViewExtension.kt index 1990c9155..e86e71910 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/RecyclerViewExtension.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/RecyclerViewExtension.kt @@ -1,10 +1,10 @@ package org.mariotaku.ktextension -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView /** * Created by mariotaku on 16/8/21. */ fun RecyclerView.Adapter<*>.findPositionByItemId(itemId: Long): Int { - return (0 until itemCount).firstOrNull { getItemId(it) == itemId } ?: RecyclerView.NO_POSITION + return (0 until itemCount).firstOrNull { getItemId(it) == itemId } ?: androidx.recyclerview.widget.RecyclerView.NO_POSITION } diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/SparseArrayExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/SparseArrayExtensions.kt index 5d2c698dc..5a82712d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/SparseArrayExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/SparseArrayExtensions.kt @@ -1,6 +1,6 @@ package org.mariotaku.ktextension -import android.support.v4.util.LongSparseArray +import androidx.collection.LongSparseArray import android.util.SparseBooleanArray /** diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/WindowInsetsExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/WindowInsetsExtensions.kt index 6b0b64117..78ccccadf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/WindowInsetsExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/WindowInsetsExtensions.kt @@ -22,7 +22,7 @@ package org.mariotaku.ktextension import android.annotation.TargetApi import android.graphics.Rect import android.os.Build -import android.support.v4.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsCompat import android.view.WindowInsets inline val WindowInsetsCompat.systemWindowInsets: Rect diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt index d316c9f5a..20d8d2471 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt @@ -27,17 +27,17 @@ import android.graphics.Rect import android.nfc.NfcAdapter import android.os.Build import android.os.Bundle -import android.support.annotation.StyleRes -import android.support.v4.app.Fragment -import android.support.v4.graphics.ColorUtils -import android.support.v4.view.OnApplyWindowInsetsListener -import android.support.v4.view.WindowInsetsCompat -import android.support.v7.app.TwilightManagerAccessor -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceFragmentCompat -import android.support.v7.preference.PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback -import android.support.v7.view.menu.ActionMenuItemView -import android.support.v7.widget.TwidereActionMenuView +import androidx.annotation.StyleRes +import androidx.fragment.app.Fragment +import androidx.core.graphics.ColorUtils +import androidx.core.view.OnApplyWindowInsetsListener +import androidx.core.view.WindowInsetsCompat +import androidx.appcompat.app.TwilightManagerAccessor +import androidx.preference.Preference +import androidx.preference.PreferenceFragmentCompat +import androidx.preference.PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback +import androidx.appcompat.view.menu.ActionMenuItemView +import androidx.appcompat.widget.TwidereActionMenuView import android.util.AttributeSet import android.view.KeyEvent import android.view.MotionEvent diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt index 1d1e44c4f..62d110741 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -33,16 +33,16 @@ import android.graphics.Rect import android.location.* import android.net.Uri import android.os.Bundle -import android.support.v4.app.ActivityCompat -import android.support.v4.widget.TextViewCompat -import android.support.v7.app.AlertDialog -import android.support.v7.view.SupportMenuInflater -import android.support.v7.widget.ActionMenuView.OnMenuItemClickListener -import android.support.v7.widget.FixedLinearLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.RecyclerView.ViewHolder -import android.support.v7.widget.helper.ItemTouchHelper +import androidx.core.app.ActivityCompat +import androidx.core.widget.TextViewCompat +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.view.SupportMenuInflater +import androidx.appcompat.widget.ActionMenuView.OnMenuItemClickListener +import androidx.recyclerview.widget.FixedLinearLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.ItemTouchHelper import android.text.Editable import android.text.Spannable import android.text.Spanned @@ -609,9 +609,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener when (ev.actionMasked) { MotionEvent.ACTION_DOWN -> { if (isAccountSelectorVisible && !TwidereViewUtils.hitView(ev, accountSelectorButton)) { - val layoutManager = accountSelector.layoutManager + val layoutManager = accountSelector.layoutManager ?: return super.dispatchTouchEvent(ev) val clickedItem = (0 until layoutManager.childCount).any { - TwidereViewUtils.hitView(ev, layoutManager.getChildAt(it)) + val child = layoutManager.getChildAt(it) + child != null && TwidereViewUtils.hitView(ev, child) } if (!clickedItem) { isAccountSelectorVisible = false @@ -1836,8 +1837,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val context = activity - val builder = AlertDialog.Builder(context) + val context = activity!! + val builder = AlertDialog.Builder(context!!) builder.setMessage(R.string.quote_protected_status_warning_message) builder.setPositiveButton(R.string.send_anyway, this) builder.setNegativeButton(android.R.string.cancel, null) @@ -1849,7 +1850,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener class DirectMessageConfirmFragment : BaseDialogFragment(), DialogInterface.OnClickListener { - private val screenName: String get() = arguments.getString(EXTRA_SCREEN_NAME).orEmpty() + private val screenName: String get() = arguments?.getString(EXTRA_SCREEN_NAME).orEmpty() override fun onClick(dialog: DialogInterface, which: Int) { val activity = activity @@ -1870,8 +1871,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val context = activity - val builder = AlertDialog.Builder(context) + val context = activity!! + val builder = AlertDialog.Builder(context!!) builder.setMessage(getString(R.string.message_format_compose_message_convert_to_status, "@$screenName")) builder.setPositiveButton(R.string.action_send, this) @@ -1911,11 +1912,11 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } } - override fun getSwipeThreshold(viewHolder: ViewHolder?): Float { + override fun getSwipeThreshold(viewHolder: ViewHolder): Float { return 0.75f } - override fun clearView(recyclerView: RecyclerView?, viewHolder: ViewHolder) { + override fun clearView(recyclerView: RecyclerView, viewHolder: ViewHolder) { super.clearView(recyclerView, viewHolder) viewHolder.itemView.alpha = ALPHA_FULL } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataExportActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataExportActivity.kt index e9e899da2..6e19b828c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataExportActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataExportActivity.kt @@ -4,7 +4,7 @@ import android.app.Activity import android.content.Intent import android.os.AsyncTask import android.os.Bundle -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import android.util.Log import org.mariotaku.ktextension.dismissDialogFragment import org.mariotaku.twidere.Constants.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataImportActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataImportActivity.kt index 6d257fc73..97623cacd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataImportActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/DataImportActivity.kt @@ -3,7 +3,7 @@ package org.mariotaku.twidere.activity import android.content.Intent import android.os.AsyncTask import android.os.Bundle -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import android.util.Log import org.mariotaku.ktextension.dismissDialogFragment import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FileSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FileSelectorActivity.kt index a510d6fcd..85a84df2d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FileSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FileSelectorActivity.kt @@ -25,8 +25,8 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Environment.getExternalStorageDirectory -import android.support.v4.app.ActivityCompat -import android.support.v4.app.DialogFragment +import androidx.core.app.ActivityCompat +import androidx.fragment.app.DialogFragment import android.widget.Toast import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.checkAllSelfPermissionsGranted diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt index df61c387f..bba0c1141 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.activity import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment /** * Created by mariotaku on 2017/1/3. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HiddenSettingsActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HiddenSettingsActivity.kt index 9171bc930..58357c030 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HiddenSettingsActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HiddenSettingsActivity.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.activity import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_RESID import org.mariotaku.twidere.fragment.SettingsDetailsFragment diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt index 268afaa60..a8382cfa9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt @@ -37,20 +37,20 @@ import android.graphics.drawable.Drawable import android.os.AsyncTask import android.os.Build import android.os.Bundle -import android.support.annotation.StringRes -import android.support.v4.app.Fragment -import android.support.v4.app.NotificationCompat -import android.support.v4.view.GravityCompat -import android.support.v4.view.ViewCompat -import android.support.v4.view.ViewPager.OnPageChangeListener -import android.support.v4.view.WindowInsetsCompat -import android.support.v4.view.unwrapped -import android.support.v4.widget.DrawerLayout -import android.support.v4.widget.DrawerLayoutAccessor -import android.support.v7.app.ActionBarDrawerToggle -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatDelegate -import android.support.v7.widget.TintTypedArray +import androidx.annotation.StringRes +import androidx.fragment.app.Fragment +import androidx.core.app.NotificationCompat +import androidx.core.view.GravityCompat +import androidx.core.view.ViewCompat +import androidx.viewpager.widget.ViewPager.OnPageChangeListener +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.unwrapped +import androidx.drawerlayout.widget.DrawerLayout +import androidx.drawerlayout.widget.DrawerLayoutAccessor +import androidx.appcompat.app.ActionBarDrawerToggle +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatDelegate +import androidx.appcompat.widget.TintTypedArray import android.util.SparseIntArray import android.view.Gravity import android.view.KeyEvent @@ -345,7 +345,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp drawerToggle.onConfigurationChanged(newConfig) } - override fun onAttachFragment(fragment: Fragment?) { + override fun onAttachFragment(fragment: Fragment) { super.onAttachFragment(fragment) updateActionsButton() } @@ -1014,7 +1014,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp class AutoRefreshConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.auto_refresh) builder.setMessage(R.string.message_auto_refresh_confirm) builder.setPositiveButton(android.R.string.ok) { _, _ -> @@ -1028,14 +1028,14 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp return dialog } - override fun onDismiss(dialog: DialogInterface?) { + override fun onDismiss(dialog: DialogInterface) { kPreferences[defaultAutoRefreshAskedKey] = true super.onDismiss(dialog) } } companion object { - private val HOME_AS_UP_ATTRS = intArrayOf(android.support.v7.appcompat.R.attr.homeAsUpIndicator) + private val HOME_AS_UP_ATTRS = intArrayOf(android.R.attr.homeAsUpIndicator) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt index 497d44cf8..51d90f0b3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt @@ -5,8 +5,8 @@ import android.app.Dialog import android.content.DialogInterface import android.content.Intent import android.os.Bundle -import android.support.v4.app.FragmentActivity -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentActivity +import androidx.appcompat.app.AlertDialog import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_INTENT import org.mariotaku.twidere.extension.applyTheme @@ -30,7 +30,7 @@ class InvalidAccountAlertActivity : FragmentActivity() { class InvalidAccountAlertDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.title_error_invalid_account) builder.setMessage(R.string.message_error_invalid_account) builder.setPositiveButton(android.R.string.ok) { _, _ -> @@ -38,9 +38,9 @@ class InvalidAccountAlertActivity : FragmentActivity() { AccountUtils.getAccounts(am).filter { !am.isAccountValid(it) }.forEach { account -> am.removeAccountSupport(account) } - val intent = activity.intent.getParcelableExtra(EXTRA_INTENT) + val intent = activity?.intent?.getParcelableExtra(EXTRA_INTENT) if (intent != null) { - activity.startActivity(intent) + activity?.startActivity(intent) } } builder.setNegativeButton(android.R.string.cancel) { _, _ -> @@ -51,18 +51,28 @@ class InvalidAccountAlertActivity : FragmentActivity() { return dialog } - override fun onDismiss(dialog: DialogInterface?) { + override fun onDismiss(dialog: DialogInterface) { super.onDismiss(dialog) - if (!activity.isFinishing) { - activity.finish() + activity?.let { + if (!it.isFinishing) { + it.finish() + } } +// if (!activity.isFinishing) { +// activity.finish() +// } } - override fun onCancel(dialog: DialogInterface?) { + override fun onCancel(dialog: DialogInterface) { super.onCancel(dialog) - if (!activity.isFinishing) { - activity.finish() + activity?.let { + if (!it.isFinishing) { + it.finish() + } } +// if (!activity.isFinishing) { +// activity.finish() +// } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt index 3ae30393a..35f20a70b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt @@ -26,15 +26,15 @@ import android.content.SharedPreferences import android.net.Uri import android.os.BadParcelableException import android.os.Bundle -import android.support.design.widget.FloatingActionButton -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentManager.FragmentLifecycleCallbacks -import android.support.v4.app.NavUtils -import android.support.v4.view.ViewCompat -import android.support.v4.view.WindowCompat -import android.support.v4.view.WindowInsetsCompat -import android.support.v7.widget.Toolbar +import com.google.android.material.floatingactionbutton.FloatingActionButton +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks +import androidx.core.app.NavUtils +import androidx.core.view.ViewCompat +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.appcompat.widget.Toolbar import android.text.TextUtils import android.view.KeyEvent import android.view.MenuItem @@ -254,7 +254,7 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowInsetsCallback, IControl return super.onOptionsItemSelected(item) } - override fun onAttachFragment(fragment: Fragment?) { + override fun onAttachFragment(fragment: Fragment) { super.onAttachFragment(fragment) updateActionsButton() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MainActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MainActivity.kt index 8e798db16..bea26f90f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MainActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MainActivity.kt @@ -28,9 +28,9 @@ import android.net.Uri import android.os.Bundle import android.os.Handler import android.os.Looper -import android.support.annotation.StyleRes -import android.support.v4.view.ViewCompat -import android.support.v7.app.TwilightManagerAccessor +import androidx.annotation.StyleRes +import androidx.core.view.ViewCompat +import androidx.appcompat.app.TwilightManagerAccessor import android.view.View import android.view.View.MeasureSpec import android.widget.Toast diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt index c4c39c405..8ac7f5e4c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt @@ -26,16 +26,16 @@ import android.os.Build import android.os.Bundle import android.os.Environment import android.os.Parcelable -import android.support.annotation.RequiresApi -import android.support.v4.app.DialogFragment -import android.support.v4.app.Fragment -import android.support.v4.content.ContextCompat -import android.support.v4.view.ViewCompat -import android.support.v4.view.ViewPager -import android.support.v4.view.WindowInsetsCompat -import android.support.v4.widget.ViewDragHelper -import android.support.v7.app.WindowDecorActionBar -import android.support.v7.app.decorToolbar +import androidx.annotation.RequiresApi +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.Fragment +import androidx.core.content.ContextCompat +import androidx.core.view.ViewCompat +import androidx.viewpager.widget.ViewPager +import androidx.core.view.WindowInsetsCompat +import androidx.customview.widget.ViewDragHelper +import androidx.appcompat.app.WindowDecorActionBar +import androidx.appcompat.app.decorToolbar import android.view.* import android.widget.Toast import kotlinx.android.synthetic.main.activity_media_viewer.* @@ -103,7 +103,7 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos private val currentFragment: MediaViewerFragment? get() { val viewPager = findViewPager() - val adapter = viewPager.adapter + val adapter = viewPager.adapter ?: return null val currentItem = viewPager.currentItem if (currentItem < 0 || currentItem >= adapter.count) return null return adapter.instantiateItem(viewPager, currentItem) as? MediaViewerFragment @@ -112,7 +112,7 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos private fun getCurrentCacheFileInfo(position: Int): SaveFileTask.FileInfo? { if (position == -1) return null val viewPager = findViewPager() - val adapter = viewPager.adapter + val adapter = viewPager.adapter ?: return null val f = adapter.instantiateItem(viewPager, position) as? MediaViewerFragment ?: return null return f.cacheFileInfo() @@ -219,7 +219,7 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos override fun onOptionsItemSelected(item: MenuItem): Boolean { val viewPager = findViewPager() - val adapter = viewPager.adapter + val adapter = viewPager.adapter ?: return false val currentItem = viewPager.currentItem if (currentItem < 0 || currentItem >= adapter.count) return false val obj = adapter.instantiateItem(viewPager, currentItem) as? MediaViewerFragment ?: return false @@ -438,7 +438,7 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat { val result = super.onApplyWindowInsets(v, insets) - val adapter = viewPager.adapter + val adapter = viewPager.adapter ?: return insets if (adapter.count == 0) return insets val fragment = adapter.instantiateItem(viewPager, viewPager.currentItem) if (fragment is IBaseFragment<*>) { @@ -554,7 +554,7 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos } private fun MediaViewerFragment.cacheFileInfo(): SaveFileTask.FileInfo? { - return when (this) { + when (this) { is CacheDownloadMediaViewerFragment -> { val cacheUri = downloadResult?.cacheUri ?: return null val type = when (this) { @@ -563,7 +563,9 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos is GifPageFragment -> CacheFileType.IMAGE else -> return null } - CacheProvider.ContentUriFileInfo(activity, cacheUri, type) + return activity?.let { + CacheProvider.ContentUriFileInfo(it, cacheUri, type) + } } is ExoPlayerPageFragment -> { return getRequestFileInfo() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt index 354ddc925..3214036d3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt @@ -5,10 +5,10 @@ import android.content.Context import android.content.Intent import android.content.SharedPreferences import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.NavUtils -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.fragment.app.DialogFragment +import androidx.core.app.NavUtils +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.* import android.widget.Button import android.widget.TextView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt index 1dca4eb6f..c52d5203f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt @@ -28,12 +28,12 @@ import android.database.Cursor import android.graphics.PorterDuff.Mode import android.net.Uri import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.CursorLoader -import android.support.v4.content.Loader -import android.support.v4.view.ViewCompat -import android.support.v4.view.WindowInsetsCompat -import android.support.v4.widget.CursorAdapter +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.CursorLoader +import androidx.loader.content.Loader +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.cursoradapter.widget.CursorAdapter import android.text.Editable import android.text.TextUtils import android.text.TextWatcher diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt index cb6077994..96bfc7e44 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt @@ -25,14 +25,14 @@ import android.content.Context import android.content.DialogInterface import android.content.Intent import android.os.Bundle -import android.support.annotation.DrawableRes -import android.support.annotation.XmlRes -import android.support.v4.app.Fragment -import android.support.v4.view.ViewCompat -import android.support.v7.app.AlertDialog -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceFragmentCompat -import android.support.v7.preference.PreferenceFragmentCompat.OnPreferenceStartFragmentCallback +import androidx.annotation.DrawableRes +import androidx.annotation.XmlRes +import androidx.fragment.app.Fragment +import androidx.core.view.ViewCompat +import androidx.appcompat.app.AlertDialog +import androidx.preference.Preference +import androidx.preference.PreferenceFragmentCompat +import androidx.preference.PreferenceFragmentCompat.OnPreferenceStartFragmentCallback import android.view.KeyEvent import android.view.LayoutInflater import android.view.View @@ -289,7 +289,7 @@ class SettingsActivity : BaseActivity(), OnItemClickListener, OnPreferenceStartF fun addPreference(tag: String, @DrawableRes icon: Int, title: String, cls: Class, - args: Bundle? = null) { + args: Bundle? = null) { entries.add(PreferenceEntry(tag, icon, title, 0, cls.name, args)) notifyDataSetChanged() } @@ -390,8 +390,8 @@ class SettingsActivity : BaseActivity(), OnItemClickListener, OnPreferenceStartF class RestartConfirmDialogFragment : BaseDialogFragment(), DialogInterface.OnClickListener { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(activity) - if (arguments.getBoolean(EXTRA_SHOULD_TERMINATE)) { + val builder = AlertDialog.Builder(activity!!) + if (arguments?.getBoolean(EXTRA_SHOULD_TERMINATE) == true) { builder.setMessage(R.string.app_terminate_confirm) builder.setNegativeButton(R.string.action_dont_terminate, this) } else { @@ -408,7 +408,7 @@ class SettingsActivity : BaseActivity(), OnItemClickListener, OnPreferenceStartF val activity = activity as SettingsActivity when (which) { DialogInterface.BUTTON_POSITIVE -> { - if (arguments.getBoolean(EXTRA_SHOULD_TERMINATE)) { + if (arguments?.getBoolean(EXTRA_SHOULD_TERMINATE) == true) { val intent = Intent(context, SettingsActivity::class.java) intent.putExtra(EXTRA_SHOULD_TERMINATE, true) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt index e0c4ce5b0..32375b2d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt @@ -32,12 +32,12 @@ import android.net.Uri import android.os.AsyncTask import android.os.Build import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.ContextCompat -import android.support.v4.content.Loader -import android.support.v4.util.ArraySet -import android.support.v4.view.ViewCompat -import android.support.v7.app.AlertDialog +import androidx.loader.app.LoaderManager +import androidx.core.content.ContextCompat +import androidx.loader.content.Loader +import androidx.collection.ArraySet +import androidx.core.view.ViewCompat +import androidx.appcompat.app.AlertDialog import android.text.Editable import android.text.InputType import android.text.TextWatcher @@ -528,7 +528,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, } else when (apiConfig.credentialsType) { Credentials.Type.XAUTH, Credentials.Type.BASIC -> { passwordSignIn.visibility = View.GONE - signIn.isEnabled = editPassword.text.isNotEmpty() && editUsername.text.isNotEmpty() + signIn.isEnabled = !(editPassword.text.isNullOrEmpty() || editUsername.text.isNullOrEmpty()) } Credentials.Type.OAUTH -> { passwordSignIn.visibility = View.VISIBLE @@ -569,13 +569,13 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, class SignInTypeChooserDialogFragment : BaseDialogFragment(), LoaderManager.LoaderCallbacks> { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_expandable_list) val dialog = builder.create() dialog.onShow { it.applyTheme() val listView = it.expandableList - val adapter = LoginTypeAdapter(context) + val adapter = LoginTypeAdapter(context!!) listView.setAdapter(adapter) listView.setOnGroupClickListener { _, _, groupPosition, _ -> val type = adapter.getGroup(groupPosition) @@ -619,7 +619,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, AccountType.MASTODON, AccountType.STATUSNET) val result = supportedAccountTypes.mapNotNullTo(ArrayList()) { type -> if (type == AccountType.MASTODON) return@mapNotNullTo LoginType(type, - listOf(CustomAPIConfig.mastodon(context))) + listOf(CustomAPIConfig.mastodon(context!!))) return@mapNotNullTo configGroup[type]?.let { list -> LoginType(type, list.sortedBy { !it.isDefault }) } @@ -628,7 +628,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { - return DefaultAPIConfigLoader(context) + return DefaultAPIConfigLoader(context!!) } override fun onLoaderReset(loader: Loader>) { @@ -690,7 +690,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, var challengeType: String? = null override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.login_verification) builder.setView(R.layout.dialog_login_verification_code) builder.positive(android.R.string.ok, this::performVerification) @@ -700,7 +700,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, return dialog } - override fun onCancel(dialog: DialogInterface?) { + override fun onCancel(dialog: DialogInterface) { deferred?.reject(CancelException()) } @@ -749,7 +749,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, class PasswordSignInDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_password_sign_in) builder.positive(R.string.action_sign_in, this::onPositiveButton) builder.setNegativeButton(android.R.string.cancel, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt index b89701374..976364e32 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt @@ -8,9 +8,9 @@ import android.content.Intent import android.os.Bundle import android.os.Parcel import android.os.Parcelable -import android.support.v4.app.DialogFragment -import android.support.v4.util.LongSparseArray -import android.support.v7.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.collection.LongSparseArray +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -90,10 +90,10 @@ class TrendsLocationSelectorActivity : BaseActivity() { } class TrendsLocationDialogFragment : BaseDialogFragment() { - private val list: Array get() = arguments.getTypedArray(EXTRA_DATA) + private val list: Array get() = arguments?.getTypedArray(EXTRA_DATA) ?: emptyArray() override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val selectorBuilder = AlertDialog.Builder(context) + val selectorBuilder = AlertDialog.Builder(context!!) selectorBuilder.setTitle(R.string.trends_location) selectorBuilder.setView(R.layout.dialog_expandable_list) selectorBuilder.setNegativeButton(android.R.string.cancel, null) @@ -101,7 +101,7 @@ class TrendsLocationSelectorActivity : BaseActivity() { dialog.onShow { it.applyTheme() val listView = it.expandableList - val adapter = ExpandableTrendLocationsListAdapter(context) + val adapter = ExpandableTrendLocationsListAdapter(context!!) adapter.data = list listView.setAdapter(adapter) listView.setOnGroupClickListener(ExpandableListView.OnGroupClickListener { _, _, groupPosition, _ -> @@ -128,12 +128,12 @@ class TrendsLocationSelectorActivity : BaseActivity() { activity?.setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_LOCATION, location)) } - override fun onDismiss(dialog: DialogInterface?) { + override fun onDismiss(dialog: DialogInterface) { super.onDismiss(dialog) activity?.finish() } - override fun onCancel(dialog: DialogInterface?) { + override fun onCancel(dialog: DialogInterface) { super.onCancel(dialog) activity?.finish() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt index b2ee377c4..370f9a562 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt @@ -22,12 +22,12 @@ package org.mariotaku.twidere.activity import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.app.hasRunningLoadersSafe -import android.support.v4.content.Loader +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader import android.view.View import android.widget.AdapterView.OnItemClickListener import android.widget.TextView +import androidx.loader.app.hasRunningLoadersSafe import com.bumptech.glide.Glide import kotlinx.android.synthetic.main.layout_list_with_empty_view.* import org.mariotaku.ktextension.Bundle @@ -145,20 +145,20 @@ class UserListSelectorActivity : BaseActivity(), } } - override fun onCreateLoader(id: Int, args: Bundle): Loader> { - val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) - val userKey = args.getParcelable(EXTRA_USER_KEY) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + val accountKey = args?.getParcelable(EXTRA_ACCOUNT_KEY) + val userKey = args?.getParcelable(EXTRA_USER_KEY) return UserListOwnershipsLoader(this, accountKey, userKey, null, adapter.all).apply { - pagination = args.getParcelable(EXTRA_PAGINATION) + pagination = args?.getParcelable(EXTRA_PAGINATION) } } - override fun onLoaderReset(loader: Loader>?) { + override fun onLoaderReset(loader: Loader>) { adapter.setData(null) } - override fun onLoadFinished(loader: Loader>?, data: List?) { + override fun onLoadFinished(loader: Loader>, data: List) { adapter.loadMoreIndicatorPosition = ILoadMoreSupportAdapter.NONE adapter.loadMoreSupportedPosition = if (adapter.all != data) { ILoadMoreSupportAdapter.END diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt index bd2a9dd64..d048cb6ab 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.activity import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader import android.text.TextUtils.isEmpty import android.view.View import android.widget.AdapterView @@ -107,10 +107,10 @@ class UserSelectorActivity : BaseActivity(), OnItemClickListener, LoaderManager. finish() } - override fun onCreateLoader(id: Int, args: Bundle): Loader> { - val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY)!! - val query = args.getString(EXTRA_QUERY).orEmpty() - val fromCache = args.getBoolean(EXTRA_FROM_CACHE) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + val accountKey = args?.getParcelable(EXTRA_ACCOUNT_KEY)!! + val query = args?.getString(EXTRA_QUERY).orEmpty() + val fromCache = args?.getBoolean(EXTRA_FROM_CACHE) if (!fromCache) { showProgress() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/iface/IBaseActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/iface/IBaseActivity.kt index 2f8b76fc5..f00a6dd04 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/iface/IBaseActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/iface/IBaseActivity.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.activity.iface import android.os.Handler import android.os.Looper -import android.support.v4.app.FragmentActivity +import androidx.fragment.app.FragmentActivity import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt index 2eea60674..2c9cfeb17 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.activity.shortcut import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v4.content.pm.ShortcutInfoCompat -import android.support.v4.content.pm.ShortcutManagerCompat +import androidx.core.content.pm.ShortcutInfoCompat +import androidx.core.content.pm.ShortcutManagerCompat import nl.komponents.kovenant.Promise import nl.komponents.kovenant.combine.and import nl.komponents.kovenant.ui.alwaysUi diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/ComposeShortcutCreatorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/ComposeShortcutCreatorActivity.kt index 25528d46b..aacc13d5e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/ComposeShortcutCreatorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/ComposeShortcutCreatorActivity.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.activity.shortcut import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v4.content.pm.ShortcutInfoCompat -import android.support.v4.content.pm.ShortcutManagerCompat -import android.support.v4.graphics.drawable.IconCompat +import androidx.core.content.pm.ShortcutInfoCompat +import androidx.core.content.pm.ShortcutManagerCompat +import androidx.core.graphics.drawable.IconCompat import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.INTENT_ACTION_COMPOSE diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/AccountDetailsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/AccountDetailsAdapter.kt index 3d9b35936..e03f989c8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/AccountDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/AccountDetailsAdapter.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerViewAccessor +import androidx.recyclerview.widget.RecyclerViewAccessor import android.view.View import android.view.ViewGroup import android.widget.CompoundButton diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ArrayRecyclerAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ArrayRecyclerAdapter.kt index a8c76f52d..21bfbeee9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ArrayRecyclerAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ArrayRecyclerAdapter.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.RecyclerView.ViewHolder import com.bumptech.glide.RequestManager import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseArrayAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseArrayAdapter.kt index 26f69c021..e3656047c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseArrayAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseArrayAdapter.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.content.SharedPreferences -import android.support.v4.text.BidiFormatter +import androidx.core.text.BidiFormatter import com.bumptech.glide.RequestManager import org.mariotaku.kpreferences.get import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.kt index 04013d791..7be6dd608 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.kt @@ -21,8 +21,8 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.content.SharedPreferences -import android.support.v4.text.BidiFormatter -import android.support.v7.widget.RecyclerView +import androidx.core.text.BidiFormatter +import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.RequestManager import org.mariotaku.kpreferences.get import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ComposeAutoCompleteAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ComposeAutoCompleteAdapter.kt index e910943f9..2e089faca 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ComposeAutoCompleteAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ComposeAutoCompleteAdapter.kt @@ -23,7 +23,7 @@ import android.content.Context import android.content.SharedPreferences import android.database.Cursor import android.graphics.PorterDuff.Mode -import android.support.v4.widget.SimpleCursorAdapter +import androidx.cursoradapter.widget.SimpleCursorAdapter import android.view.View import android.widget.TextView import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DraftsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DraftsAdapter.kt index 38c117e3d..663b13681 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DraftsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DraftsAdapter.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.content.SharedPreferences import android.database.Cursor -import android.support.v4.widget.SimpleCursorAdapter -import android.support.v7.widget.RecyclerViewAccessor +import androidx.cursoradapter.widget.SimpleCursorAdapter +import androidx.recyclerview.widget.RecyclerViewAccessor import android.view.View import android.view.ViewGroup import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt index 864ac4b79..9caba867f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt @@ -2,8 +2,8 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.content.SharedPreferences -import android.support.v4.text.BidiFormatter -import android.support.v7.widget.RecyclerView +import androidx.core.text.BidiFormatter +import androidx.recyclerview.widget.RecyclerView import android.util.SparseBooleanArray import com.bumptech.glide.RequestManager import org.mariotaku.kpreferences.get diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/LoadMoreSupportAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/LoadMoreSupportAdapter.kt index 7590c07d4..a193f0d46 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/LoadMoreSupportAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/LoadMoreSupportAdapter.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.RecyclerView.ViewHolder import com.bumptech.glide.RequestManager import org.mariotaku.twidere.adapter.iface.ILoadMoreSupportAdapter diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MediaPreviewAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MediaPreviewAdapter.kt index ca8b2dabb..a41b1ea95 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MediaPreviewAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MediaPreviewAdapter.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt index f39eac770..c3f4f1abb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt @@ -21,8 +21,8 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.content.res.ColorStateList -import android.support.v4.graphics.ColorUtils -import android.support.v7.widget.RecyclerView +import androidx.core.graphics.ColorUtils +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesEntriesAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesEntriesAdapter.kt index 1967da319..ac65894c1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesEntriesAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesEntriesAdapter.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt index a9bf7bbdc..89d7c8c2b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.adapter import android.annotation.SuppressLint import android.content.Context import android.database.CursorIndexOutOfBoundsException -import android.support.v4.widget.Space -import android.support.v7.widget.RecyclerView +import androidx.legacy.widget.Space +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableGroupsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableGroupsAdapter.kt index 874d9e75a..da08946dc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableGroupsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableGroupsAdapter.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt index 894e36a70..899d31901 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt @@ -21,8 +21,8 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.database.CursorIndexOutOfBoundsException -import android.support.v4.widget.Space -import android.support.v7.widget.RecyclerView +import androidx.legacy.widget.Space +import androidx.recyclerview.widget.RecyclerView import android.util.SparseBooleanArray import android.view.LayoutInflater import android.view.ViewGroup diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUserListsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUserListsAdapter.kt index a89c69195..4bb0efd7f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUserListsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUserListsAdapter.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUsersAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUsersAdapter.kt index 1d314f20f..9d4b4389a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUsersAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableUsersAdapter.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/RecyclerPagerAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/RecyclerPagerAdapter.kt index b334b387b..2d2e7853c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/RecyclerPagerAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/RecyclerPagerAdapter.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.adapter -import android.support.v4.view.PagerAdapter +import androidx.viewpager.widget.PagerAdapter import android.util.SparseArray import android.view.View import android.view.ViewGroup @@ -22,13 +22,13 @@ abstract class RecyclerPagerAdapter : PagerAdapter() { return holder } - final override fun destroyItem(container: ViewGroup, position: Int, obj: Any?) { + final override fun destroyItem(container: ViewGroup, position: Int, obj: Any) { val holder = obj as ViewHolder viewHolders.remove(position) container.removeView(holder.itemView) } - final override fun getItemPosition(obj: Any?): Int { + final override fun getItemPosition(obj: Any): Int { for (i in 0 until viewHolders.size()) { val position = viewHolders.keyAt(i) val holder = viewHolders.valueAt(i) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt index 5ad4d6170..6dbaa6d54 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v4.util.ArrayMap -import android.support.v7.widget.RecyclerView +import androidx.collection.ArrayMap +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SourceAutoCompleteAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SourceAutoCompleteAdapter.kt index 817778c4b..e622445a5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SourceAutoCompleteAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SourceAutoCompleteAdapter.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.database.Cursor import android.database.sqlite.SQLiteDatabase -import android.support.v4.widget.SimpleCursorAdapter +import androidx.cursoradapter.widget.SimpleCursorAdapter import android.view.View import android.widget.TextView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt index 4fe17aa79..51e7187e5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.adapter -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.text.TextUtils import android.text.method.LinkMovementMethod import android.util.SparseBooleanArray @@ -51,7 +51,7 @@ import org.mariotaku.twidere.view.holder.status.DetailStatusViewHolder class StatusDetailsAdapter( val fragment: StatusFragment -) : LoadMoreSupportAdapter(fragment.context, fragment.requestManager), +) : LoadMoreSupportAdapter(fragment.context!!, fragment.requestManager), IStatusesAdapter>, IItemCountsAdapter { override val twidereLinkify: TwidereLinkify @@ -114,9 +114,9 @@ class StatusDetailsAdapter( itemCounts[ITEM_IDX_CONVERSATION_LOAD_MORE] = 1 itemCounts[ITEM_IDX_REPLY_LOAD_MORE] = 1 inflater = LayoutInflater.from(context) - cardBackgroundColor = ThemeUtils.getCardBackgroundColor(context, + cardBackgroundColor = ThemeUtils.getCardBackgroundColor(context!!, preferences[themeBackgroundOptionKey], preferences[themeBackgroundAlphaKey]) - val listener = StatusAdapterLinkClickHandler>(context, preferences) + val listener = StatusAdapterLinkClickHandler>(context!!, preferences) listener.setAdapter(this) twidereLinkify = TwidereLinkify(listener) } @@ -268,7 +268,7 @@ class StatusDetailsAdapter( get() = statusClickListener - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder? { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { when (viewType) { VIEW_TYPE_DETAIL_STATUS -> { val view = inflater.inflate(R.layout.header_status, parent, false) @@ -292,7 +292,7 @@ class StatusDetailsAdapter( return StatusErrorItemViewHolder(view) } } - return null + return EmptyViewHolder(View(context)) } override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List) { @@ -423,12 +423,12 @@ class StatusDetailsAdapter( return itemCounts.itemCount } - override fun onAttachedToRecyclerView(recyclerView: RecyclerView?) { + override fun onAttachedToRecyclerView(recyclerView: RecyclerView) { super.onAttachedToRecyclerView(recyclerView) this.recyclerView = recyclerView } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { super.onDetachedFromRecyclerView(recyclerView) this.recyclerView = null } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.kt index c621e8b16..7f68080fe 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportFixedFragmentStatePagerAdapter.kt @@ -19,11 +19,11 @@ package org.mariotaku.twidere.adapter -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentAccessor -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter import android.view.ViewGroup +import androidx.fragment.app.FragmentAccessor abstract class SupportFixedFragmentStatePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt index 537323512..5f18ceacc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.graphics.drawable.Drawable import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.view.PagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.viewpager.widget.PagerAdapter import android.view.View import android.view.ViewGroup import org.mariotaku.twidere.fragment.iface.RefreshScrollTopInterface @@ -61,7 +61,7 @@ class SupportTabsAdapter( return this.tabs.size } - override fun getItemPosition(obj: Any?): Int { + override fun getItemPosition(obj: Any): Int { if (obj !is Fragment) return PagerAdapter.POSITION_NONE val args = obj.arguments ?: return PagerAdapter.POSITION_NONE return args.getInt(EXTRA_ADAPTER_POSITION, PagerAdapter.POSITION_NONE) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/TrendsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/TrendsAdapter.kt index edefc5c7d..9733e8adf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/TrendsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/TrendsAdapter.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.adapter import android.content.Context import android.database.Cursor -import android.support.v4.widget.SimpleCursorAdapter +import androidx.cursoradapter.widget.SimpleCursorAdapter import org.mariotaku.twidere.provider.TwidereDataStore diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt index 820e1acd7..fbc68aca1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt @@ -23,7 +23,7 @@ import android.content.Context import android.content.SharedPreferences import android.database.Cursor import android.net.Uri -import android.support.v4.widget.SimpleCursorAdapter +import androidx.cursoradapter.widget.SimpleCursorAdapter import android.text.TextUtils import android.view.View import android.widget.TextView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt index 65cac86ad..d2bd29e6a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.adapter import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import com.bumptech.glide.RequestManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt index 3f35c8104..d24bc5011 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.adapter.iface -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.view.View /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IContentAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IContentAdapter.kt index 959994c6e..99c3f705b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IContentAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IContentAdapter.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.adapter.iface -import android.support.v4.text.BidiFormatter +import androidx.core.text.BidiFormatter import com.bumptech.glide.RequestManager import org.mariotaku.twidere.annotation.ImageShapeStyle import org.mariotaku.twidere.util.AsyncTwitterWrapper diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ILoadMoreSupportAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ILoadMoreSupportAdapter.kt index 293818ae1..af1fce26b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ILoadMoreSupportAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ILoadMoreSupportAdapter.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.adapter.iface -import android.support.annotation.IntDef +import androidx.annotation.LongDef /** * Created by mariotaku on 15/4/16. @@ -32,7 +32,7 @@ interface ILoadMoreSupportAdapter { var loadMoreSupportedPosition: Long @IndicatorPosition get @IndicatorPosition set - @IntDef(flag = true, value = *longArrayOf(NONE, START, END, BOTH)) + @LongDef(flag = true, value = [NONE, START, END, BOTH]) annotation class IndicatorPosition companion object { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt index ccd01f171..5e70fbdbd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt @@ -32,7 +32,7 @@ import android.database.sqlite.SQLiteOpenHelper import android.net.ConnectivityManager import android.os.AsyncTask import android.os.Looper -import android.support.multidex.MultiDex +import androidx.multidex.MultiDex import com.bumptech.glide.Glide import nl.komponents.kovenant.task import okhttp3.Dns diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt index 060935ef6..0dff555cd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt @@ -2,8 +2,8 @@ package org.mariotaku.twidere.constant import android.content.SharedPreferences import android.os.Build -import android.support.v4.os.LocaleHelperAccessor -import android.support.v4.util.ArraySet +import androidx.core.os.LocaleHelperAccessor +import androidx.collection.ArraySet import android.text.TextUtils import org.mariotaku.kpreferences.* import org.mariotaku.ktextension.bcp47Tag diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DialogExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DialogExtensions.kt index c46b3edb9..7965a0851 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DialogExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/DialogExtensions.kt @@ -3,8 +3,8 @@ package org.mariotaku.twidere.extension import android.app.Dialog import android.content.DialogInterface.* import android.content.res.ColorStateList -import android.support.annotation.StringRes -import android.support.v7.app.AlertDialog +import androidx.annotation.StringRes +import androidx.appcompat.app.AlertDialog import org.mariotaku.chameleon.Chameleon import org.mariotaku.chameleon.ChameleonUtils import org.mariotaku.twidere.util.ThemeUtils diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/FragmentExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/FragmentExtensions.kt index a947b056c..4bfda9271 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/FragmentExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/FragmentExtensions.kt @@ -19,13 +19,13 @@ package org.mariotaku.twidere.extension -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment /** * Created by mariotaku on 2017/10/4. */ var Fragment.title: CharSequence? - get() = activity.title + get() = activity?.title set(value) { - activity.title + activity?.title } \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseActivityExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseActivityExtensions.kt index 8c8ae67b0..c68a4af05 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseActivityExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseActivityExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension -import android.support.v4.app.FragmentActivity +import androidx.fragment.app.FragmentActivity import nl.komponents.kovenant.Promise import org.mariotaku.ktextension.dismissDialogFragment import org.mariotaku.twidere.activity.iface.IBaseActivity diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseFragmentExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseFragmentExtensions.kt index 7d698a3f1..51d060658 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseFragmentExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/IBaseFragmentExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import nl.komponents.kovenant.Promise import org.mariotaku.ktextension.dismissDialogFragment import org.mariotaku.twidere.fragment.ProgressDialogFragment diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/PreferenceExtension.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/PreferenceExtension.kt index 79cd2807e..421dfc449 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/PreferenceExtension.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/PreferenceExtension.kt @@ -19,9 +19,9 @@ package org.mariotaku.twidere.extension -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceGroup -import android.support.v7.preference.PreferenceScreen +import androidx.preference.Preference +import androidx.preference.PreferenceGroup +import androidx.preference.PreferenceScreen import java.util.* fun Preference.findParent(screen: PreferenceScreen): PreferenceGroup? { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/RectExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/RectExtensions.kt index cd45cb51a..d9e0f6b18 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/RectExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/RectExtensions.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.extension import android.graphics.Point import android.graphics.Rect -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat /** * Created by mariotaku on 2017/2/20. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ResourcesExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ResourcesExtensions.kt index 9db22af9e..4e4f8ebda 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ResourcesExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ResourcesExtensions.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.extension import android.content.res.Resources -import android.support.v4.os.LocaleListCompat +import androidx.core.os.LocaleListCompat import org.mariotaku.ktextension.localesCompat import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/StaggeredGridLayoutManagerExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/StaggeredGridLayoutManagerExtensions.kt index cdabef7a7..6c2571345 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/StaggeredGridLayoutManagerExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/StaggeredGridLayoutManagerExtensions.kt @@ -19,8 +19,8 @@ package org.mariotaku.twidere.extension -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.StaggeredGridLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.StaggeredGridLayoutManager /** * Created by mariotaku on 2017/3/30. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ViewExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ViewExtensions.kt index c63dfa2a8..a6e15aec0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ViewExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ViewExtensions.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.extension import android.graphics.Rect import android.graphics.RectF -import android.support.annotation.UiThread +import androidx.annotation.UiThread import android.view.View import android.view.ViewGroup import android.widget.TextView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt index 7fdf1cdad..c0be5d256 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt @@ -5,7 +5,7 @@ import android.content.Context import android.os.Build import android.os.Handler import android.os.Looper -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import android.text.TextUtils import org.mariotaku.ktextension.HexColorFormat import org.mariotaku.ktextension.toHexColor @@ -65,7 +65,7 @@ fun Account.setAccountUser(am: AccountManager, user: ParcelableUser) { am.setUserData(this, ACCOUNT_USER_DATA_USER, JsonSerializer.serialize(user)) } -@android.support.annotation.ColorInt +@androidx.annotation.ColorInt fun Account.getColor(am: AccountManager): Int { return ParseUtils.parseColor(AccountDataQueue.getUserData(am, this, ACCOUNT_USER_DATA_COLOR), 0) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/DefaultFeaturesExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/DefaultFeaturesExtensions.kt index 2c9119e61..121b79372 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/DefaultFeaturesExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/DefaultFeaturesExtensions.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.extension.model import android.content.SharedPreferences -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.restfu.http.RestHttpClient import org.mariotaku.twidere.model.DefaultFeatures import java.io.IOException diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/LaunchPresentationExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/LaunchPresentationExtensions.kt index 83124f52d..1f4a204ee 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/LaunchPresentationExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/LaunchPresentationExtensions.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.extension.model import android.content.Context -import android.support.v4.os.LocaleListCompat +import androidx.core.os.LocaleListCompat import org.mariotaku.ktextension.localesCompat import org.mariotaku.twidere.model.presentation.LaunchPresentation import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/NotificationChannelSpecsExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/NotificationChannelSpecsExtensions.kt index 31c9e953d..d1161c16e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/NotificationChannelSpecsExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/NotificationChannelSpecsExtensions.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.extension.model import android.content.Context import android.net.Uri -import android.support.v4.app.NotificationCompat +import androidx.core.app.NotificationCompat import org.mariotaku.twidere.model.UserKey import org.mariotaku.twidere.model.notification.NotificationChannelSpec diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/ActionMenuViewExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/ActionMenuViewExtensions.kt index d946654e7..701624cf5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/ActionMenuViewExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/ActionMenuViewExtensions.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.extension.view import android.annotation.SuppressLint -import android.support.v7.view.menu.MenuView -import android.support.v7.widget.ActionMenuView +import androidx.appcompat.view.menu.MenuView +import androidx.appcompat.widget.ActionMenuView import android.view.MenuItem import android.view.View import org.mariotaku.twidere.extension.children diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/RecyclerViewExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/RecyclerViewExtensions.kt index ee0fd0262..934feef9e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/RecyclerViewExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/view/RecyclerViewExtensions.kt @@ -19,16 +19,16 @@ package org.mariotaku.twidere.extension.view -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.recyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View +import androidx.recyclerview.widget.recyclerView fun RecyclerView.LayoutManager.calculateSpaceItemHeight(child: View, spaceViewType: Int, typeStart: Int): Int { val recyclerView = recyclerView ?: return 0 var heightBeforeSpace = 0 for (i in 0 until childCount) { val childToMeasure = getChildAt(i) - val typeToMeasure = getItemViewType(childToMeasure) + val typeToMeasure = getItemViewType(childToMeasure!!) if (typeToMeasure == spaceViewType) { break } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt index 43dff1d63..2a9132c74 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt @@ -4,9 +4,9 @@ import android.app.Dialog import android.content.Context import android.content.DialogInterface import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog import android.view.View import android.view.ViewGroup import android.widget.* @@ -29,21 +29,21 @@ import org.mariotaku.twidere.util.view.ConsumerKeySecretValidator class APIEditorDialogFragment : BaseDialogFragment() { - private val loadDefaults by lazy { dialog.findViewById(R.id.loadDefaults) } - private val editAPIUrlFormat by lazy { dialog.findViewById(R.id.editApiUrlFormat) } - private val editSameOAuthSigningUrl by lazy { dialog.findViewById(R.id.editSameOAuthSigningUrl) } - private val editNoVersionSuffix by lazy { dialog.findViewById(R.id.editNoVersionSuffix) } - private val editConsumerKey by lazy { dialog.findViewById(R.id.editConsumerKey) } - private val editConsumerSecret by lazy { dialog.findViewById(R.id.editConsumerSecret) } - private val editAuthType by lazy { dialog.findViewById(R.id.editAuthType) } - private val apiFormatHelpButton by lazy { dialog.findViewById(R.id.apiUrlFormatHelp) } - private val accountTypeSpinner by lazy { dialog.findViewById(R.id.accountTypeSpinner) } + private val loadDefaults by lazy { dialog!!.findViewById(R.id.loadDefaults) } + private val editAPIUrlFormat by lazy { dialog!!.findViewById(R.id.editApiUrlFormat) } + private val editSameOAuthSigningUrl by lazy { dialog!!.findViewById(R.id.editSameOAuthSigningUrl) } + private val editNoVersionSuffix by lazy { dialog!!.findViewById(R.id.editNoVersionSuffix) } + private val editConsumerKey by lazy { dialog!!.findViewById(R.id.editConsumerKey) } + private val editConsumerSecret by lazy { dialog!!.findViewById(R.id.editConsumerSecret) } + private val editAuthType by lazy { dialog!!.findViewById(R.id.editAuthType) } + private val apiFormatHelpButton by lazy { dialog!!.findViewById(R.id.apiUrlFormatHelp) } + private val accountTypeSpinner by lazy { dialog!!.findViewById(R.id.accountTypeSpinner) } private var editNoVersionSuffixChanged: Boolean = false private lateinit var apiConfig: CustomAPIConfig override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_api_editor) builder.setPositiveButton(R.string.action_save) { _, _ -> val targetFragment = this.targetFragment @@ -76,8 +76,8 @@ class APIEditorDialogFragment : BaseDialogFragment() { accountTypeSpinner.adapter = AccountTypeSpinnerAdapter(this) - editConsumerKey.addValidator(ConsumerKeySecretValidator(context.getString(R.string.invalid_consumer_key))) - editConsumerSecret.addValidator(ConsumerKeySecretValidator(context.getString(R.string.invalid_consumer_secret))) + editConsumerKey.addValidator(ConsumerKeySecretValidator(context!!.getString(R.string.invalid_consumer_key))) + editConsumerSecret.addValidator(ConsumerKeySecretValidator(context!!.getString(R.string.invalid_consumer_secret))) editNoVersionSuffix.setOnCheckedChangeListener { _, _ -> editNoVersionSuffixChanged = true } editAuthType.setOnCheckedChangeListener { _, checkedId -> @@ -145,8 +145,8 @@ class APIEditorDialogFragment : BaseDialogFragment() { private lateinit var adapter: ArrayAdapter override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - adapter = CustomAPIConfigArrayAdapter(context) - val builder = AlertDialog.Builder(context) + adapter = CustomAPIConfigArrayAdapter(context!!) + val builder = AlertDialog.Builder(context!!) builder.setAdapter(adapter, this) loaderManager.initLoader(0, null, this) val dialog = builder.create() @@ -162,7 +162,7 @@ class APIEditorDialogFragment : BaseDialogFragment() { } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { - return DefaultAPIConfigLoader(context) + return DefaultAPIConfigLoader(context!!) } override fun onLoadFinished(loader: Loader>, data: List) { @@ -189,7 +189,7 @@ class APIEditorDialogFragment : BaseDialogFragment() { private class AccountTypeSpinnerAdapter( fragment: APIEditorDialogFragment - ) : BaseArrayAdapter(fragment.context, R.layout.support_simple_spinner_dropdown_item, + ) : BaseArrayAdapter(fragment.context!!, R.layout.support_simple_spinner_dropdown_item, requestManager = fragment.requestManager) { init { add(AccountType.TWITTER) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt index 713080812..f90216a0e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt @@ -26,12 +26,12 @@ import android.content.Intent import android.graphics.Rect import android.os.Bundle import android.os.Parcelable -import android.support.annotation.CallSuper -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.Loader -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.RecyclerView.OnScrollListener +import androidx.annotation.CallSuper +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.OnScrollListener import android.view.* import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.fragment_content_recyclerview.* @@ -84,7 +84,7 @@ abstract class AbsActivitiesFragment protected constructor() : private lateinit var pauseOnScrollListener: OnScrollListener private val onScrollListener = object : OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { if (newState == RecyclerView.SCROLL_STATE_IDLE) { val layoutManager = layoutManager saveReadPosition(layoutManager.findFirstVisibleItemPosition()) @@ -155,7 +155,9 @@ abstract class AbsActivitiesFragment protected constructor() : private fun openActivity(activity: ParcelableActivity) { val status = activity.activityStatus if (status != null) { - IntentUtils.openStatus(context, activity, null) + context?.let { + IntentUtils.openStatus(it, activity, null) + } } } @@ -180,10 +182,10 @@ abstract class AbsActivitiesFragment protected constructor() : return navigationHelper.handleKeyboardShortcutRepeat(handler, keyCode, repeatCount, event, metaState) } - override fun onCreateLoader(id: Int, args: Bundle): Loader> { - val fromUser = args.getBoolean(EXTRA_FROM_USER) - args.remove(EXTRA_FROM_USER) - return onCreateActivitiesLoader(activity, args, fromUser) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + val fromUser = args?.getBoolean(EXTRA_FROM_USER) + args?.remove(EXTRA_FROM_USER) + return onCreateActivitiesLoader(activity!!, args!!, fromUser!!) } protected fun saveReadPosition() { @@ -319,9 +321,11 @@ abstract class AbsActivitiesFragment protected constructor() : override fun onMediaClick(holder: IStatusViewHolder, view: View, media: ParcelableMedia, position: Int) { val status = adapter.getActivity(position).activityStatus ?: return - IntentUtils.openMedia(activity, status, media, preferences[newDocumentApiKey], + activity?.let { + IntentUtils.openMedia(it, status, media, preferences[newDocumentApiKey], preferences[displaySensitiveContentsKey], null) + } } override fun onStatusActionClick(holder: IStatusViewHolder, id: Int, position: Int) { @@ -343,7 +347,7 @@ abstract class AbsActivitiesFragment protected constructor() : activity.targets?.statuses?.addAllTo(list) } activity.sources?.addAllTo(list) - IntentUtils.openItems(getActivity(), list) + getActivity()?.let { IntentUtils.openItems(it, list) } } override fun onStatusMenuClick(holder: IStatusViewHolder, menuView: View, position: Int) { @@ -358,12 +362,14 @@ abstract class AbsActivitiesFragment protected constructor() : override fun onStatusClick(holder: IStatusViewHolder, position: Int) { val status = getActivityStatus(position) ?: return - IntentUtils.openStatus(context, status, null) + context?.let { + IntentUtils.openStatus(it, status, null) + } } override fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) { val status = getActivityStatus(position)?.takeIf { it.quoted_id != null } ?: return - IntentUtils.openStatus(context, status.account_key, status.quoted_id) + context?.let { IntentUtils.openStatus(it, status.account_key, status.quoted_id) } } protected open fun getFullActivity(position: Int): ParcelableActivity? { @@ -483,8 +489,10 @@ abstract class AbsActivitiesFragment protected constructor() : ITEM_VIEW_TYPE_STATUS -> { val status = getActivityStatus(position) ?: return inflater.inflate(R.menu.action_status, menu) - MenuUtils.setupForStatus(context, menu, preferences, twitterWrapper, userColorNameManager, - status) + context?.let { + MenuUtils.setupForStatus(it, menu, preferences, twitterWrapper, userColorNameManager, + status) + } } } } @@ -498,7 +506,7 @@ abstract class AbsActivitiesFragment protected constructor() : val status = getActivityStatus(position) ?: return false when (item.itemId) { R.id.share -> { - val shareIntent = Utils.createStatusShareIntent(activity, status) + val shareIntent = activity?.let { Utils.createStatusShareIntent(it, status) } val chooser = Intent.createChooser(shareIntent, getString(R.string.share_status)) startActivity(chooser) @@ -509,16 +517,20 @@ abstract class AbsActivitiesFragment protected constructor() : } R.id.make_gap -> { if (this !is CursorActivitiesFragment) return true - val resolver = context.contentResolver + val resolver = context?.contentResolver val values = ContentValues() values.put(Activities.IS_GAP, 1) val _id = adapter.getActivity(position)._id val where = Expression.equals(Activities._ID, _id).sql - resolver.update(contentUri, values, where, null) + resolver?.update(contentUri, values, where, null) return true } - else -> MenuUtils.handleStatusClick(activity, this, fragmentManager, - preferences, userColorNameManager, twitterWrapper, status, item) + else -> activity?.let { + fragmentManager?.let { fragmentManager -> + MenuUtils.handleStatusClick(it, this, fragmentManager, + preferences, userColorNameManager, twitterWrapper, status, item) + } + } } } } @@ -527,7 +539,7 @@ abstract class AbsActivitiesFragment protected constructor() : override fun onCreateItemDecoration(context: Context, recyclerView: RecyclerView, - layoutManager: LinearLayoutManager): RecyclerView.ItemDecoration? { + layoutManager: LinearLayoutManager): RecyclerView.ItemDecoration? { val itemDecoration = object : ExtendedDividerItemDecoration(context, (recyclerView.layoutManager as LinearLayoutManager).orientation) { override fun isDividerEnabled(childPos: Int): Boolean { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt index d825ab512..fe8e0f556 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListRecyclerViewFragment.kt @@ -20,9 +20,9 @@ package org.mariotaku.twidere.fragment import android.content.Context -import android.support.v7.widget.FixedLinearLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.FixedLinearLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import org.mariotaku.ktextension.contains import org.mariotaku.twidere.adapter.LoadMoreSupportAdapter @@ -38,7 +38,7 @@ abstract class AbsContentListRecyclerViewFragment() { override fun onCreateItemDecoration(context: Context, recyclerView: RecyclerView, - layoutManager: LinearLayoutManager): RecyclerView.ItemDecoration? { + layoutManager: LinearLayoutManager): RecyclerView.ItemDecoration? { return ExtendedDividerItemDecoration(context, layoutManager.orientation) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt index 9518bb85c..96e9d0cba 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt @@ -23,7 +23,7 @@ import android.content.Context import android.graphics.Rect import android.graphics.drawable.Drawable import android.os.Bundle -import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener import android.view.* import android.widget.AbsListView import android.widget.ListAdapter @@ -55,7 +55,9 @@ abstract class AbsContentListViewFragment : BaseFragment(), } protected open val overrideDivider: Drawable? - get() = ThemeUtils.getDrawableFromThemeAttribute(context, android.R.attr.listDivider) + get() = context?.let { + ThemeUtils.getDrawableFromThemeAttribute(it, android.R.attr.listDivider) + } protected val isProgressShowing: Boolean get() = progressContainer.visibility == View.VISIBLE @@ -127,12 +129,12 @@ abstract class AbsContentListViewFragment : BaseFragment(), override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - val backgroundColor = ThemeUtils.getColorBackground(context) + val backgroundColor = ThemeUtils.getColorBackground(context!!) val colorRes = TwidereColorUtils.getContrastYIQ(backgroundColor, R.color.bg_refresh_progress_color_light, R.color.bg_refresh_progress_color_dark) swipeLayout.setOnRefreshListener(this) swipeLayout.setProgressBackgroundColorSchemeResource(colorRes) - adapter = onCreateAdapter(context, requestManager) + adapter = onCreateAdapter(context!!, requestManager) listView.setOnTouchListener { _, event -> if (event.actionMasked == MotionEvent.ACTION_DOWN) { updateRefreshProgressOffset() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt index ed685942f..2da1262b4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.graphics.Rect import android.os.Bundle -import android.support.v4.widget.SwipeRefreshLayout -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.RecyclerView.ItemDecoration +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.ItemDecoration import android.view.* import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.fragment_content_recyclerview.* @@ -138,7 +138,7 @@ abstract class AbsContentRecyclerViewFragment actionBar.height val manager = layoutManager if (manager.childCount == 0) return - val firstView = manager.getChildAt(0) + val firstView = manager.getChildAt(0) ?: return if (manager.getPosition(firstView) != 0) { activity.setControlBarVisibleAnimate(visible, this) return @@ -182,13 +182,13 @@ abstract class AbsContentRecyclerViewFragment?> { - val fromUser = args.getBoolean(EXTRA_FROM_USER) - args.remove(EXTRA_FROM_USER) - return onCreateStatusesLoader(activity, args, fromUser) + override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { + val fromUser = args?.getBoolean(EXTRA_FROM_USER) + args?.remove(EXTRA_FROM_USER) + return onCreateStatusesLoader(activity!!, args!!, fromUser!!) } final override fun onLoadFinished(loader: Loader?>, data: List?) { @@ -126,17 +126,21 @@ abstract class AbsMediaStatusesFragment : AbsContentRecyclerViewFragment?>, - data: List?, changed: Boolean): Boolean { + data: List?, changed: Boolean): Boolean { if (loader !is AbsRequestStatusesLoader) return false val pagination = loader.pagination as? SinceMaxPagination val maxId = pagination?.maxId?.takeIf(String::isNotEmpty) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt index 0919f2fdb..c05c0a967 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt @@ -26,13 +26,13 @@ import android.content.Context import android.content.Intent import android.graphics.Rect import android.os.Bundle -import android.support.annotation.CallSuper -import android.support.v4.app.Fragment -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.Loader -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.RecyclerView.OnScrollListener +import androidx.annotation.CallSuper +import androidx.fragment.app.Fragment +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.OnScrollListener import android.view.* import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.fragment_content_recyclerview.* @@ -84,7 +84,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment?> { - val fromUser = args.getBoolean(EXTRA_FROM_USER) - args.remove(EXTRA_FROM_USER) - return onCreateStatusesLoader(activity, args, fromUser) + override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { + val fromUser = args?.getBoolean(EXTRA_FROM_USER) + args?.remove(EXTRA_FROM_USER) + return onCreateStatusesLoader(activity!!, args!!, fromUser!!) } override fun setUserVisibleHint(isVisibleToUser: Boolean) { @@ -373,16 +375,20 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment?>, - data: List?): Boolean + data: List?): Boolean protected abstract fun onCreateStatusesLoader(context: Context, args: Bundle, fromUser: Boolean): Loader?> @@ -522,8 +532,10 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment { - val shareIntent = Utils.createStatusShareIntent(activity, status) + val shareIntent = activity?.let { Utils.createStatusShareIntent(it, status) } val chooser = Intent.createChooser(shareIntent, getString(R.string.share_status)) startActivity(chooser) @@ -543,14 +555,14 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment { if (this !is CursorStatusesFragment) return true - val resolver = context.contentResolver + val resolver = context?.contentResolver val values = ContentValues() values.put(Statuses.IS_GAP, 1) val where = Expression.equals(Statuses._ID, status._id).sql - resolver.update(contentUri, values, where, null) + resolver?.update(contentUri, values, where, null) return true } - else -> return MenuUtils.handleStatusClick(activity, this, fragmentManager, + else -> return MenuUtils.handleStatusClick(activity!!, this, fragmentManager!!, preferences, userColorNameManager, twitterWrapper, status, item) } } @@ -591,7 +603,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment { val intent = Intent(INTENT_ACTION_REPLY) - intent.`package` = fragment.context.packageName + intent.`package` = fragment.context?.packageName intent.putExtra(EXTRA_STATUS, status) fragment.startActivity(intent) } @@ -619,12 +631,12 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment { - val intent = selectAccountIntent(fragment.context, status, itemId) + val intent = fragment.context?.let { selectAccountIntent(it, status, itemId) } fragment.startActivityForResult(intent, REQUEST_FAVORITE_SELECT_ACCOUNT) return true } R.id.retweet -> { - val intent = selectAccountIntent(fragment.context, status, itemId, false) + val intent = fragment.context?.let { selectAccountIntent(it, status, itemId, false) } fragment.startActivityForResult(intent, REQUEST_RETWEET_SELECT_ACCOUNT) return true } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt index e4e282277..a8d981b07 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt @@ -4,11 +4,11 @@ import android.content.Context import android.content.Intent import android.graphics.Rect import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentActivity -import android.support.v4.view.OnApplyWindowInsetsListener -import android.support.v4.view.ViewPager.OnPageChangeListener -import android.support.v7.widget.Toolbar +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.core.view.OnApplyWindowInsetsListener +import androidx.viewpager.widget.ViewPager.OnPageChangeListener +import androidx.appcompat.widget.Toolbar import android.view.KeyEvent import android.view.LayoutInflater import android.view.View @@ -47,7 +47,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) val activity = activity - pagerAdapter = SupportTabsAdapter(activity, childFragmentManager, null) + pagerAdapter = SupportTabsAdapter(activity!!, childFragmentManager, null) viewPager.adapter = pagerAdapter viewPager.offscreenPageLimit = 2 viewPager.addOnPageChangeListener(this) @@ -149,7 +149,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte if (height != 0) { insets.top = height } else { - insets.top = ThemeUtils.getActionBarHeight(context) + insets.top = ThemeUtils.getActionBarHeight(context!!) } return true } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt index 7c382f604..ad7a2550e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.widget.CheckBox import kotlinx.android.synthetic.main.dialog_block_mute_filter_user_confirm.* import org.mariotaku.ktextension.spannable @@ -34,7 +34,7 @@ import org.mariotaku.twidere.model.ParcelableUser abstract class AbsUserMuteBlockDialogFragment : BaseDialogFragment(), DialogInterface.OnClickListener { - private val user: ParcelableUser by lazy { arguments.getParcelable(EXTRA_USER)!! } + private val user: ParcelableUser by lazy { arguments?.getParcelable(EXTRA_USER)!! } override fun onClick(dialog: DialogInterface, which: Int) { when (which) { @@ -48,7 +48,7 @@ abstract class AbsUserMuteBlockDialogFragment : BaseDialogFragment(), DialogInte } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(getTitle(user)) builder.setView(R.layout.dialog_block_mute_filter_user_confirm) builder.setPositiveButton(getPositiveButtonTitle(user), this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountStreamingSettingsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountStreamingSettingsFragment.kt index 4025209e9..b16408293 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountStreamingSettingsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountStreamingSettingsFragment.kt @@ -34,6 +34,6 @@ class AccountStreamingSettingsFragment : BaseAccountPreferenceFragment() { override fun onSwitchPreferenceChanged(isChecked: Boolean) { super.onSwitchPreferenceChanged(isChecked) - StreamingService.startOrStopService(context) + context?.let { StreamingService.startOrStopService(it) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt index ac9aad24a..2a127bc3a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt @@ -38,15 +38,15 @@ import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Drawable import android.net.Uri import android.os.Bundle -import android.support.design.widget.NavigationView -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.ContextCompat -import android.support.v4.content.FixedAsyncTaskLoader -import android.support.v4.content.Loader -import android.support.v4.view.MenuItemCompat -import android.support.v4.view.ViewPager -import android.support.v7.view.SupportMenuInflater -import android.support.v7.widget.ActionMenuView.OnMenuItemClickListener +import com.google.android.material.navigation.NavigationView +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.core.content.ContextCompat +import androidx.loader.content.FixedAsyncTaskLoader +import androidx.loader.content.Loader +import androidx.core.view.MenuItemCompat +import androidx.viewpager.widget.ViewPager +import androidx.appcompat.view.SupportMenuInflater +import androidx.appcompat.widget.ActionMenuView.OnMenuItemClickListener import android.view.* import android.view.View.OnClickListener import android.view.animation.DecelerateInterpolator @@ -168,7 +168,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, R.id.compose -> { val account = accountsAdapter.selectedAccount ?: return@OnMenuItemClickListener true val composeIntent = Intent(INTENT_ACTION_COMPOSE) - composeIntent.setClass(activity, ComposeActivity::class.java) + activity?.let { composeIntent.setClass(it, ComposeActivity::class.java) } composeIntent.putExtra(EXTRA_ACCOUNT_KEY, account.key) startActivity(composeIntent) return@OnMenuItemClickListener true @@ -213,7 +213,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, if (data.getBooleanExtra(EXTRA_SHOULD_RESTART, false)) { Utils.restartActivity(activity) } else if (data.getBooleanExtra(EXTRA_SHOULD_RECREATE, false)) { - activity.recreate() + activity?.recreate() } return } @@ -242,19 +242,23 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, val account = accountsAdapter.selectedAccount ?: return val activity = activity if (account.user != null) { - IntentUtils.openUserProfile(activity, account.user!!, - preferences[newDocumentApiKey], null) + activity?.let { + IntentUtils.openUserProfile(it, account.user!!, + preferences[newDocumentApiKey], null) + } } else { - IntentUtils.openUserProfile(activity, account.key, account.key, - account.user.screen_name, null, preferences[newDocumentApiKey], - null) + activity?.let { + IntentUtils.openUserProfile(it, account.key, account.key, + account.user.screen_name, null, preferences[newDocumentApiKey], + null) + } } } } } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return AccountsInfoLoader(activity, accountsAdapter.accounts == null) + return AccountsInfoLoader(activity!!, accountsAdapter.accounts == null) } @@ -273,7 +277,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, } override fun onApplySystemWindowInsets(insets: Rect) { - view?.findViewById(android.support.design.R.id.design_navigation_view)?. + view?.findViewById(com.google.android.material.R.id.design_navigation_view)?. setPadding(0, 0, 0, insets.bottom) systemWindowsInsets.set(insets) updateSystemWindowsInsets() @@ -363,10 +367,12 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, menu.setItemAvailability(R.id.likes, !useStarsForLikes) menu.setItemAvailability(R.id.premium_features, extraFeaturesService.isSupported()) if (preferences[extraFeaturesNoticeVersionKey] < EXTRA_FEATURES_NOTICE_VERSION) { - val icon = ContextCompat.getDrawable(context, R.drawable.ic_action_infinity) - val color = ContextCompat.getColor(context, R.color.material_red) + val icon = context?.let { ContextCompat.getDrawable(it, R.drawable.ic_action_infinity) } + val color = context?.let { ContextCompat.getColor(it, R.color.material_red) } val size = resources.getDimensionPixelSize(R.dimen.element_spacing_msmall) - menu.setItemIcon(R.id.premium_features, BadgeDrawable(icon, color, size)) + if (icon != null && color != null) { + menu.setItemIcon(R.id.premium_features, BadgeDrawable(icon, color, size)) + } } else { menu.setItemIcon(R.id.premium_features, R.drawable.ic_action_infinity) } @@ -404,7 +410,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, private fun hasAccountInTab(tab: SupportTabSpec, accountKey: UserKey, isActivated: Boolean): Boolean { if (tab.args == null) return false - val accountKeys = Utils.getAccountKeys(context, tab.args) ?: return isActivated + val accountKeys = context?.let { Utils.getAccountKeys(it, tab.args) } ?: return isActivated return accountKey in accountKeys } @@ -472,7 +478,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, clickedColors = clickedImageView.borderColors val oldSelectedAccount = accountsAdapter.selectedAccount ?: return val profileImageStyle = preferences[profileImageStyleKey] - requestManager.loadProfileImage(context, oldSelectedAccount, + requestManager.loadProfileImage(context!!, oldSelectedAccount, profileImageStyle, clickedImageView.cornerRadius, clickedImageView.cornerRadiusRatio) .into(clickedImageView).onLoadStarted(profileDrawable) //TODO complete border color @@ -531,10 +537,10 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, } else if (user.account_color != 0) { ColorDrawable(user.account_color) } else { - ColorDrawable(Chameleon.getOverrideTheme(activity, activity).colorPrimary) + ColorDrawable(Chameleon.getOverrideTheme(activity!!, activity).colorPrimary) } - requestManager.loadProfileBanner(context, account.user, width).fallback(fallbackBanner) + requestManager.loadProfileBanner(context!!, account.user, width).fallback(fallbackBanner) .into(bannerView) } @@ -543,7 +549,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, val account = accountsAdapter.selectedAccount ?: return accountProfileNameView.spannable = account.user.name accountProfileScreenNameView.spannable = "@${account.user.screen_name}" - requestManager.loadProfileImage(context, account, preferences[profileImageStyleKey], + requestManager.loadProfileImage(context!!, account, preferences[profileImageStyleKey], accountProfileImageView.cornerRadius, accountProfileImageView.cornerRadiusRatio, ProfileImageSize.REASONABLY_SMALL).placeholder(profileImageSnapshot).into(accountProfileImageView) //TODO complete border color @@ -556,60 +562,61 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, override fun onNavigationItemSelected(item: MenuItem): Boolean { val account = accountsAdapter.selectedAccount ?: return false + val currentActivity = activity ?: return false when (item.itemId) { R.id.search -> { - val intent = Intent(activity, QuickSearchBarActivity::class.java) + val intent = Intent(currentActivity, QuickSearchBarActivity::class.java) intent.putExtra(EXTRA_ACCOUNT_KEY, account.key) startActivity(intent) closeAccountsDrawer() } R.id.compose -> { val composeIntent = Intent(INTENT_ACTION_COMPOSE) - composeIntent.setClass(activity, ComposeActivity::class.java) + composeIntent.setClass(currentActivity, ComposeActivity::class.java) composeIntent.putExtra(EXTRA_ACCOUNT_KEY, account.key) startActivity(composeIntent) } R.id.likes, R.id.favorites -> { - IntentUtils.openUserFavorites(activity, account.key, account.key, + IntentUtils.openUserFavorites(currentActivity, account.key, account.key, account.user.screen_name) } R.id.lists -> { - IntentUtils.openUserLists(activity, account.key, + IntentUtils.openUserLists(currentActivity, account.key, account.key, account.user.screen_name) } R.id.groups -> { - IntentUtils.openUserGroups(activity, account.key, + IntentUtils.openUserGroups(currentActivity, account.key, account.key, account.user.screen_name) } R.id.public_timeline -> { - IntentUtils.openPublicTimeline(activity, account.key) + IntentUtils.openPublicTimeline(currentActivity, account.key) } R.id.network_public_timeline -> { - IntentUtils.openNetworkPublicTimeline(activity, account.key) + IntentUtils.openNetworkPublicTimeline(currentActivity, account.key) } R.id.messages -> { - IntentUtils.openDirectMessages(activity, account.key) + IntentUtils.openDirectMessages(currentActivity, account.key) } R.id.interactions -> { - IntentUtils.openInteractions(activity, account.key) + IntentUtils.openInteractions(currentActivity, account.key) } R.id.edit -> { - IntentUtils.openProfileEditor(activity, account.key) + IntentUtils.openProfileEditor(currentActivity, account.key) } R.id.accounts -> { - IntentUtils.openAccountsManager(activity) + IntentUtils.openAccountsManager(currentActivity) closeAccountsDrawer() } R.id.drafts -> { - IntentUtils.openDrafts(activity) + IntentUtils.openDrafts(currentActivity) closeAccountsDrawer() } R.id.filters -> { - IntentUtils.openFilters(activity) + IntentUtils.openFilters(currentActivity) closeAccountsDrawer() } R.id.premium_features -> { - val intent = Intent(activity, PremiumDashboardActivity::class.java) + val intent = Intent(currentActivity, PremiumDashboardActivity::class.java) startActivity(intent) preferences[extraFeaturesNoticeVersionKey] = EXTRA_FEATURES_NOTICE_VERSION closeAccountsDrawer() @@ -625,8 +632,10 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, } fun setStatusBarHeight(height: Int) { - val top = Utils.getInsetsTopWithoutActionBarHeight(activity, height) - profileContainer.setPadding(0, top, 0, 0) + val top = activity?.let { Utils.getInsetsTopWithoutActionBarHeight(it, height) } + if (top != null) { + profileContainer.setPadding(0, top, 0, 0) + } } fun shouldDisableDrawerSlide(e: MotionEvent): Boolean { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt index 1d2d518b5..ab35857b5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt @@ -10,9 +10,9 @@ import android.content.DialogInterface import android.content.Intent import android.graphics.Color import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog import android.view.* import android.view.ContextMenu.ContextMenuInfo import android.widget.AdapterView @@ -60,7 +60,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • @@ -100,9 +100,9 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • , view: View, position: Int, id: Long) { val account = adapter.getItem(position) - IntentUtils.openUserProfile(context, account.user, preferences[newDocumentApiKey], + context?.let { + IntentUtils.openUserProfile(it, account.user, preferences[newDocumentApiKey], null) + } } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { - return AccountDetailsLoader(context) + return AccountDetailsLoader(context!!) } override fun onLoaderReset(loader: Loader>) { @@ -171,7 +173,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • { val accountKey = account.getAccountKey(am) - resolver.deleteAccountData(accountKey) - AccountPreferences.getSharedPreferencesForAccount(context, accountKey).edit() - .clear().apply() + resolver?.deleteAccountData(accountKey) + context?.let { + AccountPreferences.getSharedPreferencesForAccount(it, accountKey).edit() + .clear().apply() + } am.removeAccountSupport(account) } } @@ -223,7 +227,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • ? = null override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) filterItems = filterItemsInfo val entries = arrayOfNulls(filterItems!!.size) val nameFirst = preferences[nameFirstKey] @@ -107,16 +107,17 @@ class AddStatusFilterDialogFragment : BaseDialogFragment() { sourceValues.add(values) } } - val resolver = context.contentResolver - ContentResolverUtils.bulkDelete(resolver, Filters.Users.CONTENT_URI, - Filters.Users.USER_KEY, false, userKeys, null, null) - ContentResolverUtils.bulkDelete(resolver, Filters.Keywords.CONTENT_URI, - Filters.Keywords.VALUE, false, keywords, null, null) - ContentResolverUtils.bulkDelete(resolver, Filters.Sources.CONTENT_URI, - Filters.Sources.VALUE, false, sources, null, null) - ContentResolverUtils.bulkInsert(resolver, Filters.Users.CONTENT_URI, userValues) - ContentResolverUtils.bulkInsert(resolver, Filters.Keywords.CONTENT_URI, keywordValues) - ContentResolverUtils.bulkInsert(resolver, Filters.Sources.CONTENT_URI, sourceValues) + context?.contentResolver?.let { resolver -> + ContentResolverUtils.bulkDelete(resolver, Filters.Users.CONTENT_URI, + Filters.Users.USER_KEY, false, userKeys, null, null) + ContentResolverUtils.bulkDelete(resolver, Filters.Keywords.CONTENT_URI, + Filters.Keywords.VALUE, false, keywords, null, null) + ContentResolverUtils.bulkDelete(resolver, Filters.Sources.CONTENT_URI, + Filters.Sources.VALUE, false, sources, null, null) + ContentResolverUtils.bulkInsert(resolver, Filters.Users.CONTENT_URI, userValues) + ContentResolverUtils.bulkInsert(resolver, Filters.Keywords.CONTENT_URI, keywordValues) + ContentResolverUtils.bulkInsert(resolver, Filters.Sources.CONTENT_URI, sourceValues) + } } builder.setNegativeButton(android.R.string.cancel, null) val dialog = builder.create() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddUserFilterDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddUserFilterDialogFragment.kt index 0e7793495..6248a3a00 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddUserFilterDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddUserFilterDialogFragment.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.fragment import android.os.Bundle -import android.support.v4.app.FragmentManager +import androidx.fragment.app.FragmentManager import android.widget.Toast import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_USER @@ -39,7 +39,7 @@ class AddUserFilterDialogFragment : AbsUserMuteBlockDialogFragment() { } override fun performUserAction(user: ParcelableUser, filterEverywhere: Boolean) { - DataStoreUtils.addToFilter(context, listOf(user), filterEverywhere) + context?.let { DataStoreUtils.addToFilter(it, listOf(user), filterEverywhere) } val accountKey = user.account_key ?: return bus.post(FriendshipTaskEvent(FriendshipTaskEvent.Action.FILTER, accountKey, user.key).apply { isFinished = true diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseAccountPreferenceFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseAccountPreferenceFragment.kt index 1b256ae0b..90e1a403b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseAccountPreferenceFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseAccountPreferenceFragment.kt @@ -58,15 +58,15 @@ abstract class BaseAccountPreferenceFragment : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { val pm = preferenceManager - val account: AccountDetails = arguments.getParcelable(EXTRA_ACCOUNT) ?: return + val account: AccountDetails = arguments?.getParcelable(EXTRA_ACCOUNT) ?: return val preferenceName = "$ACCOUNT_PREFERENCES_NAME_PREFIX${account.key}" pm.sharedPreferencesName = preferenceName addPreferencesFromResource(preferencesResource) val prefs = pm.sharedPreferences prefs.registerOnSharedPreferenceChangeListener(preferenceChangeListener) val activity = activity - val intent = activity.intent - if (intent.hasExtra(EXTRA_SHOW_FRAGMENT)) { + val intent = activity?.intent + if (intent != null && intent.hasExtra(EXTRA_SHOW_FRAGMENT)) { val nameFirst = prefs.getBoolean(KEY_NAME_FIRST, true) val name = userColorNameManager.getDisplayName(account.key, account.user.name, account.user.screen_name, nameFirst) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt index 15fe00fb2..c7e03ec69 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.content.SharedPreferences import android.os.Bundle -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import com.bumptech.glide.Glide import com.bumptech.glide.RequestManager import com.squareup.otto.Bus @@ -63,7 +63,7 @@ open class BaseDialogFragment : DialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestManager = Glide.with(this) + requestManager = Glide.with(context)// TODO: Upgrade Glide usage } override fun onStart() { @@ -80,12 +80,12 @@ open class BaseDialogFragment : DialogFragment() { requestManager.onDestroy() extraFeaturesService.release() super.onDestroy() - DebugModeUtils.watchReferenceLeak(this) +// DebugModeUtils.watchReferenceLeak(this) } - override fun onAttach(context: Context?) { + override fun onAttach(context: Context) { super.onAttach(context) - GeneralComponent.get(context!!).inject(this) + GeneralComponent.get(context).inject(this) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt index 0ba270bc0..116708a4b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.content.SharedPreferences import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.text.BidiFormatter +import androidx.fragment.app.Fragment +import androidx.core.text.BidiFormatter import com.bumptech.glide.Glide import com.bumptech.glide.RequestManager import com.squareup.otto.Bus @@ -90,19 +90,19 @@ open class BaseFragment : Fragment(), IBaseFragment { private set protected val statusScheduleProvider: StatusScheduleProvider? - get() = statusScheduleProviderFactory.newInstance(context) + get() = context?.let { statusScheduleProviderFactory.newInstance(it) } protected val timelineSyncManager: TimelineSyncManager? get() = timelineSyncManagerFactory.get() protected val gifShareProvider: GifShareProvider? - get() = gifShareProviderFactory.newInstance(context) + get() = context?.let { gifShareProviderFactory.newInstance(it) } private val actionHelper = IBaseFragment.ActionHelper() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestManager = Glide.with(this) + requestManager = Glide.with(context)// TODO: Upgrade Glide usage } override fun onStart() { @@ -129,7 +129,7 @@ open class BaseFragment : Fragment(), IBaseFragment { requestManager.onDestroy() extraFeaturesService.release() super.onDestroy() - DebugModeUtils.watchReferenceLeak(this) +// DebugModeUtils.watchReferenceLeak(this) } override fun onAttach(context: Context) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BasePreferenceFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BasePreferenceFragment.kt index b1c6b7699..2c6a36bdd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BasePreferenceFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BasePreferenceFragment.kt @@ -27,8 +27,8 @@ import android.media.RingtoneManager import android.net.Uri import android.os.Bundle import android.provider.Settings -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceFragmentCompat +import androidx.preference.Preference +import androidx.preference.PreferenceFragmentCompat import com.squareup.otto.Bus import nl.komponents.kovenant.Promise import org.mariotaku.kpreferences.KPreferences diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt index a96b73e55..ec93e57b0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt @@ -48,7 +48,7 @@ open class BaseWebViewFragment : BaseFragment() { protected fun createWebViewClient(): WebViewClient { - return DefaultWebViewClient(activity) + return DefaultWebViewClient(activity!!) } /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt index 88e7c85a2..7783736d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt @@ -23,8 +23,8 @@ import android.app.Dialog import android.content.DialogInterface import android.graphics.Color import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.app.AlertDialog +import androidx.core.content.ContextCompat +import androidx.appcompat.app.AlertDialog import me.uucky.colorpicker.ColorPickerDialog import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.R @@ -36,7 +36,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL private var controller: ColorPickerDialog.Controller? = null - override fun onCancel(dialog: DialogInterface?) { + override fun onCancel(dialog: DialogInterface) { super.onCancel(dialog) val a = activity if (a is Callback) { @@ -64,14 +64,14 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL if (savedInstanceState != null) { color = savedInstanceState.getInt(EXTRA_COLOR, Color.WHITE) } else { - color = args.getInt(EXTRA_COLOR, Color.WHITE) + color = args!!.getInt(EXTRA_COLOR, Color.WHITE) } val activity = activity - val builder = AlertDialog.Builder(activity) + val builder = AlertDialog.Builder(activity!!) builder.setView(me.uucky.colorpicker.R.layout.cp__dialog_color_picker) builder.setPositiveButton(android.R.string.ok, this) - if (args.getBoolean(EXTRA_CLEAR_BUTTON, false)) { + if (args!!.getBoolean(EXTRA_CLEAR_BUTTON, false)) { builder.setNeutralButton(R.string.action_clear, this) } builder.setNegativeButton(android.R.string.cancel, this) @@ -82,7 +82,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL val showAlphaSlider = args.getBoolean(EXTRA_ALPHA_SLIDER, true) for (presetColor in PRESET_COLORS) { - controller!!.addColor(ContextCompat.getColor(context, presetColor)) + controller!!.addColor(ContextCompat.getColor(context!!, presetColor)) } controller!!.setAlphaEnabled(showAlphaSlider) controller!!.setInitialColor(color) @@ -90,7 +90,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL return dialog } - override fun onDismiss(dialog: DialogInterface?) { + override fun onDismiss(dialog: DialogInterface) { super.onDismiss(dialog) val a = activity if (a is Callback) { @@ -98,7 +98,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL } } - override fun onSaveInstanceState(outState: Bundle?) { + override fun onSaveInstanceState(outState: Bundle) { if (controller != null) { outState!!.putInt(EXTRA_COLOR, controller!!.color) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt index d5506c4d5..e718e0beb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.fragment import android.os.Bundle -import android.support.v4.app.FragmentManager +import androidx.fragment.app.FragmentManager import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_USER import org.mariotaku.twidere.constant.nameFirstKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt index 510843f9b..ace3fe233 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.text.TextUtils import android.widget.CheckBox import android.widget.EditText @@ -38,12 +38,12 @@ import org.mariotaku.twidere.util.ParseUtils class CreateUserListDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_user_list_detail_editor) builder.setTitle(R.string.new_user_list) builder.positive(android.R.string.ok) { dialog -> - val accountKey: UserKey = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! + val accountKey: UserKey = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! val editName = dialog.findViewById(R.id.editName)!! val editDescription = dialog.findViewById(R.id.editDescription)!! val editPublic = dialog.findViewById(R.id.isPublic)!! diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt index 426c49177..49b370c1b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.fragment import android.os.Bundle -import android.support.v4.app.FragmentManager +import androidx.fragment.app.FragmentManager import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_USER import org.mariotaku.twidere.constant.nameFirstKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt index 323022cf2..cff0549e7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt @@ -27,7 +27,7 @@ import android.database.Cursor import android.net.Uri import android.os.Bundle import android.os.Handler -import android.support.v4.content.Loader +import androidx.loader.content.Loader import android.widget.Toast import com.squareup.otto.Subscribe import org.mariotaku.ktextension.* @@ -59,7 +59,7 @@ import org.mariotaku.twidere.util.Utils abstract class CursorActivitiesFragment : AbsActivitiesFragment() { override val accountKeys: Array - get() = Utils.getAccountKeys(context, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context) + get() = Utils.getAccountKeys(context!!, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context!!) abstract val contentUri: Uri @@ -89,7 +89,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { reloadActivities() } } - context.contentResolver.registerContentObserver(Filters.CONTENT_URI, true, contentObserver!!) + context?.contentResolver?.registerContentObserver(Filters.CONTENT_URI, true, contentObserver!!) } AccountManager.get(context).addOnAccountsUpdatedListenerSafe(accountListener, updateImmediately = false) updateRefreshState() @@ -98,7 +98,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { override fun onStop() { if (contentObserver != null) { - context.contentResolver.unregisterContentObserver(contentObserver!!) + context?.contentResolver?.unregisterContentObserver(contentObserver!!) contentObserver = null } AccountManager.get(context).removeOnAccountsUpdatedListenerSafe(accountListener) @@ -153,6 +153,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { if (ILoadMoreSupportAdapter.START in position || refreshing) return super.onLoadMoreContents(position) if (position == 0L) return + val currentContext = context ?: return val contentUri = this.contentUri getActivities(object : RefreshTaskParam { override val accountKeys by lazy { @@ -161,9 +162,9 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { override val pagination by lazy { val keys = accountKeys.toNulls() - val maxIds = DataStoreUtils.getRefreshOldestActivityMaxPositions(context, contentUri, + val maxIds = DataStoreUtils.getRefreshOldestActivityMaxPositions(currentContext, contentUri, keys) - val maxSortIds = DataStoreUtils.getRefreshOldestActivityMaxSortPositions(context, + val maxSortIds = DataStoreUtils.getRefreshOldestActivityMaxSortPositions(currentContext, contentUri, keys) return@lazy Array(keys.size) { idx -> SinceMaxPagination.maxId(maxIds[idx], maxSortIds[idx]) @@ -171,7 +172,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { } override val shouldAbort: Boolean - get() = context == null + get() = currentContext == null }) } @@ -211,7 +212,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { override fun getFullActivity(position: Int): ParcelableActivity? { val _id = adapter.getRowId(position) val where = Expression.equals(Activities._ID, _id).sql - return context.contentResolver.queryOne(contentUri, Activities.COLUMNS, where, null, null, + return context?.contentResolver?.queryOne(contentUri, Activities.COLUMNS, where, null, null, ParcelableActivity::class.java) } @@ -262,10 +263,11 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { private fun showContentOrError() { val accountKeys = accountKeys + val currentContext = context ?: return if (adapter.itemCount > 0) { showContent() } else if (accountKeys.isNotEmpty()) { - val errorInfo = ErrorInfoStore.getErrorInfo(context, + val errorInfo = ErrorInfoStore.getErrorInfo(currentContext, errorInfoStore[errorInfoKey, accountKeys[0]]) if (errorInfo != null) { showEmpty(errorInfo.icon, errorInfo.message) @@ -295,6 +297,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { @Subscribe fun notifyGetStatusesTaskChanged(event: GetActivitiesTaskEvent) { if (event.uri != contentUri) return + val currentContext = context ?: return refreshing = event.running if (!event.running) { setLoadMoreIndicatorPosition(ILoadMoreSupportAdapter.NONE) @@ -303,7 +306,7 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { val exception = event.exception if (exception is GetStatusesTask.GetTimelineException && userVisibleHint) { - Toast.makeText(context, exception.getToastMessage(context), Toast.LENGTH_SHORT).show() + Toast.makeText(currentContext, exception.getToastMessage(currentContext), Toast.LENGTH_SHORT).show() } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt index 0a7b33872..52311562e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt @@ -26,7 +26,7 @@ import android.database.ContentObserver import android.net.Uri import android.os.Bundle import android.os.Handler -import android.support.v4.content.Loader +import androidx.loader.content.Loader import android.widget.Toast import com.bumptech.glide.RequestManager import com.squareup.otto.Subscribe @@ -70,7 +70,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { get() = false override val accountKeys: Array - get() = Utils.getAccountKeys(context, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context) + get() = Utils.getAccountKeys(context!!, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context!!) abstract val errorInfoKey: String abstract val isFilterEnabled: Boolean @@ -92,7 +92,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { reloadStatuses() } } - context.contentResolver.registerContentObserver(Filters.CONTENT_URI, true, contentObserver!!) + context?.contentResolver?.registerContentObserver(Filters.CONTENT_URI, true, contentObserver!!) } AccountManager.get(context).addOnAccountsUpdatedListenerSafe(accountListener, updateImmediately = false) updateRefreshState() @@ -101,7 +101,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { override fun onStop() { if (contentObserver != null) { - context.contentResolver.unregisterContentObserver(contentObserver!!) + context?.contentResolver?.unregisterContentObserver(contentObserver!!) contentObserver = null } AccountManager.get(context).removeOnAccountsUpdatedListenerSafe(accountListener) @@ -143,7 +143,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { } override fun hasMoreData(loader: Loader?>, - data: List?): Boolean { + data: List?): Boolean { return data.isNotNullOrEmpty() } @@ -158,6 +158,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { override fun onLoadMoreContents(@IndicatorPosition position: Long) { // Only supports load from end, skip START flag if (ILoadMoreSupportAdapter.START in position) return + val currentContext = context ?: return super.onLoadMoreContents(position) if (position == 0L) return getStatuses(object : RefreshTaskParam { @@ -167,8 +168,8 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { override val pagination by lazy { val keys = accountKeys.toNulls() - val maxIds = DataStoreUtils.getOldestStatusIds(context, contentUri, keys) - val maxSortIds = DataStoreUtils.getOldestStatusSortIds(context, contentUri, keys) + val maxIds = DataStoreUtils.getOldestStatusIds(currentContext, contentUri, keys) + val maxSortIds = DataStoreUtils.getOldestStatusSortIds(currentContext, contentUri, keys) return@lazy Array(keys.size) { idx -> SinceMaxPagination.maxId(maxIds[idx], maxSortIds[idx]) } @@ -186,8 +187,8 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { override val pagination by lazy { val keys = accountKeys.toNulls() - val sinceIds = DataStoreUtils.getNewestStatusIds(context, contentUri, keys) - val sinceSortIds = DataStoreUtils.getNewestStatusSortIds(context, contentUri, keys) + val sinceIds = DataStoreUtils.getNewestStatusIds(context!!, contentUri, keys) + val sinceSortIds = DataStoreUtils.getNewestStatusSortIds(context!!, contentUri, keys) return@lazy Array(keys.size) { idx -> SinceMaxPagination.sinceId(sinceIds[idx], sinceSortIds[idx]) } @@ -212,7 +213,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { override fun getFullStatus(position: Int): ParcelableStatus? { val _id = adapter.getRowId(position) val where = Expression.equals(Statuses._ID, _id).sql - return context.contentResolver.queryOne(contentUri, Statuses.COLUMNS, where, null, null, + return context?.contentResolver?.queryOne(contentUri, Statuses.COLUMNS, where, null, null, ParcelableStatus::class.java) } @@ -240,10 +241,11 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { private fun showContentOrError() { val accountKeys = this.accountKeys + val currentContext = context ?: return if (adapter.itemCount > 0) { showContent() } else if (accountKeys.isNotEmpty()) { - val errorInfo = ErrorInfoStore.getErrorInfo(context, + val errorInfo = ErrorInfoStore.getErrorInfo(currentContext, errorInfoStore[errorInfoKey, accountKeys[0]]) if (errorInfo != null) { showEmpty(errorInfo.icon, errorInfo.message) @@ -268,6 +270,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { @Subscribe fun notifyGetStatusesTaskChanged(event: GetStatusesTaskEvent) { if (event.uri != contentUri) return + val currentContext = context ?: return refreshing = event.running if (!event.running) { setLoadMoreIndicatorPosition(ILoadMoreSupportAdapter.NONE) @@ -276,7 +279,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { val exception = event.exception if (exception is GetStatusesTask.GetTimelineException && userVisibleHint) { - Toast.makeText(context, exception.getToastMessage(context), Toast.LENGTH_SHORT).show() + Toast.makeText(context, exception.getToastMessage(currentContext), Toast.LENGTH_SHORT).show() } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt index 343f35c57..1631299c9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt @@ -29,11 +29,11 @@ import android.database.Cursor import android.graphics.Paint import android.graphics.PorterDuff.Mode import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.CursorLoader -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog +import androidx.fragment.app.Fragment +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.CursorLoader +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog import android.util.SparseArray import android.view.* import android.widget.* @@ -81,8 +81,8 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice R.id.delete -> { val itemIds = listView.checkedItemIds val where = Expression.`in`(Column(Tabs._ID), RawItemArray(itemIds)) - context.contentResolver.delete(Tabs.CONTENT_URI, where.sql, null) - SettingsActivity.setShouldRestart(activity) + context?.contentResolver?.delete(Tabs.CONTENT_URI, where.sql, null) + activity?.let { SettingsActivity.setShouldRestart(it) } } } mode.finish() @@ -92,7 +92,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) - adapter = CustomTabsAdapter(context) + adapter = CustomTabsAdapter(context!!) listView.choiceMode = ListView.CHOICE_MODE_MULTIPLE_MODAL listView.setMultiChoiceModeListener(this) listView.onItemClickListener = OnItemClickListener { _, _, position, _ -> @@ -101,7 +101,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice df.arguments = Bundle { this[EXTRA_OBJECT] = tab } - df.show(fragmentManager, TabEditorDialogFragment.TAG_EDIT_TAB) + fragmentManager?.let { df.show(it, TabEditorDialogFragment.TAG_EDIT_TAB) } } listView.adapter = adapter listView.emptyView = emptyView @@ -129,7 +129,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return CursorLoader(activity, Tabs.CONTENT_URI, Tabs.COLUMNS, null, null, Tabs.DEFAULT_SORT_ORDER) + return CursorLoader(activity!!, Tabs.CONTENT_URI, Tabs.COLUMNS, null, null, Tabs.DEFAULT_SORT_ORDER) } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { @@ -137,7 +137,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice val context = this.context val accounts = AccountUtils.getAllAccountDetails(AccountManager.get(context), false) val itemAdd = menu.findItem(R.id.add_submenu) - val theme = Chameleon.getOverrideTheme(context, context) + val theme = Chameleon.getOverrideTheme(context!!, context) if (itemAdd != null && itemAdd.hasSubMenu()) { val subMenu = itemAdd.subMenu subMenu.clear() @@ -212,10 +212,10 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice val values = ContentValues() values.put(Tabs.POSITION, i) val where = Expression.equals(Tabs._ID, id).sql - context.contentResolver.update(Tabs.CONTENT_URI, values, where, null) + context?.contentResolver?.update(Tabs.CONTENT_URI, values, where, null) } } - SettingsActivity.setShouldRestart(activity) + activity?.let { SettingsActivity.setShouldRestart(it) } } private fun updateTitle(mode: ActionMode?) { @@ -229,6 +229,8 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice private val activityResultMap: SparseArray = SparseArray() override fun onShow(dialogInterface: DialogInterface) { + val currentContext = context ?: return + val currentArguments = arguments ?: return val dialog = dialogInterface as AlertDialog dialog.applyTheme() @CustomTabType @@ -237,15 +239,15 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice val conf: TabConfiguration when (tag) { TAG_ADD_TAB -> { - tabType = arguments.getString(EXTRA_TAB_TYPE)!! + tabType = currentArguments.getString(EXTRA_TAB_TYPE)!! tab = Tab() conf = TabConfiguration.ofType(tabType)!! tab.type = tabType tab.icon = conf.icon.persistentKey - tab.position = arguments.getInt(EXTRA_TAB_POSITION) + tab.position = currentArguments.getInt(EXTRA_TAB_POSITION) } TAG_EDIT_TAB -> { - tab = arguments.getParcelable(EXTRA_OBJECT)!! + tab = currentArguments.getParcelable(EXTRA_OBJECT)!! tabType = tab.type conf = TabConfiguration.ofType(tabType) ?: run { dismiss() @@ -265,14 +267,14 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice val positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE) - val iconsAdapter = TabIconsAdapter(context) - val accountsAdapter = AccountsSpinnerAdapter(context, requestManager = requestManager) + val iconsAdapter = TabIconsAdapter(currentContext) + val accountsAdapter = AccountsSpinnerAdapter(currentContext, requestManager = requestManager) iconSpinner.adapter = iconsAdapter accountSpinner.adapter = accountsAdapter iconsAdapter.setData(DrawableHolder.builtins()) - tabName.hint = conf.name.createString(context) + tabName.hint = conf.name.createString(currentContext) tabName.setText(tab.name) iconSpinner.setSelection(iconsAdapter.findPositionByKey(tab.icon)) @@ -287,8 +289,8 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice if (!accountRequired) { accountsAdapter.add(AccountDetails.dummy()) } - val officialKeyOnly = arguments.getBoolean(EXTRA_OFFICIAL_KEY_ONLY, false) - accountsAdapter.addAll(AccountUtils.getAllAccountDetails(AccountManager.get(context), true).filter { + val officialKeyOnly = currentArguments.getBoolean(EXTRA_OFFICIAL_KEY_ONLY, false) + accountsAdapter.addAll(AccountUtils.getAllAccountDetails(AccountManager.get(currentContext), true).filter { if (officialKeyOnly) { return@filter false } @@ -303,26 +305,26 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice accountContainer.visibility = View.GONE } - val extraConfigurations = conf.getExtraConfigurations(context).orEmpty() + val extraConfigurations = conf.getExtraConfigurations(currentContext).orEmpty() fun inflateHeader(title: String): View { - val headerView = LayoutInflater.from(context).inflate(R.layout.list_item_section_header, + val headerView = LayoutInflater.from(currentContext).inflate(R.layout.list_item_section_header, extraConfigContainer, false) headerView.sectionHeader.text = title return headerView } extraConfigurations.forEachIndexed { idx, extraConf -> - extraConf.onCreate(context) + extraConf.onCreate(currentContext) extraConf.position = idx + 1 // Hide immutable settings in edit mode if (editMode && !extraConf.isMutable) return@forEachIndexed extraConf.headerTitle?.let { // Inflate header with headerTitle - extraConfigContainer.addView(inflateHeader(it.createString(context))) + extraConfigContainer.addView(inflateHeader(it.createString(currentContext))) } - val view = extraConf.onCreateView(context, extraConfigContainer) - extraConf.onViewCreated(context, view, this) + val view = extraConf.onCreateView(currentContext, extraConfigContainer) + extraConf.onViewCreated(currentContext, view, this) conf.readExtraConfigurationFrom(tab, extraConf) extraConfigContainer.addView(view) } @@ -374,24 +376,24 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice when (tag) { TAG_EDIT_TAB -> { val where = Expression.equals(Tabs._ID, tab.id).sql - context.contentResolver.update(Tabs.CONTENT_URI, valuesCreator.create(tab), + currentContext.contentResolver.update(Tabs.CONTENT_URI, valuesCreator.create(tab), where, null) } TAG_ADD_TAB -> { - context.contentResolver.insert(Tabs.CONTENT_URI, valuesCreator.create(tab)) + currentContext.contentResolver.insert(Tabs.CONTENT_URI, valuesCreator.create(tab)) } } - SettingsActivity.setShouldRestart(activity) + activity?.let { it1 -> SettingsActivity.setShouldRestart(it1) } dismiss() } } override fun getAccount(): AccountDetails? { - return dialog.findViewById(R.id.accountSpinner).selectedItem as? AccountDetails + return dialog?.findViewById(R.id.accountSpinner)?.selectedItem as? AccountDetails } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_custom_tab_editor) builder.setPositiveButton(R.string.action_save, null) builder.setNegativeButton(android.R.string.cancel, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt index 63d53c321..279a8e056 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import kotlinx.android.synthetic.main.dialog_date_time_picker.* import org.mariotaku.twidere.R import org.mariotaku.twidere.extension.applyTheme @@ -44,7 +44,7 @@ class DateTimePickerDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_date_time_picker) builder.setNegativeButton(android.R.string.cancel, null) builder.setPositiveButton(android.R.string.ok, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt index b9769188b..afc2b1666 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.getNullableTypedArray import org.mariotaku.twidere.R @@ -50,7 +50,7 @@ class DeleteUserListMembersDialogFragment : BaseDialogFragment(), DialogInterfac } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val users = users val userList = userList if (users == null || userList == null) throw NullPointerException() @@ -76,14 +76,14 @@ class DeleteUserListMembersDialogFragment : BaseDialogFragment(), DialogInterfac private val userList: ParcelableUserList? get() { - val args = arguments + val args = arguments ?: return null if (!args.containsKey(EXTRA_USER_LIST)) return null return args.getParcelable(EXTRA_USER_LIST) } private val users: Array? get() { - val args = arguments + val args = arguments ?: return null if (!args.containsKey(EXTRA_USERS)) return null return args.getNullableTypedArray(EXTRA_USERS) } @@ -93,7 +93,7 @@ class DeleteUserListMembersDialogFragment : BaseDialogFragment(), DialogInterfac val FRAGMENT_TAG = "destroy_user_list_member" fun show(fm: FragmentManager, userList: ParcelableUserList, - vararg users: ParcelableUser): DeleteUserListMembersDialogFragment { + vararg users: ParcelableUser): DeleteUserListMembersDialogFragment { val args = Bundle() args.putParcelable(EXTRA_USER_LIST, userList) args.putParcelableArray(EXTRA_USERS, users) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt index 151216bc5..4157cb1fe 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.set @@ -48,7 +48,7 @@ class DestroyFriendshipDialogFragment : BaseDialogFragment(), DialogInterface.On } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val nameFirst = preferences[nameFirstKey] val displayName = userColorNameManager.getDisplayName(user, nameFirst) builder.setTitle(getString(R.string.unfollow_user, displayName)) @@ -61,7 +61,7 @@ class DestroyFriendshipDialogFragment : BaseDialogFragment(), DialogInterface.On } private val user: ParcelableUser - get() = arguments.getParcelable(EXTRA_USER)!! + get() = arguments?.getParcelable(EXTRA_USER)!! companion object { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt index 3a8cf6c7b..d5f9fa4d7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.extension.applyOnShow @@ -48,7 +48,7 @@ class DestroySavedSearchDialogFragment : BaseDialogFragment(), DialogInterface.O override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val name = searchName builder.setTitle(getString(R.string.destroy_saved_search, name)) builder.setMessage(getString(R.string.destroy_saved_search_confirm_message, name)) @@ -60,13 +60,13 @@ class DestroySavedSearchDialogFragment : BaseDialogFragment(), DialogInterface.O } private val accountKey: UserKey - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! private val searchId: Long - get() = arguments.getLong(EXTRA_SEARCH_ID, -1) + get() = arguments?.getLong(EXTRA_SEARCH_ID, -1)!! private val searchName: String - get() = arguments.getString(EXTRA_NAME)!! + get() = arguments?.getString(EXTRA_NAME)!! companion object { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt index 47ff98eb0..1409d68f1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_USER_LIST import org.mariotaku.twidere.extension.applyOnShow @@ -46,7 +46,7 @@ class DestroyUserListDialogFragment : BaseDialogFragment(), DialogInterface.OnCl override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val userList = userList builder.setTitle(getString(R.string.delete_user_list, userList.name)) builder.setMessage(getString(R.string.delete_user_list_confirm_message, userList.name)) @@ -58,7 +58,7 @@ class DestroyUserListDialogFragment : BaseDialogFragment(), DialogInterface.OnCl } private val userList: ParcelableUserList - get() = arguments.getParcelable(EXTRA_USER_LIST)!! + get() = arguments?.getParcelable(EXTRA_USER_LIST)!! companion object { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt index eecc6c529..a0c51fcf9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_USER_LIST import org.mariotaku.twidere.extension.applyOnShow @@ -47,7 +47,7 @@ class DestroyUserListSubscriptionDialogFragment : BaseDialogFragment(), DialogIn override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val userList = userList if (userList != null) { builder.setTitle(getString(R.string.unsubscribe_from_user_list, userList.name)) @@ -62,7 +62,7 @@ class DestroyUserListSubscriptionDialogFragment : BaseDialogFragment(), DialogIn private val userList: ParcelableUserList? get() { - val args = arguments + val args = arguments ?: return null if (!args.containsKey(EXTRA_USER_LIST)) return null return args.getParcelable(EXTRA_USER_LIST) } @@ -72,7 +72,7 @@ class DestroyUserListSubscriptionDialogFragment : BaseDialogFragment(), DialogIn val FRAGMENT_TAG = "destroy_user_list" fun show(fm: FragmentManager, - userList: ParcelableUserList): DestroyUserListSubscriptionDialogFragment { + userList: ParcelableUserList): DestroyUserListSubscriptionDialogFragment { val args = Bundle() args.putParcelable(EXTRA_USER_LIST, userList) val f = DestroyUserListSubscriptionDialogFragment() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt index 7cb90e7fd..f80d76ecb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt @@ -21,8 +21,8 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import kotlinx.android.synthetic.main.dialog_compose_edit_alt_text.* import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.set @@ -36,11 +36,11 @@ import org.mariotaku.twidere.extension.applyTheme class EditAltTextDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.edit_description) builder.setView(R.layout.dialog_compose_edit_alt_text) builder.setNegativeButton(android.R.string.cancel, null) - val position = arguments.getInt(EXTRA_POSITION) + val position = arguments!!.getInt(EXTRA_POSITION) builder.setPositiveButton(android.R.string.ok) { dialog, _ -> val altText = (dialog as Dialog).editText.string callback?.onSetAltText(position, altText) @@ -51,7 +51,7 @@ class EditAltTextDialogFragment : BaseDialogFragment() { val dialog = builder.create() dialog.applyOnShow { applyTheme() - editText.setText(arguments.getString(EXTRA_TEXT)) + editText.setText(arguments!!.getString(EXTRA_TEXT)) } return dialog } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt index b2531b980..ca89f7605 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import kotlinx.android.synthetic.main.dialog_user_list_detail_editor.* import org.mariotaku.ktextension.string import org.mariotaku.microblog.library.twitter.model.UserList @@ -36,11 +36,11 @@ import org.mariotaku.twidere.text.validator.UserListNameValidator class EditUserListDialogFragment : BaseDialogFragment() { - private val accountKey by lazy { arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! } - private val listId: String by lazy { arguments.getString(EXTRA_LIST_ID)!! } + private val accountKey by lazy { arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! } + private val listId: String by lazy { arguments?.getString(EXTRA_LIST_ID)!! } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_user_list_detail_editor) builder.setTitle(R.string.title_user_list) builder.positive(android.R.string.ok, this::onPositiveClick) @@ -50,9 +50,9 @@ class EditUserListDialogFragment : BaseDialogFragment() { dialog.applyTheme() dialog.editName.addValidator(UserListNameValidator(getString(R.string.invalid_list_name))) if (savedInstanceState == null) { - dialog.editName.setText(arguments.getString(EXTRA_LIST_NAME)) - dialog.editDescription.setText(arguments.getString(EXTRA_DESCRIPTION)) - dialog.isPublic.isChecked = arguments.getBoolean(EXTRA_IS_PUBLIC, true) + dialog.editName.setText(arguments?.getString(EXTRA_LIST_NAME)) + dialog.editDescription.setText(arguments?.getString(EXTRA_DESCRIPTION)) + dialog.isPublic.isChecked = arguments?.getBoolean(EXTRA_IS_PUBLIC, true) ?: true } } return dialog diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt index 85f0cef8c..df3ec1f1c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt @@ -23,8 +23,8 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.Loader +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader import android.util.Log import android.view.ContextMenu import android.view.ContextMenu.ContextMenuInfo @@ -57,11 +57,11 @@ class ExtensionsListFragment : AbsContentListViewFragment(), } override fun onCreateAdapter(context: Context, requestManager: RequestManager): ExtensionsAdapter { - return ExtensionsAdapter(activity, requestManager) + return ExtensionsAdapter(activity!!, requestManager) } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { - return ExtensionsListLoader(activity) + return ExtensionsListLoader(activity!!) } override fun onLoadFinished(loader: Loader>, data: List) { @@ -86,7 +86,7 @@ class ExtensionsListFragment : AbsContentListViewFragment(), adapter.notifyDataSetChanged() } - override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenuInfo) { + override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenuInfo?) { val inflater = MenuInflater(v.context) inflater.inflate(R.menu.action_extension, menu) val adapterMenuInfo = menuInfo as AdapterContextMenuInfo @@ -94,7 +94,7 @@ class ExtensionsListFragment : AbsContentListViewFragment(), if (extensionInfo.settings != null) { val intent = Intent(IntentConstants.INTENT_ACTION_EXTENSION_SETTINGS) intent.setClassName(extensionInfo.packageName, extensionInfo.settings) - menu.setItemAvailability(R.id.settings, context.packageManager.queryIntentActivities(intent, 0).size == 1) + menu.setItemAvailability(R.id.settings, context?.packageManager?.queryIntentActivities(intent, 0)?.size == 1) } else { menu.setItemAvailability(R.id.settings, false) } @@ -128,7 +128,7 @@ class ExtensionsListFragment : AbsContentListViewFragment(), if (info.settings != null) { intent.setClassName(info.packageName, info.settings) } else { - val pm = activity.packageManager + val pm = activity!!.packageManager val activities = pm.queryIntentActivities(intent, 0) if (activities.isEmpty()) { return false diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt index 341fb1945..ae8508b55 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt @@ -5,8 +5,8 @@ import android.app.Dialog import android.content.DialogInterface import android.content.Intent import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import android.view.View import kotlinx.android.synthetic.main.dialog_extra_features_introduction.* import org.mariotaku.ktextension.Bundle @@ -27,12 +27,12 @@ import org.mariotaku.twidere.util.premium.ExtraFeaturesService */ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { - val feature: String get() = arguments.getString(EXTRA_FEATURE)!! - val source: String? get() = arguments.getString(EXTRA_SOURCE) - val requestCode: Int get() = arguments.getInt(EXTRA_REQUEST_CODE, 0) + val feature: String get() = arguments?.getString(EXTRA_FEATURE)!! + val source: String? get() = arguments?.getString(EXTRA_SOURCE) + val requestCode: Int get() = arguments?.getInt(EXTRA_REQUEST_CODE, 0) ?: 0 override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.title_extra_features) builder.setView(R.layout.dialog_extra_features_introduction) builder.setPositiveButton(R.string.action_purchase) { _, _ -> @@ -42,7 +42,7 @@ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { builder.setNegativeButton(R.string.action_later) { _, _ -> onDialogCancelled() } - val restorePurchaseIntent = extraFeaturesService.createRestorePurchaseIntent(context, feature) + val restorePurchaseIntent = extraFeaturesService.createRestorePurchaseIntent(context!!, feature) if (restorePurchaseIntent != null) { builder.setNeutralButton(R.string.action_restore_purchase) { _, _ -> startActivityForResultOnTarget(restorePurchaseIntent) @@ -56,7 +56,7 @@ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { } else { View.GONE } - val description = ExtraFeaturesService.getIntroduction(context, feature) + val description = ExtraFeaturesService.getIntroduction(context!!, feature) val featureIcon = it.featureIcon val featureDescription = it.featureDescription featureIcon.setImageResource(description.icon) @@ -72,7 +72,7 @@ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { return dialog } - override fun onCancel(dialog: DialogInterface?) { + override fun onCancel(dialog: DialogInterface) { onDialogCancelled() } @@ -83,19 +83,20 @@ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { } private fun startPurchase(feature: String) { - val purchaseIntent = extraFeaturesService.createPurchaseIntent(context, feature) ?: return + val currentContext = context ?: return + val purchaseIntent = extraFeaturesService.createPurchaseIntent(currentContext, feature) ?: return startActivityForResultOnTarget(purchaseIntent) } private fun startActivityForResultOnTarget(intent: Intent) { if (targetFragment != null) { - targetFragment.startActivityForResult(intent, targetRequestCode) + targetFragment?.startActivityForResult(intent, targetRequestCode) } else if (requestCode == 0) { startActivity(intent) } else if (parentFragment != null) { - parentFragment.startActivityForResult(intent, requestCode) + parentFragment?.startActivityForResult(intent, requestCode) } else { - activity.startActivityForResult(intent, requestCode) + activity?.startActivityForResult(intent, requestCode) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt index 270012831..91bf87764 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt @@ -5,9 +5,9 @@ import android.nfc.NdefMessage import android.nfc.NdefRecord import android.nfc.NfcAdapter import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.FixedAsyncTaskLoader -import android.support.v4.content.Loader +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.FixedAsyncTaskLoader +import androidx.loader.content.Loader import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.statusnet.model.Group import org.mariotaku.twidere.Constants.* @@ -38,20 +38,22 @@ class GroupFragment : AbsToolbarTabPagesFragment(), LoaderCallbacks> { - val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + val accountKey = args!!.getParcelable(EXTRA_ACCOUNT_KEY) val groupId = args.getString(EXTRA_GROUP_ID) val groupName = args.getString(EXTRA_GROUP_NAME) val omitIntentExtra = args.getBoolean(EXTRA_OMIT_INTENT_EXTRA, true) - return ParcelableGroupLoader(context, omitIntentExtra, arguments, accountKey, groupId, + return ParcelableGroupLoader(context!!, omitIntentExtra, arguments, accountKey, groupId, groupName) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/HostMappingsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/HostMappingsListFragment.kt index 60894972e..732f0074b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/HostMappingsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/HostMappingsListFragment.kt @@ -25,7 +25,7 @@ import android.content.DialogInterface import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.text.Editable import android.text.TextWatcher import android.view.* @@ -57,7 +57,7 @@ class HostMappingsListFragment : AbsContentListViewFragment { val df = AddMappingDialogFragment() - df.show(fragmentManager, "add_mapping") + fragmentManager?.let { df.show(it, "add_mapping") } } } return super.onOptionsItemSelected(item) @@ -179,7 +179,7 @@ class HostMappingsListFragment : AbsContentListViewFragment): ParameterizedExpression { val arguments = arguments - val extras: InteractionsTabExtras? = arguments.getParcelable(EXTRA_EXTRAS) + val extras: InteractionsTabExtras? = arguments?.getParcelable(EXTRA_EXTRAS) if (extras != null) { val expressions = mutableListOf(where) val combinedArgs = mutableListOf(*whereArgs) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt index 1026c28e1..89634dac2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt @@ -4,10 +4,10 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.FixedAsyncTaskLoader -import android.support.v4.content.Loader -import android.support.v7.widget.RecyclerView +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.FixedAsyncTaskLoader +import androidx.loader.content.Loader +import androidx.recyclerview.widget.RecyclerView import android.view.ContextMenu import android.view.MenuInflater import android.view.MenuItem @@ -42,7 +42,7 @@ open class ItemsListFragment : AbsContentListRecyclerViewFragment?> { protected val accountKey: UserKey? - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY) + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY) override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) @@ -67,12 +67,14 @@ open class ItemsListFragment : AbsContentListRecyclerViewFragment?> { - return ItemsLoader(context, arguments) + return ItemsLoader(context!!, arguments!!) } final override fun onLoadFinished(loader: Loader?>, data: List?) { @@ -148,8 +154,10 @@ open class ItemsListFragment : AbsContentListRecyclerViewFragment() { private val fragmentRef = WeakReference(fragment) - private val contextRef = WeakReference(fragment.activity.applicationContext) + private val contextRef = WeakReference(fragment.activity?.applicationContext) override fun doInBackground(vararg params: Any) { val context = contextRef.get() ?: return diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableGroupsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableGroupsFragment.kt index 78bd77010..dfeee3faf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableGroupsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableGroupsFragment.kt @@ -21,11 +21,11 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.app.hasRunningLoadersSafe -import android.support.v4.content.Loader -import android.support.v7.widget.RecyclerView +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader +import androidx.recyclerview.widget.RecyclerView import android.view.KeyEvent +import androidx.loader.app.hasRunningLoadersSafe import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.fragment_content_recyclerview.* import org.mariotaku.twidere.adapter.ParcelableGroupsAdapter @@ -69,7 +69,7 @@ abstract class ParcelableGroupsFragment : AbsContentListRecyclerViewFragment(EXTRA_ACCOUNT_KEY) + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY) protected fun hasMoreData(data: List?): Boolean { return data == null || !data.isEmpty() @@ -129,10 +129,10 @@ abstract class ParcelableGroupsFragment : AbsContentListRecyclerViewFragment?> { - val fromUser = args.getBoolean(EXTRA_FROM_USER) - args.remove(EXTRA_FROM_USER) - return onCreateUserListsLoader(activity, args, fromUser) + override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { + val fromUser = args?.getBoolean(EXTRA_FROM_USER) + args?.remove(EXTRA_FROM_USER) + return onCreateUserListsLoader(activity!!, args!!, fromUser!!) } override fun onLoaderReset(loader: Loader?>) { @@ -142,7 +142,7 @@ abstract class ParcelableGroupsFragment : AbsContentListRecyclerViewFragment - get() = Utils.getAccountKeys(context, arguments) ?: emptyArray() + get() = context?.let { Utils.getAccountKeys(it, arguments) } ?: emptyArray() private var lastId: String? = null private var nextPagination: Pagination? = null @@ -93,10 +93,10 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() { outState.putParcelable(EXTRA_NEXT_PAGINATION, nextPagination) } - override fun onCreateLoader(id: Int, args: Bundle): Loader?> { + override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { val loader = super.onCreateLoader(id, args) if (loader is AbsRequestStatusesLoader) { - loader.pagination = args.getParcelable(EXTRA_PAGINATION) + loader.pagination = args?.getParcelable(EXTRA_PAGINATION) } return loader } @@ -116,7 +116,7 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() { } override fun hasMoreData(loader: Loader?>, - data: List?): Boolean { + data: List?): Boolean { if (data == null || data.isEmpty()) return false if (loader is IPaginationLoader) { return loader.nextPagination != null @@ -141,7 +141,9 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() { } else if (loader is AbsRequestStatusesLoader) { val e = loader.exception if (e != null) { - showError(R.drawable.ic_info_error_generic, e.getErrorMessage(context)) + context ?.let { + showError(R.drawable.ic_info_error_generic, e.getErrorMessage(it)) + } } else { showEmpty(R.drawable.ic_info_refresh, getString(R.string.swipe_down_to_refresh)) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt index fcc05599e..0feac0981 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt @@ -21,10 +21,10 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.app.hasRunningLoadersSafe -import android.support.v4.content.Loader -import android.support.v7.widget.RecyclerView +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.app.hasRunningLoadersSafe +import androidx.loader.content.Loader +import androidx.recyclerview.widget.RecyclerView import android.view.KeyEvent import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.fragment_content_recyclerview.* @@ -55,7 +55,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< private set protected val accountKey: UserKey? - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY) + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY) val data: List? get() = adapter.getData() @@ -134,10 +134,10 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< loaderManager.initLoader(0, loaderArgs, this) } - override fun onCreateLoader(id: Int, args: Bundle): Loader> { - val fromUser = args.getBoolean(EXTRA_FROM_USER) - args.remove(EXTRA_FROM_USER) - return onCreateUserListsLoader(activity, args, fromUser) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + val fromUser = args?.getBoolean(EXTRA_FROM_USER) + args?.remove(EXTRA_FROM_USER) + return onCreateUserListsLoader(activity!!, args!!, fromUser!!) } override fun onLoaderReset(loader: Loader>) { @@ -148,7 +148,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< override fun onUserListClick(holder: UserListViewHolder, position: Int) { val userList = adapter.getUserList(position) ?: return - IntentUtils.openUserListDetails(activity, userList) + activity?.let { IntentUtils.openUserListDetails(it, userList) } } override fun onUserListLongClick(holder: UserListViewHolder, position: Int): Boolean { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt index 82bc053d9..075a55568 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt @@ -22,11 +22,11 @@ package org.mariotaku.twidere.fragment import android.accounts.AccountManager import android.content.Context import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.app.hasRunningLoadersSafe -import android.support.v4.content.Loader -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.app.hasRunningLoadersSafe +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.KeyEvent import com.bumptech.glide.RequestManager import com.squareup.otto.Subscribe @@ -72,7 +72,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment?> { - val fromUser = args.getBoolean(EXTRA_FROM_USER) - args.remove(EXTRA_FROM_USER) - return onCreateUsersLoader(activity, args, fromUser).apply { + override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { + val fromUser = args?.getBoolean(EXTRA_FROM_USER) + args?.remove(EXTRA_FROM_USER) + return onCreateUsersLoader(activity!!, args!!, fromUser!!).apply { if (this is AbsRequestUsersLoader) { pagination = args.getParcelable(EXTRA_PAGINATION) } @@ -171,7 +171,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment(EXTRA_ACCOUNT_KEY)?.let { key -> + val accountType = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)?.let { key -> val am = AccountManager.get(context) return@let AccountUtils.findByAccountKey(am, key)?.getAccountType(am) } @@ -204,7 +204,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment - ActivityCompat.requestPermissions(activity, permissions, requestCode) + activity?.let { ActivityCompat.requestPermissions(it, permissions, requestCode) } } builder.setNegativeButton(R.string.action_later) { _, _ -> val callback = parentFragment as? PermissionRequestCancelCallback ?: activity as? @@ -42,7 +42,7 @@ class PermissionRequestDialog : BaseDialogFragment() { companion object { fun show(fragmentManager: FragmentManager, message: String, permissions: Array, - requestCode: Int): PermissionRequestDialog { + requestCode: Int): PermissionRequestDialog { val df = PermissionRequestDialog() df.arguments = Bundle { this[EXTRA_MESSAGE] = message diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt index 6c6cdf2ba..464d94dda 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt @@ -25,7 +25,7 @@ import android.content.DialogInterface.OnClickListener import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_URI import org.mariotaku.twidere.extension.applyTheme @@ -47,7 +47,7 @@ class PhishingLinkWarningDialogFragment : BaseDialogFragment(), OnClickListener } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(android.R.string.dialog_alert_title) builder.setView(R.layout.dialog_phishing_link_warning) builder.setPositiveButton(android.R.string.ok, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ProgressDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ProgressDialogFragment.kt index 1b29751e2..8f613f261 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ProgressDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ProgressDialogFragment.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.app.ProgressDialog import android.os.Bundle -import android.support.v4.app.FragmentManager +import androidx.fragment.app.FragmentManager import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.set import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ReportUserSpamDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ReportUserSpamDialogFragment.kt index c17584ec9..992b3844c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ReportUserSpamDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ReportUserSpamDialogFragment.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.fragment -import android.support.v4.app.FragmentManager +import androidx.fragment.app.FragmentManager import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.set import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt index 5ec8ab572..b483dca28 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt @@ -21,9 +21,9 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.app.hasRunningLoadersSafe -import android.support.v4.content.Loader +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.app.hasRunningLoadersSafe +import androidx.loader.content.Loader import android.view.View import android.widget.AdapterView import com.bumptech.glide.RequestManager @@ -50,7 +50,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment?> { - return SavedSearchesLoader(activity, accountKey) + return SavedSearchesLoader(activity!!, accountKey) } override fun onItemLongClick(view: AdapterView<*>, child: View, position: Int, id: Long): Boolean { val item = adapter.findItem(id) ?: return false - DestroySavedSearchDialogFragment.show(fragmentManager, accountKey, item.id, item.name) + fragmentManager?.let { DestroySavedSearchDialogFragment.show(it, accountKey, item.id, item.name) } return true } override fun onItemClick(view: AdapterView<*>, child: View, position: Int, id: Long) { val item = adapter.findItem(id) ?: return - openTweetSearch(activity, accountKey, item.query) + activity?.let { openTweetSearch(it, accountKey, item.query) } } override fun onLoaderReset(loader: Loader?>) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt index cd5b4d438..a0907a50a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.fragment import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import org.mariotaku.ktextension.getNullableTypedArray import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.* @@ -55,7 +55,7 @@ class SensitiveContentWarningDialogFragment : BaseDialogFragment(), DialogInterf override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(android.R.string.dialog_alert_title) builder.setMessage(R.string.sensitive_content_warning) builder.setPositiveButton(android.R.string.ok, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt index 8bd19f6a7..4f8eb43e6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt @@ -23,8 +23,8 @@ import android.app.Dialog import android.content.DialogInterface import android.content.DialogInterface.OnClickListener import android.os.Bundle -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import kotlinx.android.synthetic.main.dialog_edit_user_nickname.* import org.mariotaku.ktextension.empty import org.mariotaku.twidere.R @@ -38,7 +38,7 @@ class SetUserNicknameDialogFragment : BaseDialogFragment(), OnClickListener { override fun onClick(dialog: DialogInterface, which: Int) { val editName = (dialog as AlertDialog).editName - val userKey = arguments.getParcelable(EXTRA_USER_KEY)!! + val userKey = arguments?.getParcelable(EXTRA_USER_KEY)!! when (which) { DialogInterface.BUTTON_POSITIVE -> { if (editName.empty) { @@ -55,9 +55,9 @@ class SetUserNicknameDialogFragment : BaseDialogFragment(), OnClickListener { } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val nick = arguments.getString(EXTRA_NAME) + val nick = arguments?.getString(EXTRA_NAME) val context = activity - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.title_set_nickname) builder.setPositiveButton(android.R.string.ok, this) if (!nick.isNullOrEmpty()) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SettingsDetailsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SettingsDetailsFragment.kt index 6f5577ed8..dab9543c9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SettingsDetailsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SettingsDetailsFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.os.Bundle -import android.support.v4.view.ViewCompat -import android.support.v7.preference.PreferenceScreen +import androidx.core.view.ViewCompat +import androidx.preference.PreferenceScreen import android.view.View import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.activity.SettingsActivity @@ -45,7 +45,7 @@ class SettingsDetailsFragment : BasePreferenceFragment(), OnSharedPreferenceChan setPreferenceScreen(preferenceScreen) val args = arguments - val rawResId = args.get(EXTRA_RESID) + val rawResId = args?.get(EXTRA_RESID) val resId: Int if (rawResId is Int) { resId = rawResId @@ -77,17 +77,18 @@ class SettingsDetailsFragment : BasePreferenceFragment(), OnSharedPreferenceChan override fun onSharedPreferenceChanged(preferences: SharedPreferences, key: String) { val preference = findPreference(key) ?: return + val currentActivity = activity ?: return val extras = preference.extras if (extras != null) { if (extras.containsKey(EXTRA_SHOULD_RESTART)) { - SettingsActivity.setShouldRestart(activity) + SettingsActivity.setShouldRestart(currentActivity) } else if (extras.containsKey(EXTRA_SHOULD_RECREATE)) { - SettingsActivity.setShouldRecreate(activity) + SettingsActivity.setShouldRecreate(currentActivity) } else if (extras.containsKey(EXTRA_SHOULD_TERMINATE)) { - SettingsActivity.setShouldTerminate(activity) + SettingsActivity.setShouldTerminate(currentActivity) } if (extras.containsKey(EXTRA_RECREATE_ACTIVITY)) { - activity.recreate() + currentActivity.recreate() } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StubFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StubFragment.kt index 459483f4d..01b2e96ce 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StubFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StubFragment.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.fragment import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -35,7 +35,7 @@ class StubFragment : Fragment() { override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - text.text = arguments.get(EXTRA_TAB_POSITION).toString() + text.text = arguments?.get(EXTRA_TAB_POSITION).toString() } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedEditTextPreferenceDialogFragmentCompat.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedEditTextPreferenceDialogFragmentCompat.kt index a5c1f8a0a..4c53060b0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedEditTextPreferenceDialogFragmentCompat.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedEditTextPreferenceDialogFragmentCompat.kt @@ -17,8 +17,8 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v7.preference.EditTextPreference -import android.support.v7.preference.PreferenceDialogFragmentCompat +import androidx.preference.EditTextPreference +import androidx.preference.PreferenceDialogFragmentCompat import android.view.View import android.widget.EditText diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt index a9288d51e..1329328aa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt @@ -4,8 +4,8 @@ import android.app.Dialog import android.content.Context import android.content.DialogInterface import android.os.Bundle -import android.support.v7.app.AlertDialog -import android.support.v7.preference.PreferenceDialogFragmentCompat +import androidx.appcompat.app.AlertDialog +import androidx.preference.PreferenceDialogFragmentCompat import org.mariotaku.kpreferences.KPreferences import org.mariotaku.twidere.extension.applyTheme import org.mariotaku.twidere.extension.onShow @@ -29,7 +29,7 @@ abstract class ThemedPreferenceDialogFragmentCompat : PreferenceDialogFragmentCo val context = context val preference = preference onClick(null, DialogInterface.BUTTON_NEGATIVE) - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) .setTitle(preference.dialogTitle) .setIcon(preference.dialogIcon) .setPositiveButton(preference.positiveButtonText, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt index f1515a924..87ce0ae8b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt @@ -23,9 +23,9 @@ import android.content.Context import android.content.Intent import android.database.Cursor import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.CursorLoader -import android.support.v4.content.Loader +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.CursorLoader +import androidx.loader.content.Loader import android.view.View import android.widget.AdapterView import android.widget.ListView @@ -53,11 +53,11 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment(), L AdapterView.OnItemClickListener, IFloatingActionButtonFragment { private val tabExtras: TrendsTabExtras? - get() = arguments.getParcelable(EXTRA_EXTRAS) + get() = arguments?.getParcelable(EXTRA_EXTRAS) private val accountKey: UserKey? get() { - return Utils.getAccountKeys(context, arguments)?.firstOrNull() - ?: Utils.getDefaultAccountKey(context) + return context?.let { Utils.getAccountKeys(it, arguments)?.firstOrNull() } + ?: context?.let { Utils.getDefaultAccountKey(it) } } private val woeId: Int get() { @@ -73,7 +73,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment(), L } override fun onCreateAdapter(context: Context, requestManager: RequestManager): TrendsAdapter { - return TrendsAdapter(activity) + return TrendsAdapter(activity!!) } override fun onCreateLoader(id: Int, args: Bundle?): Loader { @@ -81,7 +81,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment(), L val loaderWhere = Expression.and(Expression.equalsArgs(CachedTrends.ACCOUNT_KEY), Expression.equalsArgs(CachedTrends.WOEID)).sql val loaderWhereArgs = arrayOf(accountKey?.toString().orEmpty(), woeId.toString()) - return CursorLoader(activity, uri, CachedTrends.COLUMNS, loaderWhere, loaderWhereArgs, CachedTrends.TREND_ORDER) + return CursorLoader(activity!!, uri, CachedTrends.COLUMNS, loaderWhere, loaderWhereArgs, CachedTrends.TREND_ORDER) } override fun onItemClick(view: AdapterView<*>, child: View, position: Int, id: Long) { @@ -94,7 +94,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment(), L } if (trend == null) return - openTweetSearch(activity, accountKey, trend) + activity?.let { openTweetSearch(it, accountKey, trend) } } override fun onLoaderReset(loader: Loader) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt index c8a7ee6ee..67ece98e4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -42,27 +42,27 @@ import android.nfc.NfcAdapter.CreateNdefMessageCallback import android.os.Build import android.os.Bundle import android.os.Parcelable -import android.support.annotation.ColorRes -import android.support.annotation.DrawableRes -import android.support.annotation.StringRes -import android.support.annotation.UiThread -import android.support.v4.app.DialogFragment -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentActivity -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.ContextCompat -import android.support.v4.content.FixedAsyncTaskLoader -import android.support.v4.content.Loader -import android.support.v4.content.pm.ShortcutManagerCompat -import android.support.v4.content.res.ResourcesCompat -import android.support.v4.graphics.ColorUtils -import android.support.v4.view.OnApplyWindowInsetsListener -import android.support.v4.view.ViewCompat -import android.support.v4.view.ViewPager.OnPageChangeListener -import android.support.v4.view.WindowCompat -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.Toolbar +import androidx.annotation.ColorRes +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.annotation.UiThread +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.core.content.ContextCompat +import androidx.loader.content.FixedAsyncTaskLoader +import androidx.loader.content.Loader +import androidx.core.content.pm.ShortcutManagerCompat +import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.ColorUtils +import androidx.core.view.OnApplyWindowInsetsListener +import androidx.core.view.ViewCompat +import androidx.viewpager.widget.ViewPager.OnPageChangeListener +import androidx.core.view.WindowCompat +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.Toolbar import android.text.SpannableStringBuilder import android.text.Spanned import android.text.util.Linkify @@ -186,10 +186,10 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, private val friendshipLoaderCallbacks = object : LoaderCallbacks> { - override fun onCreateLoader(id: Int, args: Bundle): Loader> { - activity.invalidateOptionsMenu() - val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) - val user = args.getParcelable(EXTRA_USER) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + activity!!.invalidateOptionsMenu() + val accountKey = args?.getParcelable(EXTRA_ACCOUNT_KEY) + val user = args?.getParcelable(EXTRA_USER) if (user != null && user.key == accountKey) { followingYouIndicator.visibility = View.GONE followContainer.follow.visibility = View.VISIBLE @@ -199,7 +199,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, followContainer.follow.visibility = View.GONE followProgress.visibility = View.VISIBLE } - return UserRelationshipLoader(activity, accountKey, user) + return UserRelationshipLoader(activity!!, accountKey, user) } override fun onLoaderReset(loader: Loader>) { @@ -207,7 +207,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } override fun onLoadFinished(loader: Loader>, - data: SingleResponse) { + data: SingleResponse) { followProgress.visibility = View.GONE displayRelationship(data.data) updateOptionsMenuVisibility() @@ -216,8 +216,8 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } private val userInfoLoaderCallbacks = object : LoaderCallbacks> { - override fun onCreateLoader(id: Int, args: Bundle): Loader> { - val omitIntentExtra = args.getBoolean(EXTRA_OMIT_INTENT_EXTRA, true) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + val omitIntentExtra = args!!.getBoolean(EXTRA_OMIT_INTENT_EXTRA, true) val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val screenName = args.getString(EXTRA_SCREEN_NAME) @@ -230,7 +230,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } val user = this@UserFragment.user val loadFromCache = user == null || !user.is_cache && user.key.maybeEquals(userKey) - return ParcelableUserLoader(activity, accountKey, userKey, screenName, arguments, + return ParcelableUserLoader(activity!!, accountKey, userKey, screenName, arguments, omitIntentExtra, loadFromCache) } @@ -239,7 +239,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } override fun onLoadFinished(loader: Loader>, - data: SingleResponse) { + data: SingleResponse) { val activity = activity ?: return if (data.data != null) { val user = data.data @@ -300,7 +300,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } else { this.relationship = relationship } - activity.invalidateOptionsMenu() + activity?.invalidateOptionsMenu() when { relationship.blocked_by -> { pagesErrorContainer.visibility = View.GONE @@ -333,10 +333,11 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } followingYouIndicator.visibility = if (relationship.followed_by) View.VISIBLE else View.GONE - val resolver = context.applicationContext.contentResolver - task { - resolver.insert(CachedUsers.CONTENT_URI, user, ParcelableUser::class.java) - resolver.insert(CachedRelationships.CONTENT_URI, relationship, ParcelableRelationship::class.java) + context?.applicationContext?.contentResolver?.let { resolver -> + task { + resolver.insert(CachedUsers.CONTENT_URI, user, ParcelableUser::class.java) + resolver.insert(CachedRelationships.CONTENT_URI, relationship, ParcelableRelationship::class.java) + } } followContainer.follow.visibility = View.VISIBLE } @@ -501,12 +502,14 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } val defWidth = resources.displayMetrics.widthPixels val width = if (bannerWidth > 0) bannerWidth else defWidth - requestManager.loadProfileBanner(context, user, width).into(profileBanner) - requestManager.loadOriginalProfileImage(context, user, profileImage.style, + context?.let { requestManager.loadProfileBanner(it, user, width).into(profileBanner) } + context?.let { + requestManager.loadOriginalProfileImage(it, user, profileImage.style, profileImage.cornerRadius, profileImage.cornerRadiusRatio) - .thumbnail(requestManager.loadProfileImage(context, user, profileImage.style, + .thumbnail(requestManager.loadProfileImage(it, user, profileImage.style, profileImage.cornerRadius, profileImage.cornerRadiusRatio, getString(R.string.profile_image_size))).into(profileImage) + } val relationship = relationship if (relationship == null) { getFriendship() @@ -608,7 +611,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, @Subscribe fun notifyTaskStateChanged(event: TaskStateChangedEvent) { - activity.invalidateOptionsMenu() + activity?.invalidateOptionsMenu() } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -639,9 +642,11 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, if (account?.type == AccountType.MASTODON && account?.key?.host != selectedAccountKey.host) { userKey = AcctPlaceholderUserKey(user.key.host) } - IntentUtils.openUserProfile(activity, selectedAccountKey, userKey, user.screen_name, - user.extras?.statusnet_profile_url, preferences[newDocumentApiKey], - null) + activity?.let { + IntentUtils.openUserProfile(it, selectedAccountKey, userKey, user.screen_name, + user.extras?.statusnet_profile_url, preferences[newDocumentApiKey], + null) + } } } } @@ -656,12 +661,12 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, super.onActivityCreated(savedInstanceState) val activity = activity nameFirst = preferences[nameFirstKey] - cardBackgroundColor = ThemeUtils.getCardBackgroundColor(activity, + cardBackgroundColor = ThemeUtils.getCardBackgroundColor(activity!!, preferences[themeBackgroundOptionKey], preferences[themeBackgroundAlphaKey]) actionBarShadowColor = 0xA0000000.toInt() val args = arguments - val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) ?: run { - activity.finish() + val accountKey = args?.getParcelable(EXTRA_ACCOUNT_KEY) ?: run { + activity?.finish() return } val userKey = args.getParcelable(EXTRA_USER_KEY) @@ -682,7 +687,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, if (profileBannerSpace.toolbarHeight == 0) { var toolbarHeight = toolbar.measuredHeight if (toolbarHeight == 0) { - toolbarHeight = ThemeUtils.getActionBarHeight(context) + toolbarHeight = ThemeUtils.getActionBarHeight(context!!) } profileBannerSpace.toolbarHeight = toolbarHeight } @@ -803,7 +808,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, menu.setItemAvailability(R.id.block, !isMyself) menu.setItemAvailability(R.id.add_to_home_screen_submenu, - ShortcutManagerCompat.isRequestPinShortcutSupported(context)) + ShortcutManagerCompat.isRequestPinShortcutSupported(context!!)) var canAddToList = false var canMute = false @@ -867,7 +872,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, extras.putParcelable(EXTRA_USER, user) intent.putExtras(extras) menu.removeGroup(MENU_GROUP_USER_EXTENSION) - MenuUtils.addIntentToMenu(activity, menu, intent, MENU_GROUP_USER_EXTENSION) + activity?.let { MenuUtils.addIntentToMenu(it, menu, intent, MENU_GROUP_USER_EXTENSION) } val drawer = userProfileDrawer if (drawer != null) { val offset = drawer.paddingTop - drawer.headerTop @@ -878,10 +883,11 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } override fun onOptionsItemSelected(item: MenuItem): Boolean { - val context = context + val context = context ?: return false val twitter = twitterWrapper val user = user ?: return false val accountKey = user.account_key ?: return false + val currentFragmentManager = fragmentManager ?: return false val userRelationship = relationship when (item.itemId) { R.id.block -> { @@ -889,11 +895,11 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, if (userRelationship.blocking) { twitter.destroyBlockAsync(accountKey, user.key) } else { - CreateUserBlockDialogFragment.show(fragmentManager, user) + CreateUserBlockDialogFragment.show(currentFragmentManager, user) } } R.id.report_spam -> { - ReportUserSpamDialogFragment.show(fragmentManager, user) + ReportUserSpamDialogFragment.show(currentFragmentManager, user) } R.id.add_to_filter -> { if (userRelationship == null) return true @@ -903,7 +909,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, Toast.LENGTH_SHORT).show() getFriendship() } else { - AddUserFilterDialogFragment.show(fragmentManager, user) + AddUserFilterDialogFragment.show(currentFragmentManager, user) } } R.id.mute_user -> { @@ -911,7 +917,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, if (userRelationship.muting) { twitter.destroyMuteAsync(accountKey, user.key) } else { - CreateUserMuteDialogFragment.show(fragmentManager, user) + CreateUserMuteDialogFragment.show(currentFragmentManager, user) } } R.id.mention -> { @@ -948,14 +954,14 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } R.id.set_nickname -> { val nick = userColorNameManager.getUserNickname(user.key) - SetUserNicknameDialogFragment.show(fragmentManager, user.key, nick) + SetUserNicknameDialogFragment.show(currentFragmentManager, user.key, nick) } R.id.add_to_list -> { showAddToListDialog(user) } R.id.open_with_account -> { val intent = Intent(INTENT_ACTION_SELECT_ACCOUNT) - intent.setClass(activity, AccountSelectorActivity::class.java) + activity?.let { intent.setClass(it, AccountSelectorActivity::class.java) } intent.putExtra(EXTRA_SINGLE_SELECTION, true) when (account?.type) { AccountType.MASTODON -> intent.putExtra(EXTRA_ACCOUNT_TYPE, AccountType.MASTODON) @@ -969,7 +975,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, user.key) if (!updatingRelationship) { if (userRelationship.following) { - DestroyFriendshipDialogFragment.show(fragmentManager, user) + DestroyFriendshipDialogFragment.show(currentFragmentManager, user) } else { twitter.createFriendshipAsync(accountKey, user.key, user.screen_name) } @@ -997,7 +1003,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, return true } R.id.muted_users -> { - IntentUtils.openMutesUsers(activity, accountKey) + activity?.let { IntentUtils.openMutesUsers(it, accountKey) } return true } R.id.blocked_users -> { @@ -1005,7 +1011,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, return true } R.id.incoming_friendships -> { - IntentUtils.openIncomingFriendships(activity, accountKey) + activity?.let { IntentUtils.openIncomingFriendships(it, accountKey) } return true } R.id.user_mentions -> { @@ -1197,6 +1203,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, override fun onClick(view: View) { val activity = activity ?: return + val fragmentManager = fragmentManager ?: return val user = user ?: return val accountKey = user.account_key ?: return when (view.id) { @@ -1205,7 +1212,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } R.id.follow -> { if (accountKey.maybeEquals(user.key)) { - IntentUtils.openProfileEditor(getActivity(), accountKey) + IntentUtils.openProfileEditor(activity, accountKey) } else { val userRelationship = relationship val twitter = twitterWrapper @@ -1239,32 +1246,32 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, preferences[newDocumentApiKey], preferences[displaySensitiveContentsKey]) } R.id.listedContainer -> { - IntentUtils.openUserLists(getActivity(), accountKey, user.key, + IntentUtils.openUserLists(activity, accountKey, user.key, user.screen_name) } R.id.groupsContainer -> { - IntentUtils.openUserGroups(getActivity(), accountKey, user.key, + IntentUtils.openUserGroups(activity, accountKey, user.key, user.screen_name) } R.id.followersContainer -> { - IntentUtils.openUserFollowers(getActivity(), accountKey, user.key, + IntentUtils.openUserFollowers(activity, accountKey, user.key, user.screen_name) } R.id.friendsContainer -> { - IntentUtils.openUserFriends(getActivity(), accountKey, user.key, + IntentUtils.openUserFriends(activity, accountKey, user.key, user.screen_name) } R.id.nameContainer -> { if (accountKey == user.key) return - IntentUtils.openProfileEditor(getActivity(), accountKey) + IntentUtils.openProfileEditor(activity, accountKey) } R.id.urlContainer -> { val uri = user.urlPreferred?.let(Uri::parse) ?: return - OnLinkClickHandler.openLink(context, preferences, uri) + OnLinkClickHandler.openLink(activity, preferences, uri) } R.id.profileBirthdayBanner -> { hideBirthdayView = true - profileBirthdayBanner.startAnimation(AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_out)) + profileBirthdayBanner.startAnimation(AnimationUtils.loadAnimation(activity, android.R.anim.fade_out)) profileBirthdayBanner.visibility = View.GONE } } @@ -1275,6 +1282,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, extraId: Long, type: Int, sensitive: Boolean, start: Int, end: Int): Boolean { val user = user ?: return false + val activity = activity ?: return false when (type) { TwidereLinkify.LINK_TYPE_MENTION -> { IntentUtils.openUserProfile(activity, user.account_key, null, link, null, @@ -1383,12 +1391,12 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } private fun setUiColor(color: Int) { + val activity = activity as? BaseActivity ?: return val theme = Chameleon.getOverrideTheme(activity, activity) uiColor = if (color != 0) color else theme.colorPrimary previousActionBarItemIsDark = 0 previousTabItemIsDark = 0 setupBaseActionBar() - val activity = activity as BaseActivity if (theme.isToolbarColored) { primaryColor = color } else { @@ -1450,7 +1458,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } private fun setupUserPages() { - val args = arguments + val args = arguments ?: return val tabArgs = Bundle() val user = args.getParcelable(EXTRA_USER) val userKey: UserKey? @@ -1593,7 +1601,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, val followButton = followContainer.follow followButton.setImageResource(icon) ViewCompat.setBackgroundTintMode(followButton, PorterDuff.Mode.SRC_ATOP) - ViewCompat.setBackgroundTintList(followButton, ContextCompat.getColorStateList(context, color)) + ViewCompat.setBackgroundTintList(followButton, context?.let { ContextCompat.getColorStateList(it, color) }) followButton.contentDescription = getString(label) } @@ -1619,7 +1627,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, return result } - val microBlog = MicroBlogAPIFactory.getInstance(fragment.context, accountKey) + val microBlog = MicroBlogAPIFactory.getInstance(fragment.context!!, accountKey) val ownedLists = ArrayList() val listMemberships = microBlog.getUserListOwnerMemberships(user.key.id) val paging = Paging() @@ -1654,7 +1662,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } }.failUi { val fragment = weakThis.get() ?: return@failUi - Toast.makeText(fragment.context, it.getErrorMessage(fragment.context), + Toast.makeText(fragment.context, it.getErrorMessage(fragment.context!!), Toast.LENGTH_SHORT).show() } } @@ -1788,10 +1796,10 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, class AddRemoveUserListDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val lists = arguments.getTypedArray(EXTRA_USER_LISTS) - val userKey = arguments.getParcelable(EXTRA_USER_KEY)!! - val accountKey = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! - val builder = AlertDialog.Builder(context) + val lists = arguments!!.getTypedArray(EXTRA_USER_LISTS) + val userKey = arguments!!.getParcelable(EXTRA_USER_KEY)!! + val accountKey = arguments!!.getParcelable(EXTRA_ACCOUNT_KEY)!! + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.title_add_or_remove_from_list) val entries = Array(lists.size) { idx -> lists[idx].name @@ -1851,7 +1859,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, states[pos] = checked } } - Toast.makeText(context, e.getErrorMessage(context), Toast.LENGTH_SHORT).show() + Toast.makeText(context, e.getErrorMessage(context!!), Toast.LENGTH_SHORT).show() } } d.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener { @@ -1859,7 +1867,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, df.arguments = Bundle { this[EXTRA_ACCOUNT_KEY] = accountKey } - df.show(fragmentManager, "create_user_list") + df.show(fragmentManager!!, "create_user_list") } } return dialog diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserGroupsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserGroupsFragment.kt index aa20586ad..0c321a7a0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserGroupsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserGroupsFragment.kt @@ -2,7 +2,7 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.loader.group.UserGroupsLoader import org.mariotaku.twidere.model.ParcelableGroup diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt index f260638da..ee81d2262 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt @@ -28,11 +28,11 @@ import android.nfc.NdefMessage import android.nfc.NdefRecord import android.nfc.NfcAdapter.CreateNdefMessageCallback import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.FixedAsyncTaskLoader -import android.support.v4.content.Loader -import android.support.v4.content.pm.ShortcutManagerCompat -import android.support.v7.app.AlertDialog +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.FixedAsyncTaskLoader +import androidx.loader.content.Loader +import androidx.core.content.pm.ShortcutManagerCompat +import androidx.appcompat.app.AlertDialog import android.text.TextUtils import android.util.Log import android.view.Menu @@ -120,8 +120,10 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, if (data == null || !data.hasExtra(EXTRA_ID)) return val userList = this.userList val accountKey = data.getParcelableExtra(EXTRA_ACCOUNT_KEY) - IntentUtils.openUserListDetails(activity, accountKey, userList!!.id, - userList.user_key, userList.user_screen_name, userList.name) + activity?.let { + IntentUtils.openUserListDetails(it, accountKey, userList!!.id, + userList.user_key, userList.user_screen_name, userList.name) + } } } } @@ -133,16 +135,18 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, val activity = activity setHasOptionsMenu(true) - Utils.setNdefPushMessageCallback(activity, CreateNdefMessageCallback { - val userList = userList ?: return@CreateNdefMessageCallback null - NdefMessage(arrayOf(NdefRecord.createUri(LinkCreator.getTwitterUserListLink(userList.user_screen_name, userList.name)))) - }) + if (activity != null) { + Utils.setNdefPushMessageCallback(activity, CreateNdefMessageCallback { + val userList = userList ?: return@CreateNdefMessageCallback null + NdefMessage(arrayOf(NdefRecord.createUri(LinkCreator.getTwitterUserListLink(userList.user_screen_name, userList.name)))) + }) + } getUserListInfo(false) } override fun addTabs(adapter: SupportTabsAdapter) { - val args = arguments + val args = arguments ?: return val tabArgs = Bundle() if (args.containsKey(EXTRA_USER_LIST)) { val userList = args.getParcelable(EXTRA_USER_LIST)!! @@ -205,8 +209,10 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, val extensionsIntent = Intent(INTENT_ACTION_EXTENSION_OPEN_USER_LIST) extensionsIntent.setExtrasClassLoader(TwidereApplication::class.java.classLoader) extensionsIntent.putExtra(EXTRA_USER_LIST, userList) - MenuUtils.addIntentToMenu(activity, menu, extensionsIntent, MENU_GROUP_USER_LIST_EXTENSION) - menu.setItemAvailability(R.id.add_to_home_screen_submenu, ShortcutManagerCompat.isRequestPinShortcutSupported(context)) + activity?.let { + MenuUtils.addIntentToMenu(it, menu, extensionsIntent, MENU_GROUP_USER_LIST_EXTENSION) + menu.setItemAvailability(R.id.add_to_home_screen_submenu, ShortcutManagerCompat.isRequestPinShortcutSupported(it)) + } } else { menu.setItemAvailability(R.id.edit, false) menu.setItemAvailability(R.id.follow, false) @@ -219,6 +225,8 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, override fun onOptionsItemSelected(item: MenuItem): Boolean { val twitter = twitterWrapper val userList = userList ?: return false + val activity = activity ?: return false + val fragmentManager = fragmentManager ?: return false when (item.itemId) { R.id.add -> { if (userList.user_key != userList.account_key) return false @@ -259,13 +267,14 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, } R.id.info -> { val df = UserListDetailsDialogFragment() - df.arguments = Bundle() - df.arguments.putParcelable(EXTRA_USER_LIST, userList) + df.arguments = Bundle().apply { + putParcelable(EXTRA_USER_LIST, userList) + } df.show(childFragmentManager, "user_list_details") } R.id.add_statuses_to_home_screen -> { ShortcutCreator.performCreation(this) { - ShortcutCreator.userListTimeline(context, userList.account_key, userList) + ShortcutCreator.userListTimeline(activity, userList.account_key, userList) } } else -> { @@ -290,26 +299,28 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, } R.id.profileImage -> { val userList = this.userList ?: return - IntentUtils.openUserProfile(activity, userList.account_key, userList.user_key, - userList.user_screen_name, null, preferences[newDocumentApiKey], null) + activity?.let { + IntentUtils.openUserProfile(it, userList.account_key, userList.user_key, + userList.user_screen_name, null, preferences[newDocumentApiKey], null) + } } } } - override fun onCreateLoader(id: Int, args: Bundle): Loader> { - val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { + val accountKey = args!!.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val listId = args.getString(EXTRA_LIST_ID) val listName = args.getString(EXTRA_LIST_NAME) val screenName = args.getString(EXTRA_SCREEN_NAME) val omitIntentExtra = args.getBoolean(EXTRA_OMIT_INTENT_EXTRA, true) - return ParcelableUserListLoader(activity, omitIntentExtra, arguments, accountKey, listId, + return ParcelableUserListLoader(activity!!, omitIntentExtra, arguments, accountKey, listId, listName, userKey, screenName) } override fun onLoadFinished(loader: Loader>, - data: SingleResponse?) { + data: SingleResponse?) { if (data == null) return if (activity == null) return if (data.hasData()) { @@ -389,8 +400,8 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, class UserListDetailsDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val userList = arguments.getParcelable(EXTRA_USER_LIST)!! - val builder = AlertDialog.Builder(context) + val userList = arguments!!.getParcelable(EXTRA_USER_LIST)!! + val builder = AlertDialog.Builder(context!!) builder.setTitle(userList.name) builder.setMessage(userList.description) builder.setPositiveButton(android.R.string.ok, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt index f3832761c..f59cfcd9e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.loader.userlists.UserListMembershipsLoader import org.mariotaku.twidere.model.ParcelableUserList @@ -34,7 +34,7 @@ class UserListMembershipsFragment : ParcelableUserListsFragment() { val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val screenName = args.getString(EXTRA_SCREEN_NAME) - return UserListMembershipsLoader(activity, accountKey, userKey, screenName, data).apply { + return UserListMembershipsLoader(activity!!, accountKey, userKey, screenName, data).apply { pagination = args.getParcelable(EXTRA_PAGINATION) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt index 755e2c8bb..ad3246989 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.loader.userlists.UserListSubscriptionsLoader import org.mariotaku.twidere.model.ParcelableUserList @@ -33,7 +33,7 @@ class UserListSubscriptionsFragment : ParcelableUserListsFragment() { val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val screenName = args.getString(EXTRA_SCREEN_NAME) - return UserListSubscriptionsLoader(activity, accountKey, userKey, screenName, data).apply { + return UserListSubscriptionsLoader(activity!!, accountKey, userKey, screenName, data).apply { pagination = args.getParcelable(EXTRA_PAGINATION) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt index d663251d9..bdad370c1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import android.view.Menu import android.view.MenuInflater import android.view.MenuItem @@ -38,16 +38,16 @@ import org.mariotaku.twidere.util.Utils class UserListsOwnershipsFragment : ParcelableUserListsFragment() { private val screenName: String? - get() = arguments.getString(EXTRA_SCREEN_NAME) + get() = arguments?.getString(EXTRA_SCREEN_NAME) private val userKey: UserKey? - get() = arguments.getParcelable(EXTRA_USER_KEY) + get() = arguments?.getParcelable(EXTRA_USER_KEY) override fun onCreateUserListsLoader(context: Context, args: Bundle, fromUser: Boolean): Loader> { val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val screenName = args.getString(EXTRA_SCREEN_NAME) - return UserListOwnershipsLoader(activity, accountKey, userKey, screenName, data).apply { + return UserListOwnershipsLoader(activity!!, accountKey, userKey, screenName, data).apply { pagination = args.getParcelable(EXTRA_PAGINATION) } } @@ -68,7 +68,7 @@ class UserListsOwnershipsFragment : ParcelableUserListsFragment() { val args = Bundle() args.putParcelable(EXTRA_ACCOUNT_KEY, accountKey) f.arguments = args - f.show(fragmentManager, null) + fragmentManager?.let { f.show(it, null) } return true } } @@ -82,7 +82,7 @@ class UserListsOwnershipsFragment : ParcelableUserListsFragment() { menu.setItemAvailability(R.id.new_user_list, true) } else { menu.setItemAvailability(R.id.new_user_list, screenName != null && - Utils.isMyAccount(activity, screenName)) + Utils.isMyAccount(activity!!, screenName)) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt index 69c5d98bb..988e61675 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt @@ -24,10 +24,10 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentActivity -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.Loader +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentActivity +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader import android.text.TextUtils import android.text.TextUtils.isEmpty import android.view.* @@ -72,7 +72,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, private var currentTask: AbstractTask<*, *, UserProfileEditorFragment>? = null private val accountKey: UserKey - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! private var user: ParcelableUser? = null private var account: AccountDetails? = null private var userInfoLoaderInitialized: Boolean = false @@ -85,27 +85,33 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, if (task != null && !task.isFinished) return when (view.id) { R.id.editProfileImage -> { - val intent = ThemedMediaPickerActivity.withThemed(activity) - .aspectRatio(1, 1) - .maximumSize(512, 512) - .containsVideo(false) - .build() + val intent = activity?.let { + ThemedMediaPickerActivity.withThemed(it) + .aspectRatio(1, 1) + .maximumSize(512, 512) + .containsVideo(false) + .build() + } startActivityForResult(intent, REQUEST_UPLOAD_PROFILE_IMAGE) } R.id.editProfileBanner -> { - val builder = ThemedMediaPickerActivity.withThemed(activity) - .aspectRatio(3, 1) - .maximumSize(1500, 500) - .containsVideo(false) - if (account.type == AccountType.TWITTER) { - builder.addEntry(getString(R.string.remove), "remove_banner", RESULT_REMOVE_BANNER) + val builder = activity?.let { + ThemedMediaPickerActivity.withThemed(it) + .aspectRatio(3, 1) + .maximumSize(1500, 500) + .containsVideo(false) } - startActivityForResult(builder.build(), REQUEST_UPLOAD_PROFILE_BANNER_IMAGE) + if (account.type == AccountType.TWITTER) { + builder?.addEntry(getString(R.string.remove), "remove_banner", RESULT_REMOVE_BANNER) + } + startActivityForResult(builder?.build(), REQUEST_UPLOAD_PROFILE_BANNER_IMAGE) } R.id.editProfileBackground -> { - val intent = ThemedMediaPickerActivity.withThemed(activity) - .containsVideo(false) - .build() + val intent = activity?.let { + ThemedMediaPickerActivity.withThemed(it) + .containsVideo(false) + .build() + } startActivityForResult(intent, REQUEST_UPLOAD_PROFILE_BACKGROUND_IMAGE) } R.id.setLinkColor -> { @@ -126,11 +132,11 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, override fun onCreateLoader(id: Int, args: Bundle?): Loader> { progressContainer.visibility = View.VISIBLE editProfileContent.visibility = View.GONE - return ParcelableUserLoader(activity, accountKey, accountKey, null, arguments, false, false) + return ParcelableUserLoader(activity!!, accountKey, accountKey, null, arguments, false, false) } override fun onLoadFinished(loader: Loader>, - data: SingleResponse) { + data: SingleResponse) { val user = data.data ?: this.user ?: run { activity?.finish() return @@ -169,8 +175,8 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) - if (!Utils.isMyAccount(activity, accountKey)) { - activity.finish() + if (!Utils.isMyAccount(activity!!, accountKey)) { + activity?.finish() return } @@ -227,7 +233,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, val task = currentTask if (task != null && !task.isFinished) return if (resultCode == RESULT_REMOVE_BANNER) { - currentTask = RemoveProfileBannerTaskInternal(context, accountKey) + currentTask = context?.let { RemoveProfileBannerTaskInternal(it, accountKey) } } else { currentTask = UpdateProfileBannerImageTaskInternal(this, accountKey, data.data!!, true) @@ -265,8 +271,9 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, } private fun displayUser(user: ParcelableUser?, account: AccountDetails?) { + val context = context ?: return if (!getUserInfoCalled) return - if (context == null || isDetached || (activity?.isFinishing != false)) return + if (isDetached || (activity?.isFinishing != false)) return getUserInfoCalled = false this.user = user this.account = account @@ -372,7 +379,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, private val linkColor: Int, private val backgroundColor: Int ) : AbsAccountRequestTask, - UserProfileEditorFragment>(fragment.context, accountKey) { + UserProfileEditorFragment>(fragment.context!!, accountKey) { init { this.callback = fragment @@ -400,7 +407,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, TaskStarter.execute(task) } and callback.executeAfterFragmentResumed { fragment -> fragment.childFragmentManager.dismissDialogFragment(DIALOG_FRAGMENT_TAG) - fragment.activity.finish() + fragment.activity?.finish() } } @@ -483,7 +490,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, accountKey: UserKey, imageUri: Uri, deleteImage: Boolean - ) : UpdateProfileBannerImageTask(fragment.context, accountKey, imageUri, deleteImage) { + ) : UpdateProfileBannerImageTask(fragment.context!!, accountKey, imageUri, deleteImage) { init { callback = fragment @@ -506,7 +513,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, imageUri: Uri, tile: Boolean, deleteImage: Boolean - ) : UpdateProfileBackgroundImageTask(fragment.context, accountKey, imageUri, + ) : UpdateProfileBackgroundImageTask(fragment.context!!, accountKey, imageUri, tile, deleteImage) { init { @@ -531,7 +538,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, accountKey: UserKey, imageUri: Uri, deleteImage: Boolean - ) : UpdateProfileImageTask(fragment.context, accountKey, imageUri, deleteImage) { + ) : UpdateProfileImageTask(fragment.context!!, accountKey, imageUri, deleteImage) { init { callback = fragment diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt index c157a8aa2..ff18f5156 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt @@ -24,7 +24,7 @@ import android.graphics.Canvas import android.graphics.Color import android.graphics.drawable.BitmapDrawable import android.os.Bundle -import android.support.v7.graphics.Palette +import androidx.palette.graphics.Palette import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -61,7 +61,7 @@ import java.util.concurrent.ExecutionException */ class UserQrDialogFragment : BaseDialogFragment() { - private val user: ParcelableUser get() = arguments.getParcelable(EXTRA_USER)!! + private val user: ParcelableUser get() = arguments?.getParcelable(EXTRA_USER)!! init { setStyle(STYLE_NO_TITLE, 0) @@ -119,18 +119,18 @@ class UserQrDialogFragment : BaseDialogFragment() { return Promise.ofFail(InterruptedException()) } val profileImageSize = getString(R.string.profile_image_size) - val context = context.applicationContext + val context = context?.applicationContext val requestManager = Glide.with(context) val user = this.user return task { try { - return@task requestManager.loadOriginalProfileImage(context, user, 0) + return@task requestManager.loadOriginalProfileImage(context!!, user, 0) .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() } catch (e: ExecutionException) { // Ignore } // Return fallback profile image - return@task requestManager.loadProfileImage(context, user, 0, size = profileImageSize) + return@task requestManager.loadProfileImage(context!!, user, 0, size = profileImageSize) .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt index a9c30b4e7..1a874a2f0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt @@ -29,12 +29,12 @@ import android.database.Cursor import android.net.Uri import android.os.AsyncTask import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentActivity -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.CursorLoader -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentActivity +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.CursorLoader +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog import android.text.TextUtils import android.view.* import android.widget.AbsListView.MultiChoiceModeListener @@ -111,7 +111,7 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa } override fun onCreateAdapter(context: Context, requestManager: RequestManager): DraftsAdapter { - return DraftsAdapter(activity, requestManager).apply { + return DraftsAdapter(activity!!, requestManager).apply { textSize = preferences[textSizeKey].toFloat() } } @@ -120,12 +120,12 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa override fun onCreateLoader(id: Int, args: Bundle?): Loader { val uri = Drafts.CONTENT_URI_UNSENT val cols = Drafts.COLUMNS - val actions = arguments.getStringArray(EXTRA_ACTIONS) + val actions = arguments?.getStringArray(EXTRA_ACTIONS) val (selection, selectionArgs) = if (actions != null) { Pair(Expression.inArgs(Drafts.ACTION_TYPE, actions.size).sql, actions) } else Pair(null, null) val orderBy = OrderBy(Drafts.TIMESTAMP, false).sql - return CursorLoader(activity, uri, cols, selection, selectionArgs, orderBy) + return CursorLoader(activity!!, uri, cols, selection, selectionArgs, orderBy) } override fun onLoadFinished(loader: Loader, cursor: Cursor?) { @@ -229,9 +229,9 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa } } if (deleteDraft) { - val cr = context.contentResolver - cr.delete(Drafts.CONTENT_URI, Expression.equals(Drafts._ID, draft._id).sql, null) - cr.delete(Drafts.CONTENT_URI_NOTIFICATIONS.withAppendedPath(draft._id.toString()), + val cr = context?.contentResolver + cr?.delete(Drafts.CONTENT_URI, Expression.equals(Drafts._ID, draft._id).sql, null) + cr?.delete(Drafts.CONTENT_URI_NOTIFICATIONS.withAppendedPath(draft._id.toString()), null, null) } } @@ -265,7 +265,7 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa val sendIntent = Intent(context, LengthyOperationsService::class.java) sendIntent.action = IntentConstants.INTENT_ACTION_SEND_DRAFT sendIntent.data = uri - context.startService(sendIntent) + context?.startService(sendIntent) } return true } @@ -282,14 +282,14 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa when (which) { DialogInterface.BUTTON_POSITIVE -> { val args = arguments ?: return - DeleteDraftsTask(activity, args.getLongArray(EXTRA_IDS)!!).execute() + activity?.let { DeleteDraftsTask(it, args.getLongArray(EXTRA_IDS)!!).execute() } } } } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setMessage(R.string.delete_drafts_confirm) builder.setPositiveButton(android.R.string.ok, this) builder.setNegativeButton(android.R.string.cancel, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt index e8c6b4541..a41cf4363 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt @@ -25,7 +25,7 @@ import android.content.Context import android.content.DialogInterface import android.net.Uri import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.View import android.view.WindowManager import android.view.inputmethod.InputMethodManager @@ -53,16 +53,16 @@ import org.mariotaku.twidere.util.premium.ExtraFeaturesService class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListener { private val contentUri: Uri - get() = arguments.getParcelable(EXTRA_URI)!! + get() = arguments?.getParcelable(EXTRA_URI)!! private val rowId: Long - get() = arguments.getLong(EXTRA_ID, -1) + get() = arguments?.getLong(EXTRA_ID, -1) ?: -1 private val defaultValue: String? - get() = arguments.getString(EXTRA_VALUE) + get() = arguments?.getString(EXTRA_VALUE) private val defaultScopes: FilterScopesHolder - get() = FilterScopesHolder(filterMasks, arguments.getInt(EXTRA_SCOPE, FilterScope.DEFAULT)) + get() = FilterScopesHolder(filterMasks, arguments?.getInt(EXTRA_SCOPE, FilterScope.DEFAULT) ?: FilterScope.DEFAULT) private val filterMasks: Int get() = when (contentUri) { @@ -116,10 +116,10 @@ class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListene } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_filter_rule_editor) - if (arguments.getLong(EXTRA_ID, -1) >= 0) { + if (arguments?.getLong(EXTRA_ID, -1) ?: -1 >= 0) { builder.setTitle(R.string.action_edit_filter_rule) } else { builder.setTitle(R.string.action_add_filter_rule) @@ -131,10 +131,10 @@ class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListene applyTheme() window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) editText.setAdapter(when (contentUri) { - Filters.Sources.CONTENT_URI -> SourceAutoCompleteAdapter(activity) - Filters.Users.CONTENT_URI -> ComposeAutoCompleteAdapter(activity, requestManager).apply { + Filters.Sources.CONTENT_URI -> SourceAutoCompleteAdapter(activity!!) + Filters.Users.CONTENT_URI -> ComposeAutoCompleteAdapter(activity!!, requestManager).apply { val am = AccountManager.get(activity) - account = AccountUtils.getDefaultAccountDetails(activity, am, false) + account = AccountUtils.getDefaultAccountDetails(activity!!, am, false) } else -> null }) @@ -152,7 +152,7 @@ class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListene val df = ExtraFeaturesIntroductionDialogFragment.create( ExtraFeaturesService.FEATURE_ADVANCED_FILTERS) df.setTargetFragment(this@AddEditItemFragment, REQUEST_CHANGE_SCOPE_PURCHASE) - df.show(fragmentManager, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) + df.show(fragmentManager!!, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) } } @@ -176,8 +176,8 @@ class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListene override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - outState.putString(EXTRA_VALUE, dialog.value) - outState.putParcelable(EXTRA_SCOPE, dialog.scopes) + outState.putString(EXTRA_VALUE, dialog?.value) + outState.putParcelable(EXTRA_SCOPE, dialog?.scopes) } private fun Dialog.saveScopes(scopes: FilterScopesHolder) { @@ -223,7 +223,7 @@ class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListene } private fun saveScopeOnly(scopes: FilterScopesHolder) { - val resolver = context.contentResolver + val resolver = context?.contentResolver val contentUri = contentUri val rowId = rowId @@ -233,11 +233,11 @@ class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListene this[Filters.SCOPE] = scopes.value } val idWhere = Expression.equals(Filters._ID, rowId).sql - resolver.update(contentUri, values, idWhere, null) + resolver?.update(contentUri, values, idWhere, null) } private fun saveItem(value: String, scopes: FilterScopesHolder) { - val resolver = context.contentResolver + val resolver = context?.contentResolver val uri = contentUri val rowId = rowId val values = ContentValues { @@ -247,17 +247,17 @@ class AddEditItemFragment : BaseDialogFragment(), DialogInterface.OnClickListene if (rowId >= 0) { val valueWhere = Expression.equalsArgs(Filters.VALUE).sql val valueWhereArgs = arrayOf(value) - val matchedId = resolver.queryLong(uri, Filters._ID, valueWhere, valueWhereArgs, + val matchedId = resolver?.queryLong(uri, Filters._ID, valueWhere, valueWhereArgs, -1) if (matchedId != -1L && matchedId != rowId) { Toast.makeText(context, R.string.message_toast_duplicate_filter_rule, Toast.LENGTH_SHORT).show() } else { val idWhere = Expression.equals(Filters._ID, rowId).sql - resolver.update(uri, values, idWhere, null) + resolver?.update(uri, values, idWhere, null) } } else { - resolver.insert(uri, values) + resolver?.insert(uri, values) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt index 02b2197f6..1c8b79746 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt @@ -24,12 +24,12 @@ import android.database.Cursor import android.graphics.PorterDuff import android.net.Uri import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.ContextCompat -import android.support.v4.content.CursorLoader -import android.support.v4.content.Loader -import android.support.v4.view.ViewCompat -import android.support.v4.widget.SimpleCursorAdapter +import androidx.loader.app.LoaderManager +import androidx.core.content.ContextCompat +import androidx.loader.content.CursorLoader +import androidx.loader.content.Loader +import androidx.core.view.ViewCompat +import androidx.cursoradapter.widget.SimpleCursorAdapter import android.text.SpannableStringBuilder import android.text.Spanned import android.view.* @@ -179,7 +179,7 @@ abstract class BaseFiltersFragment : AbsContentListViewFragment { val selection = Expression.isNull(Columns.Column(Filters.USER_KEY)) - return CursorLoader(activity, contentUri, contentColumns, selection.sql, null, sortOrder) + return CursorLoader(activity!!, contentUri, contentColumns, selection.sql, null, sortOrder) } override fun onLoadFinished(loader: Loader, data: Cursor?) { @@ -224,7 +224,7 @@ abstract class BaseFiltersFragment : AbsContentListViewFragment + drawable.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_ATOP) + ssb.setSpan(EmojiSpan(drawable), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } + } text1.text = ssb } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt index c00759381..e8fc94cc8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt @@ -6,9 +6,9 @@ import android.content.Context import android.content.DialogInterface import android.content.Intent import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog import android.view.Menu import android.view.MenuInflater import android.view.MenuItem @@ -107,9 +107,11 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment?> { - val fromUser = args.getBoolean(EXTRA_FROM_USER) + override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { + val fromUser = args!!.getBoolean(EXTRA_FROM_USER) args.remove(EXTRA_FROM_USER) - return onCreateUsersLoader(context, args, fromUser) + return onCreateUsersLoader(context!!, args, fromUser) } override fun onLoaderReset(loader: Loader?>) { @@ -169,7 +171,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment if (!extraFeaturesService.isAdvancedFiltersEnabled) { - ExtraFeaturesIntroductionDialogFragment.show(fragmentManager, + ExtraFeaturesIntroductionDialogFragment.show(fragmentManager!!, feature = ExtraFeaturesService.FEATURE_ADVANCED_FILTERS, requestCode = REQUEST_PURCHASE_EXTRA_FEATURES) return@listener false @@ -199,7 +201,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment { if (resultCode != FragmentActivity.RESULT_OK || data == null) return val intent = Intent(INTENT_ACTION_SELECT_USER) - intent.setClass(context, UserSelectorActivity::class.java) + context?.let { intent.setClass(it, UserSelectorActivity::class.java) } intent.putExtra(EXTRA_ACCOUNT_KEY, data.getParcelableExtra(EXTRA_ACCOUNT_KEY)) startActivityForResult(intent, REQUEST_SELECT_USER) } @@ -105,7 +105,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return CursorLoader(activity, contentUri, contentColumns, null, null, sortOrder) + return CursorLoader(activity!!, contentUri, contentColumns, null, null, sortOrder) } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { @@ -180,6 +180,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { } override fun performDeletion() { + val context = context ?: return val positions = listView.checkedItemPositions val keys = (0 until positions.size()).mapNotNull { if (!positions.valueAt(it)) return@mapNotNull null @@ -217,7 +218,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { val am = AccountManager.get(fragment.context) val account = AccountUtils.getAccountDetails(am, accountKey, true) ?: throw AccountNotFoundException() - CreateUserMuteTask.muteUsers(fragment.context, account, items) + CreateUserMuteTask.muteUsers(fragment.context!!, account, items) }.alwaysUi { weakThis.get()?.dismissProgressDialog("export_to_muted") } @@ -264,9 +265,10 @@ class FilteredUsersFragment : BaseFiltersFragment() { val start = ssb.length ssb.append("*") val end = start + 1 - val drawable = ContextCompat.getDrawable(context, R.drawable.ic_action_sync) - drawable.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_ATOP) - ssb.setSpan(EmojiSpan(drawable), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + ContextCompat.getDrawable(context, R.drawable.ic_action_sync) ?.let { drawable -> + drawable.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_ATOP) + ssb.setSpan(EmojiSpan(drawable), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } } text1.spannable = ssb text2.spannable = userKey.host diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt index 140a42720..3f24856d1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt @@ -7,11 +7,11 @@ import android.content.DialogInterface import android.content.Intent import android.database.Cursor import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.CursorLoader -import android.support.v4.content.Loader -import android.support.v4.widget.SimpleCursorAdapter -import android.support.v7.app.AlertDialog +import androidx.loader.app.LoaderManager +import androidx.loader.content.CursorLoader +import androidx.loader.content.Loader +import androidx.cursoradapter.widget.SimpleCursorAdapter +import androidx.appcompat.app.AlertDialog import android.view.* import android.widget.AbsListView import android.widget.ListView @@ -60,7 +60,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) - adapter = FilterSubscriptionsAdapter(context) + adapter = FilterSubscriptionsAdapter(context!!) listView.adapter = adapter listView.choiceMode = ListView.CHOICE_MODE_MULTIPLE_MODAL listView.setMultiChoiceModeListener(this) @@ -76,23 +76,25 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac } if (savedInstanceState == null) { - when (arguments?.getString(EXTRA_ACTION)) { - ACTION_ADD_URL_SUBSCRIPTION -> { - if (!extraFeaturesService.isAdvancedFiltersEnabled) { - val df = ExtraFeaturesIntroductionDialogFragment.create( - ExtraFeaturesService.FEATURE_ADVANCED_FILTERS) - df.setTargetFragment(this, REQUEST_ADD_URL_SUBSCRIPTION_PURCHASE) - df.show(fragmentManager, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) - } else { - showAddUrlSubscription() + fragmentManager?.let { fragmentManager -> + when (arguments?.getString(EXTRA_ACTION)) { + ACTION_ADD_URL_SUBSCRIPTION -> { + if (!extraFeaturesService.isAdvancedFiltersEnabled) { + val df = ExtraFeaturesIntroductionDialogFragment.create( + ExtraFeaturesService.FEATURE_ADVANCED_FILTERS) + df.setTargetFragment(this, REQUEST_ADD_URL_SUBSCRIPTION_PURCHASE) + df.show(fragmentManager, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) + } else { + showAddUrlSubscription() + } } - } - else -> { - if (!extraFeaturesService.isAdvancedFiltersEnabled) { - val df = ExtraFeaturesIntroductionDialogFragment.create( - ExtraFeaturesService.FEATURE_ADVANCED_FILTERS) - df.setTargetFragment(this, REQUEST_PURCHASE_EXTRA_FEATURES) - df.show(fragmentManager, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) + else -> { + if (!extraFeaturesService.isAdvancedFiltersEnabled) { + val df = ExtraFeaturesIntroductionDialogFragment.create( + ExtraFeaturesService.FEATURE_ADVANCED_FILTERS) + df.setTargetFragment(this, REQUEST_PURCHASE_EXTRA_FEATURES) + df.show(fragmentManager, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) + } } } } @@ -129,17 +131,17 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac when (item.itemId) { R.id.add -> { val df = AddUrlSubscriptionDialogFragment() - df.show(fragmentManager, "add_url_subscription") + fragmentManager?.let { df.show(it, "add_url_subscription") } return true } R.id.refresh -> { executeAfterFragmentResumed { fragment -> ProgressDialogFragment.show(fragment.childFragmentManager, FRAGMENT_TAG_RREFRESH_FILTERS) - val task = RefreshFiltersSubscriptionsTask(fragment.context) + val task = RefreshFiltersSubscriptionsTask(fragment.context!!) val fragmentRef = WeakReference(fragment) task.callback = { fragmentRef.get()?.executeAfterFragmentResumed { fragment -> - fragment.fragmentManager.dismissDialogFragment(FRAGMENT_TAG_RREFRESH_FILTERS) + fragment.fragmentManager?.dismissDialogFragment(FRAGMENT_TAG_RREFRESH_FILTERS) } } TaskStarter.execute(task) @@ -155,7 +157,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - val loader = CursorLoader(context) + val loader = CursorLoader(context!!) loader.uri = Filters.Subscriptions.CONTENT_URI loader.projection = Filters.Subscriptions.COLUMNS return loader @@ -222,7 +224,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac private fun performDeletion() { val ids = listView.checkedItemIds - val resolver = context.contentResolver + val resolver = context?.contentResolver ?: return val where = Expression.inArgs(Filters.Subscriptions._ID, ids.size).sql val whereArgs = ids.toStringArray() resolver.queryReference(Filters.Subscriptions.CONTENT_URI, Filters.Subscriptions.COLUMNS, where, @@ -231,7 +233,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac cursor.moveToFirst() while (!cursor.isAfterLast) { val subscription = indices.newObject(cursor) - subscription.instantiateComponent(context)?.deleteLocalData() + subscription.instantiateComponent(context!!)?.deleteLocalData() cursor.moveToNext() } } @@ -253,7 +255,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac this[EXTRA_ADD_SUBSCRIPTION_URL] = arguments?.getString(EXTRA_ADD_SUBSCRIPTION_URL) this[EXTRA_ADD_SUBSCRIPTION_NAME] = arguments?.getString(EXTRA_ADD_SUBSCRIPTION_NAME) } - df.show(fragmentManager, "add_url_subscription") + fragmentManager?.let { df.show(it, "add_url_subscription") } } class FilterSubscriptionsAdapter(context: Context) : SimpleCursorAdapter(context, @@ -282,7 +284,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac class AddUrlSubscriptionDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_add_filters_subscription) builder.setPositiveButton(R.string.action_add_filters_subscription) { dialog, _ -> dialog as AlertDialog @@ -291,10 +293,10 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac val subscription = FiltersSubscription() subscription.name = editName.text.toString() subscription.setupUrl(editUrl.text.toString()) - val component = subscription.instantiateComponent(context) ?: return@setPositiveButton + val component = subscription.instantiateComponent(context!!) ?: return@setPositiveButton component.firstAdded() val vc = ObjectCursor.valuesCreatorFrom(FiltersSubscription::class.java) - context.contentResolver.insert(Filters.Subscriptions.CONTENT_URI, vc.create(subscription)) + context!!.contentResolver.insert(Filters.Subscriptions.CONTENT_URI, vc.create(subscription)) } builder.setNegativeButton(android.R.string.cancel, null) val dialog = builder.create() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IBaseFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IBaseFragment.kt index e4b29f35e..4c5029ec5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IBaseFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IBaseFragment.kt @@ -23,7 +23,7 @@ import android.graphics.Rect import android.os.Bundle import android.os.Handler import android.os.Looper -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred import org.mariotaku.twidere.constant.IntentConstants diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/ISupportDialogFragmentCallback.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/ISupportDialogFragmentCallback.kt index 965e21f7d..9f782c6d2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/ISupportDialogFragmentCallback.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/ISupportDialogFragmentCallback.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.fragment.iface -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment interface ISupportDialogFragmentCallback { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IToolBarSupportFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IToolBarSupportFragment.kt index b3263d2e0..e4b64fe8e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IToolBarSupportFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/IToolBarSupportFragment.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.fragment.iface -import android.support.v4.app.FragmentActivity -import android.support.v7.widget.Toolbar +import androidx.fragment.app.FragmentActivity +import androidx.appcompat.widget.Toolbar /** * Created by mariotaku on 16/3/16. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/SupportFragmentCallback.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/SupportFragmentCallback.kt index 5640e4b7b..41718bf80 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/SupportFragmentCallback.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/iface/SupportFragmentCallback.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.fragment.iface -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment interface SupportFragmentCallback { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt index 2a06f07a1..52f09896e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt @@ -182,7 +182,7 @@ class ExoPlayerPageFragment : MediaViewerFragment(), IBaseFragment(SubsampleImageViewerFragment.EXTRA_MEDIA_URI) + return arguments?.getParcelable(SubsampleImageViewerFragment.EXTRA_MEDIA_URI) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt index 7d7f99041..365d8de26 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt @@ -44,7 +44,7 @@ class ExternalBrowserPageFragment : MediaViewerFragment() { val webSettings = webView.settings webSettings.javaScriptEnabled = true webSettings.loadsImagesAutomatically = true - val media = arguments.getParcelable(EXTRA_MEDIA) ?: throw NullPointerException() + val media = arguments?.getParcelable(EXTRA_MEDIA) ?: throw NullPointerException() webView.loadUrl(if (TextUtils.isEmpty(media.media_url)) media.url else media.media_url) webViewContainer.setAspectRatioSource(VideoPageFragment.MediaAspectRatioSource(media, this)) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/GifPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/GifPageFragment.kt index 544dfedac..1cf126f9e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/GifPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/GifPageFragment.kt @@ -39,10 +39,10 @@ import pl.droidsonroids.gif.InputSource class GifPageFragment : CacheDownloadMediaViewerFragment() { private val media: ParcelableMedia - get() = arguments.getParcelable(EXTRA_MEDIA)!! + get() = arguments?.getParcelable(EXTRA_MEDIA)!! private val accountKey: UserKey - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) @@ -51,7 +51,7 @@ class GifPageFragment : CacheDownloadMediaViewerFragment() { } override fun getDownloadUri(): Uri? { - return arguments.getParcelable(SubsampleImageViewerFragment.EXTRA_MEDIA_URI) + return arguments?.getParcelable(SubsampleImageViewerFragment.EXTRA_MEDIA_URI) } override fun getDownloadExtra(): Any? { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt index 24beff160..4e9da0c53 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt @@ -44,13 +44,13 @@ class ImagePageFragment : SubsampleImageViewerFragment() { private val media: ParcelableMedia? - get() = arguments.getParcelable(EXTRA_MEDIA) + get() = arguments?.getParcelable(EXTRA_MEDIA) private val accountKey: UserKey? - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY) + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY) private val sizedResultCreator: CacheDownloadLoader.ResultCreator by lazy { - return@lazy SizedResultCreator(context) + return@lazy SizedResultCreator(context!!) } private var mediaLoadState: Int = 0 diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt index 7ccb61ff2..8edb7e955 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt @@ -28,7 +28,7 @@ import android.media.MediaPlayer import android.net.Uri import android.os.Bundle import android.os.Handler -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -85,7 +85,7 @@ class VideoPageFragment : CacheDownloadMediaViewerFragment(), IBaseFragment = arrayOf("video/mp4") internal val MediaViewerFragment.isLoopEnabled: Boolean - get() = arguments.getBoolean(EXTRA_LOOP, false) + get() = arguments?.getBoolean(EXTRA_LOOP, false) ?: false internal val MediaViewerFragment.isControlDisabled: Boolean - get() = arguments.getBoolean(EXTRA_DISABLE_CONTROL, false) + get() = arguments?.getBoolean(EXTRA_DISABLE_CONTROL, false) ?: false internal val MediaViewerFragment.isMutedByDefault: Boolean - get() = arguments.getBoolean(EXTRA_DEFAULT_MUTE, false) + get() = arguments?.getBoolean(EXTRA_DEFAULT_MUTE, false) ?: false internal val MediaViewerFragment.media: ParcelableMedia? - get() = arguments.getParcelable(EXTRA_MEDIA) + get() = arguments?.getParcelable(EXTRA_MEDIA) internal val MediaViewerFragment.accountKey: UserKey - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! } } \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt index 4b6608ac7..6086b446e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt @@ -28,17 +28,17 @@ import android.content.Intent import android.graphics.Rect import android.net.Uri import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentActivity -import android.support.v4.app.LoaderManager -import android.support.v4.content.FixedAsyncTaskLoader -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.FixedLinearLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.Toolbar +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentActivity +import androidx.loader.app.LoaderManager +import androidx.loader.content.FixedAsyncTaskLoader +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.FixedLinearLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.appcompat.widget.Toolbar import android.view.* import android.widget.CompoundButton import android.widget.EditText @@ -104,8 +104,8 @@ import java.lang.ref.WeakReference class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, LoaderManager.LoaderCallbacks { - private val accountKey: UserKey get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! - private val conversationId: String get() = arguments.getString(EXTRA_CONVERSATION_ID)!! + private val accountKey: UserKey get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! + private val conversationId: String get() = arguments?.getString(EXTRA_CONVERSATION_ID)!! private lateinit var adapter: ConversationInfoAdapter private lateinit var itemDecoration: ConversationInfoDecoration @@ -118,6 +118,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) + val context = context ?: return setHasOptionsMenu(true) val activity = this.activity @@ -240,17 +241,18 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return ConversationInfoLoader(context, accountKey, conversationId) + return ConversationInfoLoader(context!!, accountKey, conversationId) } - override fun onLoaderReset(loader: Loader?) { + override fun onLoaderReset(loader: Loader) { } - override fun onLoadFinished(loader: Loader?, data: ParcelableMessageConversation?) { + override fun onLoadFinished(loader: Loader, data: ParcelableMessageConversation?) { if (data == null) { activity?.finish() return } + val context = context ?: return val name = data.getTitle(context, userColorNameManager, preferences[nameFirstKey]).first val summary = data.getSubtitle(context) @@ -288,7 +290,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performDestroyConversation() { ProgressDialogFragment.show(childFragmentManager, "leave_conversation_progress") val weakThis = WeakReference(this) - val task = DestroyConversationTask(context, accountKey, conversationId) + val task = DestroyConversationTask(context!!, accountKey, conversationId) task.callback = callback@ { succeed -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("leave_conversation_progress") { @@ -304,7 +306,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performClearMessages() { ProgressDialogFragment.show(childFragmentManager, "clear_messages_progress") val weakThis = WeakReference(this) - val task = ClearMessagesTask(context, accountKey, conversationId) + val task = ClearMessagesTask(context!!, accountKey, conversationId) task.callback = callback@ { succeed -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("clear_messages_progress") { @@ -319,7 +321,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performSetNotificationDisabled(disabled: Boolean) { ProgressDialogFragment.show(childFragmentManager, "set_notifications_disabled_progress") val weakThis = WeakReference(this) - val task = SetConversationNotificationDisabledTask(context, accountKey, conversationId, disabled) + val task = SetConversationNotificationDisabledTask(context!!, accountKey, conversationId, disabled) task.callback = callback@ { _ -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("set_notifications_disabled_progress") { @@ -339,13 +341,15 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, } } "avatar" -> { - val intent = ThemedMediaPickerActivity.withThemed(context) - .allowMultiple(false) - .aspectRatio(1, 1) - .containsVideo(false) - .addEntry(getString(R.string.action_remove_conversation_avatar), - "remove_avatar", RESULT_CODE_REMOVE_CONVERSATION_AVATAR) - .build() + val intent = context?.let { + ThemedMediaPickerActivity.withThemed(it) + .allowMultiple(false) + .aspectRatio(1, 1) + .containsVideo(false) + .addEntry(getString(R.string.action_remove_conversation_avatar), + "remove_avatar", RESULT_CODE_REMOVE_CONVERSATION_AVATAR) + .build() + } startActivityForResult(intent, REQUEST_PICK_MEDIA) } } @@ -381,7 +385,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, val fragment = weakThis.get() ?: throw InterruptedException() val account = AccountUtils.getAccountDetails(AccountManager.get(fragment.context), accountKey, true) ?: throw MicroBlogException("No account") - val microBlog = account.newMicroBlogInstance(fragment.context, cls = MicroBlog::class.java) + val microBlog = account.newMicroBlogInstance(fragment.context!!, cls = MicroBlog::class.java) return@task updateAction(fragment, account, microBlog) }.then { result -> val fragment = weakThis.get() ?: throw InterruptedException() @@ -389,7 +393,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, val where = Expression.and(Expression.equalsArgs(Conversations.ACCOUNT_KEY), Expression.equalsArgs(Conversations.CONVERSATION_ID)).sql val whereArgs = arrayOf(accountKey.toString(), conversationId) - fragment.context.contentResolver.update(Conversations.CONTENT_URI, values, where, + fragment.context?.contentResolver?.update(Conversations.CONTENT_URI, values, where, whereArgs) }.alwaysUi { val fragment = weakThis.get() ?: return@alwaysUi @@ -660,7 +664,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val actions = arrayOf(Action(getString(R.string.action_edit_conversation_name), "name"), Action(getString(R.string.action_edit_conversation_avatar), "avatar")) - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setItems(actions.mapToArray(Action::title)) { _, which -> val action = actions[which] (parentFragment as MessageConversationInfoFragment).openEditAction(action.type) @@ -676,7 +680,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, class EditNameDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setView(R.layout.dialog_edit_conversation_name) builder.setNegativeButton(android.R.string.cancel, null) builder.setPositiveButton(android.R.string.ok) { dialog, _ -> @@ -692,7 +696,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, class DestroyConversationConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setMessage(R.string.message_destroy_conversation_confirm) builder.setPositiveButton(R.string.action_leave_conversation) { _, _ -> (parentFragment as MessageConversationInfoFragment).performDestroyConversation() @@ -707,7 +711,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, class ClearMessagesConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setMessage(R.string.message_clear_messages_confirm) builder.setPositiveButton(R.string.action_clear_messages) { _, _ -> (parentFragment as MessageConversationInfoFragment).performClearMessages() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt index d2890a406..63d320280 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt @@ -25,10 +25,10 @@ import android.graphics.Canvas import android.graphics.Paint import android.graphics.RectF import android.os.Bundle -import android.support.annotation.WorkerThread -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.Loader -import android.support.v7.widget.LinearLayoutManager +import androidx.annotation.WorkerThread +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager import android.text.Editable import android.text.Spannable import android.text.SpannableStringBuilder @@ -66,7 +66,7 @@ import java.lang.ref.WeakReference */ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks?> { - private val accountKey: UserKey by lazy { arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! } + private val accountKey: UserKey by lazy { arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! } private val account: AccountDetails by lazy { AccountUtils.getAccountDetails(AccountManager.get(context), accountKey, true)!! } @@ -97,6 +97,7 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks(EXTRA_USERS) - if (users != null && users.isNotEmpty()) { - selectedRecipients = users.toList() - editParticipants.setSelection(editParticipants.length()) - if (arguments.getBoolean(EXTRA_OPEN_CONVERSATION)) { - createOrOpenConversation() + arguments?.let { + val users = it.getNullableTypedArray(EXTRA_USERS) + if (users != null && users.isNotEmpty()) { + selectedRecipients = users.toList() + editParticipants.setSelection(editParticipants.length()) + if (it.getBoolean(EXTRA_OPEN_CONVERSATION)) { + createOrOpenConversation() + } } } } @@ -199,11 +202,11 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks?> { - val query = args.getString(EXTRA_QUERY)!! + override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { + val query = args!!.getString(EXTRA_QUERY)!! val fromCache = args.getBoolean(EXTRA_FROM_CACHE) val fromUser = args.getBoolean(EXTRA_FROM_USER) - return CacheUserSearchLoader(context, accountKey, query, !fromCache, true, fromUser) + return CacheUserSearchLoader(context!!, accountKey, query, !fromCache, true, fromUser) } override fun onLoaderReset(loader: Loader?>) { @@ -235,6 +238,8 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks { if (resultCode == Activity.RESULT_OK && data != null) { - val intent = ThemedMediaPickerActivity.withThemed(context) - .getMedia(data.data!!) - .extras(Bundle { this[EXTRA_TYPES] = intArrayOf(ParcelableMedia.Type.ANIMATED_GIF) }) - .build() + val intent = context?.let { + ThemedMediaPickerActivity.withThemed(it) + .getMedia(data.data!!) + .extras(Bundle { this[EXTRA_TYPES] = intArrayOf(ParcelableMedia.Type.ANIMATED_GIF) }) + .build() + } startActivityForResult(intent, REQUEST_PICK_MEDIA) } } @@ -275,7 +278,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment?> { - return ConversationLoader(context, accountKey, conversationId) + return ConversationLoader(context!!, accountKey, conversationId) } override fun onLoadFinished(loader: Loader?>, data: List?) { @@ -309,12 +312,13 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment { val message = adapter.getMessage(menuInfo.position) @@ -344,6 +350,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment { val message = adapter.getMessage(menuInfo.position) @@ -396,6 +403,8 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment?) -> Unit)?>(fragment.context, sources, types, copySrc, deleteSrc) { + ) : AbsAddMediaTask<((List?) -> Unit)?>(fragment.context!!, sources, types, copySrc, deleteSrc) { private val fragmentRef = WeakReference(fragment) @@ -567,7 +581,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment - ) : AbsDeleteMediaTask(fragment.context, + ) : AbsDeleteMediaTask(fragment.context!!, media.mapToArray { Uri.parse(it.uri) }) { init { @@ -606,7 +620,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment { + override fun onLoadInBackground(): MutableList? { atomicConversation.set(DataStoreUtils.findMessageConversation(context, accountKey, conversationId)) return super.onLoadInBackground() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt index f6e377cff..84ce6f35c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt @@ -23,8 +23,8 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.content.Loader +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader import android.view.ContextMenu import android.view.MenuInflater import android.view.MenuItem @@ -74,7 +74,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment by lazy { - Utils.getAccountKeys(context, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context) + Utils.getAccountKeys(context!!, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context!!) } private val errorInfoKey: String = ErrorInfoStore.KEY_DIRECT_MESSAGES @@ -140,11 +140,11 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment?>?) { + override fun onLoaderReset(loader: Loader?>) { adapter.conversations = null } - override fun onLoadFinished(loader: Loader?>?, data: List?) { + override fun onLoadFinished(loader: Loader?>, data: List?) { adapter.conversations = data adapter.drawAccountColors = accountKeys.size > 1 setLoadMoreIndicatorPosition(ILoadMoreSupportAdapter.NONE) @@ -157,7 +157,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment = this@MessagesEntriesFragment.accountKeys }) return true @@ -167,6 +167,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment = this@MessagesEntriesFragment.accountKeys @@ -174,17 +175,19 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment { @@ -240,6 +245,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment 0) { showContent() } else if (accountKeys.isNotEmpty()) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt index a9f9337d9..5379df352 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.fragment.search import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.Constants.EXTRA_QUERY import org.mariotaku.twidere.fragment.ItemsListFragment import org.mariotaku.twidere.loader.MastodonSearchLoader @@ -32,9 +32,9 @@ import org.mariotaku.twidere.loader.MastodonSearchLoader class MastodonSearchFragment : ItemsListFragment() { val query: String - get() = arguments.getString(EXTRA_QUERY)!! + get() = arguments?.getString(EXTRA_QUERY)!! override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { - return MastodonSearchLoader(context, accountKey, query) + return MastodonSearchLoader(context!!, accountKey, query) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/SearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/SearchFragment.kt index 1888f2557..7d38f6089 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/SearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/SearchFragment.kt @@ -24,8 +24,8 @@ import android.content.ContentValues import android.content.Intent import android.os.Bundle import android.provider.SearchRecentSuggestions -import android.support.v4.view.ViewPager.OnPageChangeListener -import android.support.v7.app.AppCompatActivity +import androidx.viewpager.widget.ViewPager.OnPageChangeListener +import androidx.appcompat.app.AppCompatActivity import android.text.TextUtils import android.view.Menu import android.view.MenuInflater @@ -63,10 +63,10 @@ class SearchFragment : AbsToolbarTabPagesFragment(), RefreshScrollTopInterface, OnPageChangeListener, LinkHandlerActivity.HideUiOnScroll { val accountKey: UserKey - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! val query: String - get() = arguments.getString(EXTRA_QUERY)!! + get() = arguments?.getString(EXTRA_QUERY)!! val composePrefix: String get() = when { @@ -83,6 +83,7 @@ class SearchFragment : AbsToolbarTabPagesFragment(), RefreshScrollTopInterface, override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) + val context = context ?: return setHasOptionsMenu(true) if (savedInstanceState == null && !TextUtils.isEmpty(query)) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt index 544b0478f..4eee5bed0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.fragment.status import android.app.Dialog import android.content.DialogInterface import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import org.mariotaku.twidere.constant.IntentConstants.EXTRA_STATUS import org.mariotaku.twidere.extension.applyTheme import org.mariotaku.twidere.extension.onShow @@ -35,7 +35,7 @@ abstract class AbsSimpleStatusOperationDialogFragment : BaseDialogFragment(), Di protected abstract val message: String protected val status: ParcelableStatus - get() = arguments.getParcelable(EXTRA_STATUS)!! + get() = arguments?.getParcelable(EXTRA_STATUS)!! final override fun onClick(dialog: DialogInterface, which: Int) { when (which) { @@ -46,7 +46,7 @@ abstract class AbsSimpleStatusOperationDialogFragment : BaseDialogFragment(), Di } final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(title) builder.setMessage(message) builder.setPositiveButton(android.R.string.ok, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt index 918500b45..3f22c79e0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt @@ -25,8 +25,8 @@ import android.content.Context import android.content.DialogInterface.BUTTON_NEUTRAL import android.content.DialogInterface.BUTTON_POSITIVE import android.os.Bundle -import android.support.v7.app.AlertDialog -import android.support.v7.app.AlertDialog.Builder +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AlertDialog.Builder import android.view.View import android.widget.Toast import nl.komponents.kovenant.Promise @@ -57,23 +57,23 @@ abstract class AbsStatusDialogFragment : BaseDialogFragment() { protected abstract val Dialog.itemContent: View protected val status: ParcelableStatus? - get() = arguments.getParcelable(EXTRA_STATUS) + get() = arguments?.getParcelable(EXTRA_STATUS) protected val statusId: String - get() = arguments.getString(EXTRA_STATUS_ID)!! + get() = arguments?.getString(EXTRA_STATUS_ID)!! protected val accountKey: UserKey - get() = arguments.getParcelable(EXTRA_ACCOUNT_KEY)!! + get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY)!! private lateinit var adapter: DummyItemAdapter final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = Builder(context) + val builder = Builder(context!!) val accountKey = this.accountKey builder.setupAlertDialog() - adapter = DummyItemAdapter(context, requestManager = requestManager) + adapter = DummyItemAdapter(context!!, requestManager = requestManager) adapter.showCardActions = false adapter.showAccountsColor = true diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt index 391e44e80..4a2cd6d4a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.status import android.app.Dialog import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import org.mariotaku.kpreferences.get import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_STATUS @@ -39,10 +39,10 @@ import org.mariotaku.twidere.model.ParcelableStatus class BlockStatusUsersDialogFragment : BaseDialogFragment() { - private val status: ParcelableStatus get() = arguments.getParcelable(EXTRA_STATUS)!! + private val status: ParcelableStatus get() = arguments?.getParcelable(EXTRA_STATUS)!! override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val referencedUsers = status.referencedUsers val nameFirst = preferences[nameFirstKey] val displayNames = referencedUsers.map { @@ -50,7 +50,7 @@ class BlockStatusUsersDialogFragment : BaseDialogFragment() { }.toTypedArray() builder.setTitle(R.string.action_status_block_users) builder.setItems(displayNames) { _, which -> - CreateUserBlockDialogFragment.show(fragmentManager, referencedUsers[which]) + CreateUserBlockDialogFragment.show(fragmentManager!!, referencedUsers[which]) } val dialog = builder.create() dialog.applyOnShow { applyTheme() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/DestroyStatusDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/DestroyStatusDialogFragment.kt index 43b7e2a27..4b7542f0f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/DestroyStatusDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/DestroyStatusDialogFragment.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.fragment.status import android.os.Bundle -import android.support.v4.app.FragmentManager +import androidx.fragment.app.FragmentManager import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_STATUS import org.mariotaku.twidere.model.ParcelableStatus diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt index bde27fa2e..39c1defe6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt @@ -23,7 +23,8 @@ import android.app.Dialog import android.content.DialogInterface import android.content.DialogInterface.BUTTON_POSITIVE import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.FragmentManager import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.set @@ -84,11 +85,11 @@ class FavoriteConfirmDialogFragment : AbsStatusDialogFragment() { } - override fun onCancel(dialog: DialogInterface?) { + override fun onCancel(dialog: DialogInterface) { finishFavoriteConfirmActivity() } - override fun onDismiss(dialog: DialogInterface?) { + override fun onDismiss(dialog: DialogInterface) { super.onDismiss(dialog) finishFavoriteConfirmActivity() } @@ -104,8 +105,8 @@ class FavoriteConfirmDialogFragment : AbsStatusDialogFragment() { val FRAGMENT_TAG = "favorite_confirm" - fun show(fm: android.support.v4.app.FragmentManager, accountKey: UserKey, statusId: String, - status: ParcelableStatus? = null): FavoriteConfirmDialogFragment { + fun show(fm: FragmentManager, accountKey: UserKey, statusId: String, + status: ParcelableStatus? = null): FavoriteConfirmDialogFragment { val f = FavoriteConfirmDialogFragment() f.arguments = Bundle { this[EXTRA_ACCOUNT_KEY] = accountKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt index 7cf755cd3..1dad27ccc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.status import android.app.Dialog import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import org.mariotaku.kpreferences.get import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_STATUS @@ -39,10 +39,10 @@ import org.mariotaku.twidere.model.ParcelableStatus class MuteStatusUsersDialogFragment : BaseDialogFragment() { - private val status: ParcelableStatus get() = arguments.getParcelable(EXTRA_STATUS)!! + private val status: ParcelableStatus get() = arguments?.getParcelable(EXTRA_STATUS)!! override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val referencedUsers = status.referencedUsers val nameFirst = preferences[nameFirstKey] val displayNames = referencedUsers.map { @@ -50,7 +50,7 @@ class MuteStatusUsersDialogFragment : BaseDialogFragment() { }.toTypedArray() builder.setTitle(R.string.action_status_mute_users) builder.setItems(displayNames) { _, which -> - CreateUserMuteDialogFragment.show(fragmentManager, referencedUsers[which]) + CreateUserMuteDialogFragment.show(fragmentManager!!, referencedUsers[which]) } val dialog = builder.create() dialog.onShow { it.applyTheme() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt index 4eb60ec4f..3e0848743 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt @@ -24,9 +24,9 @@ import android.content.DialogInterface import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.annotation.CheckResult -import android.support.v4.app.FragmentManager -import android.support.v7.app.AlertDialog +import androidx.annotation.CheckResult +import androidx.fragment.app.FragmentManager +import androidx.appcompat.app.AlertDialog import android.view.View import android.widget.CheckBox import android.widget.RelativeLayout @@ -74,7 +74,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { private val Dialog.quoteOriginal: CheckBox get() = findViewById(R.id.quoteOriginal) private val text: String? - get() = arguments.getString(EXTRA_TEXT) + get() = arguments?.getString(EXTRA_TEXT) override fun AlertDialog.Builder.setupAlertDialog() { setTitle(R.string.title_retweet_quote_confirm) @@ -109,7 +109,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { enterHandler.addTextChangedListener(object : SimpleTextWatcher { override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { - dialog.updateTextCount(s, status, account) + dialog?.updateTextCount(s, status, account) } }) @@ -140,10 +140,10 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { } editComment.setSelection(editComment.length()) - dialog.updateTextCount(editComment.text, status, account) + dialog?.updateTextCount(editComment.text, status, account) } - override fun onCancel(dialog: DialogInterface?) { + override fun onCancel(dialog: DialogInterface) { if (dialog !is Dialog) return if (dialog.editComment.empty) return dialog.saveToDrafts() @@ -151,7 +151,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { finishRetweetQuoteActivity() } - override fun onDismiss(dialog: DialogInterface?) { + override fun onDismiss(dialog: DialogInterface) { super.onDismiss(dialog) finishRetweetQuoteActivity() } @@ -200,6 +200,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { showProtectedConfirmation: Boolean): Boolean { val twitter = twitterWrapper val dialog = dialog ?: return false + val context = context ?: return false val editComment = dialog.editComment if (dialog.isQuoteRetweet(account)) { val quoteOriginalStatus = dialog.quoteOriginal.isChecked @@ -271,7 +272,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { } private fun Dialog.saveToDrafts() { - val text = dialog.editComment.text.toString() + val text = dialog?.editComment?.text.toString() val draft = Draft() draft.unique_id = UUID.randomUUID().toString() draft.action_type = Draft.Action.QUOTE @@ -290,6 +291,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { private fun displayNewDraftNotification(draftUri: Uri) { + val context = context ?: return val contentResolver = context.contentResolver val notificationUri = Drafts.CONTENT_URI_NOTIFICATIONS.withAppendedPath(draftUri.lastPathSegment!!) contentResolver.insert(notificationUri, null) @@ -301,7 +303,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { val fragment = parentFragment as RetweetQuoteDialogFragment when (which) { DialogInterface.BUTTON_POSITIVE -> { - val args = arguments + val args = arguments ?: return val account: AccountDetails = args.getParcelable(EXTRA_ACCOUNT)!! val status: ParcelableStatus = args.getParcelable(EXTRA_STATUS)!! if (fragment.retweetOrQuote(account, status, false)) { @@ -314,7 +316,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setMessage(R.string.quote_protected_status_warning_message) builder.setPositiveButton(R.string.send_anyway, this) builder.setNegativeButton(android.R.string.cancel, null) @@ -345,7 +347,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { private val showProtectedConfirm = false fun show(fm: FragmentManager, accountKey: UserKey, statusId: String, - status: ParcelableStatus? = null, text: String? = null): + status: ParcelableStatus? = null, text: String? = null): RetweetQuoteDialogFragment { val f = RetweetQuoteDialogFragment() f.arguments = Bundle { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt index 3cd6855cb..058a157e2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt @@ -32,15 +32,15 @@ import android.nfc.NdefMessage import android.nfc.NdefRecord import android.nfc.NfcAdapter.CreateNdefMessageCallback import android.os.Bundle -import android.support.v4.app.LoaderManager.LoaderCallbacks -import android.support.v4.app.hasRunningLoadersSafe -import android.support.v4.content.FixedAsyncTaskLoader -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog -import android.support.v7.widget.FixedLinearLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.app.hasRunningLoadersSafe +import androidx.loader.content.FixedAsyncTaskLoader +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog +import androidx.recyclerview.widget.FixedLinearLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.text.TextUtils import android.view.* import android.widget.Toast @@ -131,14 +131,14 @@ class StatusFragment : BaseFragment(), LoaderCallbacks> { - override fun onCreateLoader(id: Int, args: Bundle): Loader> { + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { val adapter = this@StatusFragment.adapter adapter.isRepliesLoading = true adapter.isConversationsLoading = true adapter.updateItemDecoration() - val status: ParcelableStatus = args.getParcelable(EXTRA_STATUS)!! + val status: ParcelableStatus = args!!.getParcelable(EXTRA_STATUS)!! val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return ConversationLoader(activity, status, adapter.getData(), true, loadingMore).apply { + return ConversationLoader(activity!!, status, adapter.getData(), true, loadingMore).apply { pagination = args.toPagination() } } @@ -175,10 +175,10 @@ class StatusFragment : BaseFragment(), LoaderCallbacks { - override fun onCreateLoader(id: Int, args: Bundle): Loader { - val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY)!! + override fun onCreateLoader(id: Int, args: Bundle?): Loader { + val accountKey = args!!.getParcelable(EXTRA_ACCOUNT_KEY)!! val statusId = args.getString(EXTRA_STATUS_ID)!! - return StatusActivitySummaryLoader(activity, accountKey, statusId) + return StatusActivitySummaryLoader(activity!!, accountKey, statusId) } override fun onLoadFinished(loader: Loader, data: StatusActivity?) { @@ -203,11 +203,12 @@ class StatusFragment : BaseFragment(), LoaderCallbacks + if (args.containsKey(EXTRA_STATUS)) { + args.putParcelable(EXTRA_STATUS, status) + } + loaderManager.restartLoader(LOADER_ID_DETAIL_STATUS, args, this) } - loaderManager.restartLoader(LOADER_ID_DETAIL_STATUS, args, this) } REQUEST_SELECT_ACCOUNT -> { val status = adapter.status ?: return @@ -230,6 +231,8 @@ class StatusFragment : BaseFragment(), LoaderCallbacks> { + override fun onCreateLoader(id: Int, args: Bundle?): Loader> { val fragmentArgs = arguments - val accountKey = fragmentArgs.getParcelable(EXTRA_ACCOUNT_KEY) + val accountKey = fragmentArgs!!.getParcelable(EXTRA_ACCOUNT_KEY) val statusId = fragmentArgs.getString(EXTRA_STATUS_ID) - return ParcelableStatusLoader(activity, false, fragmentArgs, accountKey, statusId) + return ParcelableStatusLoader(activity!!, false, fragmentArgs, accountKey, statusId) } override fun onLoadFinished(loader: Loader>, - data: SingleResponse) { + data: SingleResponse) { val activity = activity ?: return + val context = context ?: return val status = data.data if (status != null) { val readPosition = saveReadPosition() val dataExtra = data.extras val details: AccountDetails? = dataExtra.getParcelable(EXTRA_ACCOUNT) if (adapter.setStatus(status, details)) { - val args = arguments - if (args.containsKey(EXTRA_STATUS)) { - args.putParcelable(EXTRA_STATUS, status) + arguments?.let { args -> + if (args.containsKey(EXTRA_STATUS)) { + args.putParcelable(EXTRA_STATUS, status) + } } adapter.loadMoreSupportedPosition = ILoadMoreSupportAdapter.BOTH adapter.setData(null) @@ -556,6 +568,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks @@ -623,7 +638,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks(EXTRA_LANGUAGES).sortedArrayWith(LanguageComparator()) - val selectedLanguage = preferences[translationDestinationKey] ?: arguments.getString(EXTRA_SELECTED_LANGUAGE) + val builder = AlertDialog.Builder(context!!) + val languages = arguments?.getTypedArray(EXTRA_LANGUAGES)?.sortedArrayWith(LanguageComparator()) ?: emptyArray() + val selectedLanguage = preferences[translationDestinationKey] ?: arguments?.getString(EXTRA_SELECTED_LANGUAGE) val selectedIndex = languages.indexOfFirst { selectedLanguage == it.code } builder.setTitle(R.string.title_translate_to) builder.setSingleChoiceItems(languages.mapToArray { it.name }, selectedIndex) { _, which -> diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt index 24e5501fe..1afee2421 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import android.view.Menu import android.view.MenuInflater import android.view.MenuItem @@ -41,6 +41,8 @@ import java.util.* class GroupTimelineFragment : ParcelableStatusesFragment() { override val savedStatusesFileArgs: Array? get() { + val context = context ?: return null + val arguments = arguments ?: return null val accountKey = Utils.getAccountKey(context, arguments)!! val groupId = arguments.getString(EXTRA_GROUP_ID) val groupName = arguments.getString(EXTRA_GROUP_NAME) @@ -59,6 +61,7 @@ class GroupTimelineFragment : ParcelableStatusesFragment() { override val readPositionTagWithArguments: String? get() { + val arguments = arguments ?: return null val tabPosition = arguments.getInt(EXTRA_TAB_POSITION, -1) val sb = StringBuilder("group_") if (tabPosition < 0) return null @@ -85,14 +88,18 @@ class GroupTimelineFragment : ParcelableStatusesFragment() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.compose -> { - val accountKey = Utils.getAccountKey(context, arguments) - val groupName = arguments.getString(EXTRA_GROUP_NAME) - if (groupName != null) { - val intent = Intent(activity, ComposeActivity::class.java) - intent.action = INTENT_ACTION_COMPOSE - intent.putExtra(Intent.EXTRA_TEXT, "!$groupName ") - intent.putExtra(EXTRA_ACCOUNT_KEY, accountKey) - startActivity(intent) + context?.let { context -> + arguments?.let { arguments -> + val accountKey = Utils.getAccountKey(context, arguments) + val groupName = arguments.getString(EXTRA_GROUP_NAME) + if (groupName != null) { + val intent = Intent(activity, ComposeActivity::class.java) + intent.action = INTENT_ACTION_COMPOSE + intent.putExtra(Intent.EXTRA_TEXT, "!$groupName ") + intent.putExtra(EXTRA_ACCOUNT_KEY, accountKey) + startActivity(intent) + } + } } return true } @@ -108,7 +115,7 @@ class GroupTimelineFragment : ParcelableStatusesFragment() { val groupName = args.getString(EXTRA_GROUP_NAME) val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return GroupTimelineLoader(activity, accountKey, groupId, groupName, adapterData, + return GroupTimelineLoader(activity!!, accountKey, groupId, groupName, adapterData, savedStatusesFileArgs, tabPosition, fromUser, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt index 8184a1842..d1a9d1767 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.fragment.AbsMediaStatusesFragment import org.mariotaku.twidere.loader.statuses.MediaStatusesSearchLoader @@ -41,7 +41,7 @@ class MediaStatusesSearchFragment : AbsMediaStatusesFragment() { val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val makeGap = args.getBoolean(EXTRA_MAKE_GAP, true) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return MediaStatusesSearchLoader(activity, accountKey, query, adapter.getData(), null, tabPosition, + return MediaStatusesSearchLoader(activity!!, accountKey, query, adapter.getData(), null, tabPosition, fromUser, makeGap, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/NetworkPublicTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/NetworkPublicTimelineFragment.kt index 73f3ddbc1..16806b491 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/NetworkPublicTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/NetworkPublicTimelineFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.fragment.ParcelableStatusesFragment import org.mariotaku.twidere.loader.statuses.NetworkPublicTimelineLoader @@ -36,6 +36,7 @@ class NetworkPublicTimelineFragment : ParcelableStatusesFragment() { override val savedStatusesFileArgs: Array? get() { + val context = context ?: return null val accountKey = Utils.getAccountKey(context, arguments) val result = ArrayList() result.add(AUTHORITY_NETWORK_PUBLIC_TIMELINE) @@ -45,6 +46,7 @@ class NetworkPublicTimelineFragment : ParcelableStatusesFragment() { override val readPositionTagWithArguments: String? get() { + val arguments = arguments ?: return null val tabPosition = arguments.getInt(EXTRA_TAB_POSITION, -1) if (tabPosition < 0) return null return "networkpublic_timeline" diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/PublicTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/PublicTimelineFragment.kt index 43d213551..ccae842f3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/PublicTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/PublicTimelineFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.fragment.ParcelableStatusesFragment import org.mariotaku.twidere.loader.statuses.PublicTimelineLoader @@ -36,6 +36,7 @@ class PublicTimelineFragment : ParcelableStatusesFragment() { override val savedStatusesFileArgs: Array? get() { + val context = context ?: return null val accountKey = Utils.getAccountKey(context, arguments) val result = ArrayList() result.add(AUTHORITY_PUBLIC_TIMELINE) @@ -45,6 +46,7 @@ class PublicTimelineFragment : ParcelableStatusesFragment() { override val readPositionTagWithArguments: String? get() { + val arguments = arguments ?: return null val tabPosition = arguments.getInt(EXTRA_TAB_POSITION, -1) if (tabPosition < 0) return null return "public_timeline" diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt index 09f1d0855..90dc609df 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.fragment.ParcelableStatusesFragment import org.mariotaku.twidere.loader.statuses.TweetSearchLoader @@ -38,6 +38,8 @@ open class StatusesSearchFragment : ParcelableStatusesFragment() { override val savedStatusesFileArgs: Array? get() { + val context = context ?: return null + val arguments = arguments ?: return null val accountKey = Utils.getAccountKey(context, arguments) val query = arguments.getString(EXTRA_QUERY) val local = arguments.getBoolean(EXTRA_LOCAL) @@ -53,6 +55,7 @@ open class StatusesSearchFragment : ParcelableStatusesFragment() { override val readPositionTagWithArguments: String? get() { + val arguments = arguments ?: return null val tabPosition = arguments.getInt(EXTRA_TAB_POSITION, -1) val sb = StringBuilder("search_") if (tabPosition < 0) return null @@ -72,12 +75,12 @@ open class StatusesSearchFragment : ParcelableStatusesFragment() { Loader?> { refreshing = true val accountKey = Utils.getAccountKey(context, args) - val query = arguments.getString(EXTRA_QUERY) - val local = arguments.getBoolean(EXTRA_LOCAL, false) - val tabPosition = arguments.getInt(EXTRA_TAB_POSITION, -1) + val query = arguments!!.getString(EXTRA_QUERY) + val local = arguments!!.getBoolean(EXTRA_LOCAL, false) + val tabPosition = arguments!!.getInt(EXTRA_TAB_POSITION, -1) val makeGap = args.getBoolean(EXTRA_MAKE_GAP, true) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return TweetSearchLoader(activity, accountKey, query, adapterData, savedStatusesFileArgs, + return TweetSearchLoader(activity!!, accountKey, query, adapterData, savedStatusesFileArgs, tabPosition, fromUser, makeGap, local, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt index b1a5cb80b..4e3429493 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.fragment.ParcelableStatusesFragment import org.mariotaku.twidere.loader.statuses.UserFavoritesLoader @@ -38,6 +38,8 @@ class UserFavoritesFragment : ParcelableStatusesFragment() { override val savedStatusesFileArgs: Array? get() { + val arguments = arguments ?: return null + val context = context ?: return null val accountKey = Utils.getAccountKey(context, arguments) val userKey = arguments.getParcelable(EXTRA_USER_KEY) val screenName = arguments.getString(EXTRA_SCREEN_NAME) @@ -56,6 +58,7 @@ class UserFavoritesFragment : ParcelableStatusesFragment() { override val readPositionTagWithArguments: String? get() { + val arguments = arguments ?: return null val tabPosition = arguments.getInt(EXTRA_TAB_POSITION, -1) val sb = StringBuilder("user_favorites_") if (tabPosition < 0) return null diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt index b866fa2ce..b25c04570 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.fragment.ParcelableStatusesFragment @@ -38,6 +38,8 @@ class UserListTimelineFragment : ParcelableStatusesFragment() { override val savedStatusesFileArgs: Array? get() { + val arguments = arguments ?: return null + val context = context ?: return null val accountKey = Utils.getAccountKey(context, arguments) val listId = arguments.getString(EXTRA_LIST_ID) val userKey = arguments.getParcelable(EXTRA_USER_KEY) @@ -63,6 +65,7 @@ class UserListTimelineFragment : ParcelableStatusesFragment() { override val readPositionTagWithArguments: String? get() { + val arguments = arguments ?: return null val tabPosition = arguments.getInt(EXTRA_TAB_POSITION, -1) val sb = StringBuilder("user_list_") if (tabPosition < 0) return null @@ -98,7 +101,7 @@ class UserListTimelineFragment : ParcelableStatusesFragment() { val screenName = args.getString(EXTRA_SCREEN_NAME) val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return UserListTimelineLoader(activity, accountKey, listId, userKey, screenName, listName, + return UserListTimelineLoader(activity!!, accountKey, listId, userKey, screenName, listName, adapterData, savedStatusesFileArgs, tabPosition, fromUser, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt index c5aa47407..3063367ce 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.fragment.AbsMediaStatusesFragment import org.mariotaku.twidere.loader.statuses.MediaTimelineLoader diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt index 9e976e771..cdae7b07b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader +import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.loader.statuses.UserMentionsLoader import org.mariotaku.twidere.model.ParcelableStatus @@ -33,6 +33,8 @@ class UserMentionsFragment : StatusesSearchFragment() { override val savedStatusesFileArgs: Array? get() { + val arguments = arguments ?: return null + val context = context ?: return null val accountKey = Utils.getAccountKey(context, arguments) val screenName = arguments.getString(EXTRA_SCREEN_NAME) val result = ArrayList() @@ -50,7 +52,7 @@ class UserMentionsFragment : StatusesSearchFragment() { val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val makeGap = args.getBoolean(EXTRA_MAKE_GAP, true) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return UserMentionsLoader(activity, accountKey, screenName, adapterData, + return UserMentionsLoader(activity!!, accountKey, screenName, adapterData, savedStatusesFileArgs, tabPosition, fromUser, makeGap, false, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt index 23b05b45e..0d1d93969 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.fragment.statuses import android.app.Dialog import android.content.Context import android.os.Bundle -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog import com.squareup.otto.Subscribe import org.mariotaku.kpreferences.get import org.mariotaku.kpreferences.set @@ -53,6 +53,8 @@ class UserTimelineFragment : ParcelableStatusesFragment() { override val savedStatusesFileArgs: Array? get() { + val arguments = arguments ?: return null + val context = context ?: return null val accountKey = Utils.getAccountKey(context, arguments) val userKey = arguments.getParcelable(EXTRA_USER_KEY) val screenName = arguments.getString(EXTRA_SCREEN_NAME) @@ -79,6 +81,7 @@ class UserTimelineFragment : ParcelableStatusesFragment() { override val readPositionTagWithArguments: String? get() { + val arguments = arguments ?: return null if (arguments.getLong(EXTRA_TAB_ID, -1) < 0) return null val sb = StringBuilder("user_timeline_") @@ -95,7 +98,7 @@ class UserTimelineFragment : ParcelableStatusesFragment() { } override val enableTimelineFilter: Boolean - get() = arguments.getBoolean(EXTRA_ENABLE_TIMELINE_FILTER) + get() = arguments?.getBoolean(EXTRA_ENABLE_TIMELINE_FILTER) ?: false override val timelineFilter: TimelineFilter? get() = if (enableTimelineFilter) preferences[userTimelineFilterKey] else null @@ -127,12 +130,12 @@ class UserTimelineFragment : ParcelableStatusesFragment() { override fun onFilterClick(holder: TimelineFilterHeaderViewHolder) { val df = UserTimelineFilterDialogFragment() df.setTargetFragment(this, REQUEST_SET_TIMELINE_FILTER) - df.show(fragmentManager, "set_timeline_filter") + fragmentManager?.let { df.show(it, "set_timeline_filter") } } @Subscribe fun onStatusPinEvent(event: StatusPinEvent) { - val userKey = arguments.getParcelable(EXTRA_USER_KEY) ?: return + val userKey = arguments?.getParcelable(EXTRA_USER_KEY) ?: return if (event.userKey != userKey) return triggerRefresh() } @@ -146,7 +149,7 @@ class UserTimelineFragment : ParcelableStatusesFragment() { class UserTimelineFilterDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val values = resources.getStringArray(R.array.values_user_timeline_filter) val checkedItems = BooleanArray(values.size) { val filter = preferences[userTimelineFilterKey] diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt index 7173fa94f..771293b5e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt @@ -2,7 +2,7 @@ package org.mariotaku.twidere.fragment.sync import android.app.Dialog import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.Menu import android.view.MenuInflater import android.view.MenuItem @@ -87,16 +87,16 @@ class SyncSettingsFragment : BasePreferenceFragment() { val f = weakThis.get() ?: return@alwaysUi f.dismissProgressDialog("cleanup_sync_cache") f.kPreferences[dataSyncProviderInfoKey] = null - DataSyncProvider.Factory.notifyUpdate(f.context) + f.context?.let { DataSyncProvider.Factory.notifyUpdate(it) } f.activity?.finish() } } class DisconnectSyncConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) val providerInfo = kPreferences[dataSyncProviderInfoKey]!! - val entry = DataSyncProvider.Factory.getProviderEntry(context, providerInfo.type)!! + val entry = DataSyncProvider.Factory.getProviderEntry(context!!, providerInfo.type)!! builder.setMessage(getString(R.string.message_sync_disconnect_from_name_confirm, entry.name)) builder.setPositiveButton(R.string.action_sync_disconnect) { _, _ -> (parentFragment as SyncSettingsFragment).cleanupAndDisconnect() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/IncomingFriendshipsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/IncomingFriendshipsFragment.kt index d269c428f..c28fa8977 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/IncomingFriendshipsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/IncomingFriendshipsFragment.kt @@ -45,7 +45,7 @@ class IncomingFriendshipsFragment : ParcelableUsersFragment(), IUsersAdapter.Req override fun onCreateAdapter(context: Context, requestManager: RequestManager): ParcelableUsersAdapter { val adapter = super.onCreateAdapter(context, requestManager) - val accountKey = arguments.getParcelable(EXTRA_ACCOUNT_KEY) ?: return adapter + val accountKey = arguments?.getParcelable(EXTRA_ACCOUNT_KEY) ?: return adapter if (USER_TYPE_FANFOU_COM == accountKey.host) { adapter.requestClickListener = this } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt index 05c6e71a3..2633a7f15 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt @@ -92,6 +92,7 @@ class UserListMembersFragment : ParcelableUsersFragment() { override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenu.ContextMenuInfo?) { if (!userVisibleHint || menuInfo == null) return + val arguments = arguments ?: return val accountKey = arguments.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = arguments.getParcelable(EXTRA_USER_KEY) if (accountKey == null || accountKey != userKey) return @@ -109,7 +110,7 @@ class UserListMembersFragment : ParcelableUsersFragment() { val user = adapter.getUser(contextMenuInfo.position) ?: return false when (item.itemId) { R.id.delete_from_list -> { - DeleteUserListMembersDialogFragment.show(fragmentManager, userList, user) + fragmentManager?.let { DeleteUserListMembersDialogFragment.show(it, userList, user) } return true } } @@ -119,6 +120,7 @@ class UserListMembersFragment : ParcelableUsersFragment() { @Subscribe fun onUserListMembersChanged(event: UserListMembersChangedEvent) { val userList = event.userList + val arguments = arguments ?: return val accountKey = arguments.getParcelable(EXTRA_ACCOUNT_KEY) ?: return val listId = arguments.getString(EXTRA_LIST_ID) val userKey = arguments.getParcelable(EXTRA_USER_KEY) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/graphic/BadgeDrawable.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/graphic/BadgeDrawable.kt index 3606bad34..417fcabab 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/graphic/BadgeDrawable.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/graphic/BadgeDrawable.kt @@ -5,7 +5,7 @@ import android.graphics.Paint import android.graphics.Rect import android.graphics.RectF import android.graphics.drawable.Drawable -import android.support.v7.graphics.drawable.DrawableWrapper +import androidx.appcompat.graphics.drawable.DrawableWrapper /** * Created by mariotaku on 2017/2/1. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/AccountDetailsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/AccountDetailsLoader.kt index e2711404b..f35821c5c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/AccountDetailsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/AccountDetailsLoader.kt @@ -3,7 +3,7 @@ package org.mariotaku.twidere.loader import android.accounts.AccountManager import android.accounts.OnAccountsUpdateListener import android.content.Context -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import org.mariotaku.ktextension.addOnAccountsUpdatedListenerSafe import org.mariotaku.ktextension.removeOnAccountsUpdatedListenerSafe import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/DefaultAPIConfigLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/DefaultAPIConfigLoader.kt index f124d9609..4357d11b9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/DefaultAPIConfigLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/DefaultAPIConfigLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader import android.content.Context -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import org.mariotaku.restfu.annotation.method.GET import org.mariotaku.restfu.http.HttpRequest import org.mariotaku.restfu.http.RestHttpClient diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt index cc51bd823..57c477d79 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt @@ -29,7 +29,7 @@ import android.content.pm.PackageManager import android.content.res.Configuration import android.content.res.Resources import android.graphics.drawable.Drawable -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import org.mariotaku.twidere.TwidereConstants.* import java.text.Collator import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MastodonSearchLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MastodonSearchLoader.kt index 00a621497..95d9b52cc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MastodonSearchLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MastodonSearchLoader.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.loader import android.accounts.AccountManager import android.content.Context -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.mastodon.Mastodon import org.mariotaku.twidere.Constants diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableStatusLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableStatusLoader.kt index 2c65cdc4c..18d024663 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableStatusLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableStatusLoader.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.loader import android.accounts.AccountManager import android.content.Context import android.os.Bundle -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import org.mariotaku.ktextension.set import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.twitter.model.ErrorInfo diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableUserLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableUserLoader.kt index 1b89676cb..1a1a1ee56 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableUserLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableUserLoader.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.loader import android.accounts.AccountManager import android.content.Context import android.os.Bundle -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import android.text.TextUtils import android.util.Log import org.mariotaku.abstask.library.TaskStarter @@ -195,9 +195,9 @@ class ParcelableUserLoader( forceLoad() } - override fun deliverResult(data: SingleResponse) { + override fun deliverResult(data: SingleResponse?) { super.deliverResult(data) - val user = data.data ?: return + val user = data?.data ?: return if (user.is_cache) return val account = data.extras.getParcelable(EXTRA_ACCOUNT) if (account != null) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/SavedSearchesLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/SavedSearchesLoader.kt index bfe06051c..d1b65bfbe 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/SavedSearchesLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/SavedSearchesLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader import android.content.Context -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import android.util.Log import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.twitter.model.ResponseList diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/BaseGroupsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/BaseGroupsLoader.kt index aab9bcf9d..feb761ad6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/BaseGroupsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/BaseGroupsLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.group import android.content.Context -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.statusnet.model.Group diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt index 6f4e12d8d..479a4f482 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.loader.statuses import android.accounts.AccountManager import android.content.Context import android.content.SharedPreferences -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.kpreferences.get import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.twitter.model.Paging diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ConversationLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ConversationLoader.kt index 481fe9d2c..975b74ccd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ConversationLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ConversationLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.attoparser.config.ParseConfiguration import org.attoparser.dom.DOMMarkupParser import org.mariotaku.commons.parcel.ParcelUtils diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/GroupTimelineLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/GroupTimelineLoader.kt index e8f42642a..1b68dacb4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/GroupTimelineLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/GroupTimelineLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.twitter.model.Paging diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaStatusesSearchLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaStatusesSearchLoader.kt index 27ab15f68..26077f5fc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaStatusesSearchLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaStatusesSearchLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.ktextension.isNullOrEmpty import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaTimelineLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaTimelineLoader.kt index 9abf6516d..359c644d1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaTimelineLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/MediaTimelineLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.ktextension.isNullOrEmpty import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/NetworkPublicTimelineLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/NetworkPublicTimelineLoader.kt index 55185d72f..37477bdc4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/NetworkPublicTimelineLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/NetworkPublicTimelineLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.mastodon.Mastodon diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ParcelableStatusesLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ParcelableStatusesLoader.kt index 94933b80c..b5ce79aec 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ParcelableStatusesLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ParcelableStatusesLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import android.text.TextUtils import org.mariotaku.twidere.loader.iface.IExtendedLoader import org.mariotaku.twidere.model.ParcelableStatus diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/PublicTimelineLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/PublicTimelineLoader.kt index ecfc8d645..c92e19503 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/PublicTimelineLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/PublicTimelineLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.mastodon.Mastodon diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/TweetSearchLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/TweetSearchLoader.kt index 080537e77..bafec138d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/TweetSearchLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/TweetSearchLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.mastodon.Mastodon diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserFavoritesLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserFavoritesLoader.kt index 583a6f990..61b348c29 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserFavoritesLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserFavoritesLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.mastodon.Mastodon diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserListTimelineLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserListTimelineLoader.kt index a8a301ccd..e4f9820d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserListTimelineLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserListTimelineLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.twitter.model.Paging diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserTimelineLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserTimelineLoader.kt index 74629f38f..beaf6f690 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserTimelineLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserTimelineLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.statuses import android.content.Context -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import android.text.TextUtils import okhttp3.HttpUrl import org.attoparser.ParseException diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/BaseUserListsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/BaseUserListsLoader.kt index 584227737..f0023f978 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/BaseUserListsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/BaseUserListsLoader.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.loader.userlists import android.accounts.AccountManager import android.content.Context import android.content.SharedPreferences -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import android.util.Log import org.mariotaku.kpreferences.get import org.mariotaku.microblog.library.MicroBlog diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/ParcelableUsersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/ParcelableUsersLoader.kt index ca4c168ac..8da8a64e7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/ParcelableUsersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/ParcelableUsersLoader.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.loader.users import android.content.Context -import android.support.v4.content.FixedAsyncTaskLoader +import androidx.loader.content.FixedAsyncTaskLoader import org.mariotaku.twidere.loader.iface.IExtendedLoader import org.mariotaku.twidere.model.ParcelableUser import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserBlocksLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserBlocksLoader.kt index 58edc4483..38aef3b88 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserBlocksLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserBlocksLoader.kt @@ -70,7 +70,7 @@ class UserBlocksLoader( } } - override fun onLoadInBackground(): List { + override fun onLoadInBackground(): List? { filteredUsers = DataStoreUtils.getFilteredUserKeys(context, FilterScope.ALL) return super.onLoadInBackground() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt index 953b3ec68..f25c791f5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt @@ -3,7 +3,7 @@ package org.mariotaku.twidere.menu import android.accounts.AccountManager import android.content.Context import android.content.Intent -import android.support.v4.view.ActionProvider +import androidx.core.view.ActionProvider import android.view.Menu import android.view.SubMenu import org.mariotaku.twidere.TwidereConstants diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt index 2a24ee8ef..4c4bd3d77 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt @@ -22,10 +22,10 @@ package org.mariotaku.twidere.menu import android.content.Context import android.graphics.PorterDuff import android.graphics.drawable.Drawable -import android.support.v4.content.ContextCompat -import android.support.v4.view.ActionProvider -import android.support.v4.view.MenuItemCompat -import android.support.v7.widget.ActionMenuView +import androidx.core.content.ContextCompat +import androidx.core.view.ActionProvider +import androidx.core.view.MenuItemCompat +import androidx.appcompat.widget.ActionMenuView import android.view.MenuItem import android.view.View import org.mariotaku.ktextension.weak diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt index 77842c900..483694cfd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt @@ -20,9 +20,9 @@ package org.mariotaku.twidere.menu import android.content.Context -import android.support.v4.view.ActionProvider -import android.support.v4.view.MenuItemCompat -import android.support.v7.widget.ActionMenuView +import androidx.core.view.ActionProvider +import androidx.core.view.MenuItemCompat +import androidx.appcompat.widget.ActionMenuView import android.view.MenuItem import org.mariotaku.twidere.extension.view.findItemView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/SupportStatusShareProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/SupportStatusShareProvider.kt index 4e83b77f4..7f59e8126 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/SupportStatusShareProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/SupportStatusShareProvider.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.menu import android.content.Context -import android.support.v4.view.ActionProvider +import androidx.core.view.ActionProvider import android.view.MenuItem import android.view.SubMenu import org.mariotaku.twidere.Constants.MENU_GROUP_STATUS_SHARE diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/AccountPreferences.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/AccountPreferences.kt index 4dd9290da..40566dd03 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/AccountPreferences.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/AccountPreferences.kt @@ -24,7 +24,7 @@ import android.content.Context import android.content.SharedPreferences import android.media.RingtoneManager import android.net.Uri -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.TextUtils import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.contains diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.kt index 8ecc7952e..1efd9b6a0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.kt @@ -3,7 +3,7 @@ package org.mariotaku.twidere.model import android.content.Context import android.content.res.Resources import android.graphics.Typeface -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.SpannableString import android.text.SpannableStringBuilder import android.text.Spanned diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/SupportTabSpec.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/SupportTabSpec.kt index f68b5854c..5072c8118 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/SupportTabSpec.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/SupportTabSpec.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import org.mariotaku.twidere.annotation.CustomTabType import org.mariotaku.twidere.model.tab.DrawableHolder import org.mariotaku.twidere.util.CompareUtils.bundleEquals diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/notification/NotificationChannelSpec.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/notification/NotificationChannelSpec.kt index a7c047cb5..eeaaf0b82 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/notification/NotificationChannelSpec.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/notification/NotificationChannelSpec.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.notification import android.app.NotificationManager -import android.support.annotation.StringRes +import androidx.annotation.StringRes import org.mariotaku.twidere.R /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/TabConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/TabConfiguration.kt index b6ee0bb6d..88a6eecf0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/TabConfiguration.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/TabConfiguration.kt @@ -21,9 +21,9 @@ package org.mariotaku.twidere.model.tab import android.content.Context import android.content.Intent -import android.support.annotation.CallSuper -import android.support.annotation.StringRes -import android.support.v4.app.Fragment +import androidx.annotation.CallSuper +import androidx.annotation.StringRes +import androidx.fragment.app.Fragment import android.view.View import android.view.ViewGroup import android.widget.Toast diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMessageUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMessageUtils.kt index 4d9fa069c..d626aa1cc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMessageUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMessageUtils.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.model.util -import android.support.annotation.FloatRange +import androidx.annotation.FloatRange import org.mariotaku.microblog.library.twitter.model.DMResponse import org.mariotaku.microblog.library.twitter.model.DMResponse.Entry.Message import org.mariotaku.microblog.library.twitter.model.DMResponse.Entry.Message.Data diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt index dc9eab281..601c58569 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.model.util import android.content.ContentResolver -import android.support.v4.util.ArraySet +import androidx.collection.ArraySet import org.mariotaku.microblog.library.twitter.model.User import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.extension.bulkInsert diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AccountsListPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AccountsListPreference.kt index b8bdefc6f..b97828778 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AccountsListPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AccountsListPreference.kt @@ -24,11 +24,11 @@ import android.annotation.SuppressLint import android.content.Context import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener -import android.support.v7.internal.widget.PreferenceImageView -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceManager -import android.support.v7.preference.PreferenceViewHolder -import android.support.v7.widget.SwitchCompat +import androidx.preference.internal.PreferenceImageView +import androidx.preference.Preference +import androidx.preference.PreferenceManager +import androidx.preference.PreferenceViewHolder +import androidx.appcompat.widget.SwitchCompat import android.util.AttributeSet import android.view.View import android.widget.ImageView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AsyncTaskPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AsyncTaskPreference.kt index 2af7ad9ad..f88b73130 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AsyncTaskPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/AsyncTaskPreference.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.preference import android.content.Context import android.os.AsyncTask import android.os.AsyncTask.Status -import android.support.v7.preference.Preference +import androidx.preference.Preference import android.util.AttributeSet import org.mariotaku.chameleon.ChameleonUtils import org.mariotaku.ktextension.dismissDialogFragment diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/CardPreviewPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/CardPreviewPreference.kt index c385fa046..acf430ec2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/CardPreviewPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/CardPreviewPreference.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.preference import android.content.Context import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceViewHolder -import android.support.v7.widget.RecyclerView +import androidx.preference.Preference +import androidx.preference.PreferenceViewHolder +import androidx.recyclerview.widget.RecyclerView import android.util.AttributeSet import com.bumptech.glide.Glide import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt index 404792984..23ecc79c3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt @@ -24,12 +24,12 @@ import android.content.Context import android.content.DialogInterface import android.graphics.Color import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.app.AlertDialog -import android.support.v7.preference.DialogPreference -import android.support.v7.preference.PreferenceDialogFragmentCompat -import android.support.v7.preference.PreferenceFragmentCompat -import android.support.v7.preference.PreferenceViewHolder +import androidx.core.content.ContextCompat +import androidx.appcompat.app.AlertDialog +import androidx.preference.DialogPreference +import androidx.preference.PreferenceDialogFragmentCompat +import androidx.preference.PreferenceFragmentCompat +import androidx.preference.PreferenceViewHolder import android.util.AttributeSet import android.util.Log import android.widget.ImageView @@ -81,7 +81,7 @@ class ColorPickerPreference(context: Context, attrs: AttributeSet? = null) : override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = ColorPickerPreferenceDialogFragment.newInstance(key) df.setTargetFragment(fragment, 0) - df.show(fragment.fragmentManager, key) + fragment.fragmentManager?.let { df.show(it, key) } } override fun onBindViewHolder(holder: PreferenceViewHolder) { @@ -97,7 +97,7 @@ class ColorPickerPreference(context: Context, attrs: AttributeSet? = null) : override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val preference = preference as ColorPickerPreference val context = context - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(preference.dialogTitle) builder.setView(R.layout.cp__dialog_color_picker) builder.setPositiveButton(android.R.string.ok, this) @@ -118,6 +118,7 @@ class ColorPickerPreference(context: Context, attrs: AttributeSet? = null) : } override fun onShow(dialog: DialogInterface) { + val context = context ?: return val preference = preference as ColorPickerPreference val alertDialog = dialog as AlertDialog alertDialog.applyTheme() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt index b5f8c7db2..d4076d7a2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.preference import android.content.Context -import android.support.v7.preference.DialogPreference -import android.support.v7.preference.PreferenceFragmentCompat +import androidx.preference.DialogPreference +import androidx.preference.PreferenceFragmentCompat import android.util.AttributeSet import org.mariotaku.twidere.R import org.mariotaku.twidere.fragment.APIEditorDialogFragment @@ -35,7 +35,7 @@ class DefaultAPIPreference( override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = APIEditorDialogFragment() df.setTargetFragment(fragment, 0) - df.show(fragment.fragmentManager, key) + fragment.fragmentManager?.let { df.show(it, key) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/FavoriteConfirmSwitchPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/FavoriteConfirmSwitchPreference.kt index 41d4075b1..a255872d8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/FavoriteConfirmSwitchPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/FavoriteConfirmSwitchPreference.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.preference import android.content.Context -import android.support.v7.preference.PreferenceManager -import android.support.v7.preference.SwitchPreferenceCompat +import androidx.preference.PreferenceManager +import androidx.preference.SwitchPreferenceCompat import android.util.AttributeSet import org.mariotaku.kpreferences.get import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/HiddenSettingEntryPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/HiddenSettingEntryPreference.kt index 944b3e839..a824b2385 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/HiddenSettingEntryPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/HiddenSettingEntryPreference.kt @@ -3,8 +3,8 @@ package org.mariotaku.twidere.preference import android.annotation.SuppressLint import android.content.Context import android.content.Intent -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceManager +import androidx.preference.Preference +import androidx.preference.PreferenceManager import android.util.AttributeSet import org.mariotaku.twidere.constant.IntentConstants.INTENT_ACTION_HIDDEN_SETTINGS_ENTRY diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt index cf7c3a739..5fd786a23 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt @@ -4,10 +4,10 @@ import android.content.Context import android.content.DialogInterface import android.content.SharedPreferences import android.os.Bundle -import android.support.v7.app.AlertDialog -import android.support.v7.preference.DialogPreference -import android.support.v7.preference.PreferenceDialogFragmentCompat -import android.support.v7.preference.PreferenceFragmentCompat +import androidx.appcompat.app.AlertDialog +import androidx.preference.DialogPreference +import androidx.preference.PreferenceDialogFragmentCompat +import androidx.preference.PreferenceFragmentCompat import android.text.TextUtils import android.util.AttributeSet import android.util.Log @@ -72,7 +72,7 @@ class KeyboardShortcutPreference(context: Context, attrs: AttributeSet? = null) override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = KeyboardShortcutDialogFragment.newInstance(action) df.setTargetFragment(fragment, 0) - df.show(fragment.fragmentManager, action) + fragment.fragmentManager?.let { df.show(it, action) } } class KeyboardShortcutDialogFragment : ThemedPreferenceDialogFragmentCompat(), DialogInterface.OnKeyListener { @@ -127,7 +127,7 @@ class KeyboardShortcutPreference(context: Context, attrs: AttributeSet? = null) } else { conflictLabel.visibility = View.VISIBLE val label = KeyboardShortcutsHandler.getActionLabel(context, oldAction) - conflictLabel.text = context.getString(R.string.conflicts_with_name, label) + conflictLabel.text = context?.getString(R.string.conflicts_with_name, label) (dialog as? AlertDialog)?.getButton(DialogInterface.BUTTON_POSITIVE)?.setText(R.string.overwrite) } return true diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/PremiumEntryPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/PremiumEntryPreference.kt index 226eabb99..9690b0efe 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/PremiumEntryPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/PremiumEntryPreference.kt @@ -1,9 +1,9 @@ package org.mariotaku.twidere.preference import android.content.Context -import android.support.v4.app.FragmentActivity -import android.support.v7.preference.Preference -import android.support.v7.preference.Preference.OnPreferenceClickListener +import androidx.fragment.app.FragmentActivity +import androidx.preference.Preference +import androidx.preference.Preference.OnPreferenceClickListener import android.util.AttributeSet import org.mariotaku.chameleon.ChameleonUtils import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt index 564fd3639..52acc7b12 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt @@ -3,12 +3,12 @@ package org.mariotaku.twidere.preference import android.accounts.AccountManager import android.content.Context import android.content.res.TypedArray -import android.support.v4.util.ArraySet -import android.support.v7.preference.DialogPreference -import android.support.v7.preference.PreferenceDialogFragmentCompat -import android.support.v7.preference.PreferenceFragmentCompat -import android.support.v7.preference.PreferenceViewHolder -import android.support.v7.widget.SwitchCompat +import androidx.collection.ArraySet +import androidx.preference.DialogPreference +import androidx.preference.PreferenceDialogFragmentCompat +import androidx.preference.PreferenceFragmentCompat +import androidx.preference.PreferenceViewHolder +import androidx.appcompat.widget.SwitchCompat import android.util.AttributeSet import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.set @@ -41,7 +41,7 @@ class RandomizeAccountNamePreference @JvmOverloads constructor( override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) - val switchView = holder.findViewById(android.support.v7.preference.R.id.switchWidget) as SwitchCompat + val switchView = holder.findViewById(androidx.preference.R.id.switchWidget) as SwitchCompat switchView.isChecked = getPersistedBoolean(false) } @@ -58,14 +58,14 @@ class RandomizeAccountNamePreference @JvmOverloads constructor( override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = RenameAccountsConfirmDialogFragment.newInstance(key, getPersistedBoolean(false)) df.setTargetFragment(fragment, 0) - df.show(fragment.fragmentManager, key) + fragment.fragmentManager?.let { df.show(it, key) } } class RenameAccountsConfirmDialogFragment : PreferenceDialogFragmentCompat() { override fun onDialogClosed(positiveResult: Boolean) { val am = AccountManager.get(context) - val enabled = arguments.getBoolean(ARG_VALUE) + val enabled = arguments?.getBoolean(ARG_VALUE) ?: false if (enabled) { val usedNames = ArraySet() AccountUtils.getAccounts(am).forEach { oldAccount -> diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RefreshIntervalPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RefreshIntervalPreference.kt index a93ac3bb8..4957ef174 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RefreshIntervalPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RefreshIntervalPreference.kt @@ -4,7 +4,7 @@ import android.app.job.JobInfo import android.content.Context import android.content.SharedPreferences import android.os.Build -import android.support.v7.preference.PreferenceManager +import androidx.preference.PreferenceManager import android.util.AttributeSet import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.toLongOr diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt index 1bf5ef0d1..7d2421e4d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.preference import android.content.Context -import android.support.v7.preference.EditTextPreference -import android.support.v7.preference.PreferenceFragmentCompat +import androidx.preference.EditTextPreference +import androidx.preference.PreferenceFragmentCompat import android.util.AttributeSet import org.mariotaku.twidere.fragment.ThemedEditTextPreferenceDialogFragmentCompat @@ -36,6 +36,6 @@ class ThemedEditTextPreference(context: Context, attrs: AttributeSet? = null) : override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = ThemedEditTextPreferenceDialogFragmentCompat.newInstance(key) df.setTargetFragment(fragment, 0) - df.show(fragment.fragmentManager, key) + fragment.fragmentManager?.let { df.show(it, key) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt index b9fd8af7f..d2972f115 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt @@ -1,8 +1,8 @@ package org.mariotaku.twidere.preference import android.content.Context -import android.support.v7.preference.ListPreference -import android.support.v7.preference.PreferenceFragmentCompat +import androidx.preference.ListPreference +import androidx.preference.PreferenceFragmentCompat import android.util.AttributeSet import org.mariotaku.twidere.fragment.ThemedListPreferenceDialogFragmentCompat @@ -17,6 +17,6 @@ open class ThemedListPreference(context: Context, attrs: AttributeSet? = null) : override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = ThemedListPreferenceDialogFragmentCompat.newInstance(key) df.setTargetFragment(fragment, 0) - df.show(fragment.fragmentManager, key) + fragment.fragmentManager?.let { df.show(it, key) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/TintedPreferenceCategory.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/TintedPreferenceCategory.kt index d75bd0293..7c268bcdf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/TintedPreferenceCategory.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/TintedPreferenceCategory.kt @@ -1,8 +1,8 @@ package org.mariotaku.twidere.preference import android.content.Context -import android.support.v7.preference.PreferenceCategory -import android.support.v7.preference.PreferenceViewHolder +import androidx.preference.PreferenceCategory +import androidx.preference.PreferenceViewHolder import android.util.AttributeSet import android.widget.TextView import org.mariotaku.chameleon.Chameleon diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/iface/IDialogPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/iface/IDialogPreference.kt index 51feeae26..2bf23f71e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/iface/IDialogPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/iface/IDialogPreference.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.preference.iface -import android.support.v7.preference.PreferenceFragmentCompat +import androidx.preference.PreferenceFragmentCompat /** * Created by mariotaku on 16/3/13. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/notification/AccountNotificationChannelsPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/notification/AccountNotificationChannelsPreference.kt index 2f4de0848..40d2f243d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/notification/AccountNotificationChannelsPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/notification/AccountNotificationChannelsPreference.kt @@ -24,9 +24,9 @@ import android.content.Context import android.content.Intent import android.os.Build import android.provider.Settings -import android.support.v7.preference.Preference -import android.support.v7.preference.Preference.OnPreferenceClickListener -import android.support.v7.preference.PreferenceManager +import androidx.preference.Preference +import androidx.preference.Preference.OnPreferenceClickListener +import androidx.preference.PreferenceManager import android.util.AttributeSet import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.extension.model.getDescription diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/sync/SyncItemPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/sync/SyncItemPreference.kt index 9137b0bc7..636051ce5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/sync/SyncItemPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/sync/SyncItemPreference.kt @@ -2,7 +2,7 @@ package org.mariotaku.twidere.preference.sync import android.content.Context import android.content.SharedPreferences -import android.support.v7.preference.SwitchPreferenceCompat +import androidx.preference.SwitchPreferenceCompat import android.util.AttributeSet import android.view.View import android.widget.TextView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt index 4018ec390..761bbe6c9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt @@ -9,6 +9,8 @@ import android.graphics.BitmapFactory import android.net.Uri import android.os.ParcelFileDescriptor import okio.ByteString +import okio.ByteString.Companion.decodeBase64 +import okio.ByteString.Companion.encodeUtf8 import org.mariotaku.mediaviewer.library.FileCache import org.mariotaku.twidere.TwidereConstants.AUTHORITY_TWIDERE_CACHE import org.mariotaku.twidere.TwidereConstants.QUERY_PARAM_TYPE @@ -148,7 +150,7 @@ class CacheProvider : ContentProvider() { val builder = Uri.Builder() builder.scheme(ContentResolver.SCHEME_CONTENT) builder.authority(AUTHORITY_TWIDERE_CACHE) - builder.appendPath(ByteString.encodeUtf8(key).base64Url()) + builder.appendPath(key.encodeUtf8().base64Url()) if (type != null) { builder.appendQueryParameter(QUERY_PARAM_TYPE, type) } @@ -160,7 +162,7 @@ class CacheProvider : ContentProvider() { throw IllegalArgumentException(uri.toString()) if (AUTHORITY_TWIDERE_CACHE != uri.authority) throw IllegalArgumentException(uri.toString()) - return ByteString.decodeBase64(uri.lastPathSegment)!!.utf8() + return uri.lastPathSegment?.decodeBase64()!!.utf8() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/TwidereDataProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/TwidereDataProvider.kt index f26a08ced..5b152db4b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/TwidereDataProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/TwidereDataProvider.kt @@ -32,7 +32,7 @@ import android.os.Binder import android.os.Handler import android.os.Looper import android.os.Process -import android.support.v4.text.BidiFormatter +import androidx.core.text.BidiFormatter import com.squareup.otto.Bus import okhttp3.Dns import org.mariotaku.ktextension.isNullOrEmpty diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/ConnectivityStateReceiver.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/ConnectivityStateReceiver.kt index 3af0d9339..f4079496a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/ConnectivityStateReceiver.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/receiver/ConnectivityStateReceiver.kt @@ -23,7 +23,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.net.ConnectivityManager -import android.support.v4.net.ConnectivityManagerCompat +import androidx.core.net.ConnectivityManagerCompat import org.mariotaku.twidere.service.StreamingService import org.mariotaku.twidere.util.dagger.DependencyHolder diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/service/LengthyOperationsService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/service/LengthyOperationsService.kt index d9af92c15..1769c2a0c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/service/LengthyOperationsService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/service/LengthyOperationsService.kt @@ -26,9 +26,9 @@ import android.content.Context import android.content.Intent import android.os.Handler import android.os.Looper -import android.support.annotation.UiThread -import android.support.annotation.WorkerThread -import android.support.v4.app.NotificationCompat +import androidx.annotation.UiThread +import androidx.annotation.WorkerThread +import androidx.core.app.NotificationCompat import android.text.TextUtils import android.util.Log import android.widget.Toast diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt index 2d2ab5005..885631828 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt @@ -7,10 +7,10 @@ import android.content.Context import android.content.Intent import android.os.Handler import android.os.Looper -import android.support.annotation.UiThread -import android.support.annotation.WorkerThread -import android.support.v4.app.NotificationCompat -import android.support.v4.net.ConnectivityManagerCompat +import androidx.annotation.UiThread +import androidx.annotation.WorkerThread +import androidx.core.app.NotificationCompat +import androidx.core.net.ConnectivityManagerCompat import org.mariotaku.abstask.library.TaskStarter import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.addOnAccountsUpdatedListenerSafe diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt index bd1567707..0890733c4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.task import android.content.Context -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import org.mariotaku.twidere.activity.iface.IBaseActivity import org.mariotaku.twidere.fragment.ProgressDialogFragment import java.io.File diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/UpdateAccountInfoTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/UpdateAccountInfoTask.kt index ed8c7c993..25c0b03ff 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/UpdateAccountInfoTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/UpdateAccountInfoTask.kt @@ -5,7 +5,7 @@ import android.accounts.AccountManager import android.content.ContentResolver import android.content.ContentValues import android.content.Context -import android.support.v4.util.LongSparseArray +import androidx.collection.LongSparseArray import android.text.TextUtils import org.mariotaku.abstask.library.AbstractTask import org.mariotaku.library.objectcursor.ObjectCursor diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/cache/CacheTimelineResultTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/cache/CacheTimelineResultTask.kt index 070bb9525..815b5476f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/cache/CacheTimelineResultTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/cache/CacheTimelineResultTask.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.task.cache import android.content.Context -import android.support.v4.util.ArraySet +import androidx.collection.ArraySet import org.mariotaku.ktextension.ContentValues import org.mariotaku.ktextension.set import org.mariotaku.sqliteqb.library.Expression diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesTask.kt index 25ce049a7..00642782c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesTask.kt @@ -4,7 +4,7 @@ import android.accounts.AccountManager import android.content.ContentValues import android.content.Context import android.net.Uri -import android.support.annotation.UiThread +import androidx.annotation.UiThread import org.mariotaku.kpreferences.get import org.mariotaku.library.objectcursor.ObjectCursor import org.mariotaku.microblog.library.MicroBlogException diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetTrendsTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetTrendsTask.kt index d1835368a..83b082d9a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetTrendsTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetTrendsTask.kt @@ -24,7 +24,7 @@ import android.content.ContentResolver import android.content.ContentValues import android.content.Context import android.net.Uri -import android.support.v4.util.ArraySet +import androidx.collection.ArraySet import org.mariotaku.library.objectcursor.ObjectCursor import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt index 278ab1c07..d352318ed 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt @@ -9,9 +9,9 @@ import android.graphics.Point import android.media.MediaMetadataRetriever import android.net.Uri import android.os.Build -import android.support.annotation.UiThread -import android.support.annotation.WorkerThread -import android.support.media.ExifInterface +import androidx.annotation.UiThread +import androidx.annotation.WorkerThread +import androidx.exifinterface.media.ExifInterface import android.text.TextUtils import android.webkit.MimeTypeMap import net.ypresto.androidtranscoder.MediaTranscoder @@ -935,8 +935,9 @@ class UpdateStatusTask( } } "image/jpeg" -> { - val origExif = context.contentResolver.openInputStream(mediaUri) - .use(::ExifInterface) + val origExif = context.contentResolver.openInputStream(mediaUri)?.use { + ExifInterface(it) + } ?: return null tempFile.outputStream().use { os -> bitmap.compress(Bitmap.CompressFormat.JPEG, 85, os) os.flush() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentScrollHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentScrollHandler.kt index dd48dba65..40bc962e9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentScrollHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentScrollHandler.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import android.annotation.SuppressLint -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.MotionEvent import android.view.View diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreFunctions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreFunctions.kt index f156d48ac..a1c6635eb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreFunctions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreFunctions.kt @@ -6,8 +6,8 @@ import android.content.Context import android.database.Cursor import android.net.Uri import android.provider.BaseColumns -import android.support.annotation.WorkerThread -import android.support.v4.util.LongSparseArray +import androidx.annotation.WorkerThread +import androidx.collection.LongSparseArray import org.mariotaku.ktextension.mapToArray import org.mariotaku.ktextension.toStringArray import org.mariotaku.library.objectcursor.ObjectCursor diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt index bf1f6635d..5cfe0b5ba 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt @@ -26,7 +26,7 @@ import android.net.Uri import android.os.Bundle import android.os.Parcelable import android.provider.BaseColumns -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import android.text.TextUtils import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.mapToArray diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DeviceUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DeviceUtils.kt index 700838051..1493307d6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DeviceUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DeviceUtils.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.util import android.content.Context import android.os.Build -import android.support.v7.view.menu.MenuBuilder +import androidx.appcompat.view.menu.MenuBuilder import android.util.DisplayMetrics import android.view.Menu import android.view.WindowManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DirectMessageOnLinkClickHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DirectMessageOnLinkClickHandler.kt index a47e458fe..fd011b001 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DirectMessageOnLinkClickHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DirectMessageOnLinkClickHandler.kt @@ -23,7 +23,7 @@ import android.content.Context import android.content.SharedPreferences import android.net.Uri import android.os.Bundle -import android.support.v4.app.FragmentActivity +import androidx.fragment.app.FragmentActivity import org.mariotaku.kpreferences.get import org.mariotaku.twidere.constant.IntentConstants.EXTRA_URI import org.mariotaku.twidere.constant.phishingLinksWaringKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ErrorInfoStore.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ErrorInfoStore.kt index fbb82544f..7aac6f5b3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ErrorInfoStore.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ErrorInfoStore.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util import android.content.Context -import android.support.annotation.DrawableRes +import androidx.annotation.DrawableRes import org.mariotaku.twidere.R import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ExternalThemeManager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ExternalThemeManager.kt index 1bd6e859e..08c7c19d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ExternalThemeManager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ExternalThemeManager.kt @@ -25,7 +25,7 @@ import android.content.SharedPreferences import android.content.pm.PackageManager import android.content.res.Resources import android.graphics.drawable.Drawable -import android.support.v4.content.res.ResourcesCompat +import androidx.core.content.res.ResourcesCompat import android.util.LruCache import org.mariotaku.twidere.constant.SharedPreferenceConstants.KEY_EMOJI_SUPPORT diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt index aeb976b1b..697669e94 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt @@ -10,9 +10,9 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Parcelable -import android.support.customtabs.CustomTabsIntent -import android.support.v4.app.ActivityCompat -import android.support.v4.app.FragmentActivity +import androidx.browser.customtabs.CustomTabsIntent +import androidx.core.app.ActivityCompat +import androidx.fragment.app.FragmentActivity import android.text.TextUtils import org.mariotaku.chameleon.Chameleon import org.mariotaku.chameleon.ChameleonUtils diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MapFragmentFactory.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MapFragmentFactory.kt index 840daf657..ac41fd066 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MapFragmentFactory.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MapFragmentFactory.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import android.content.Context -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import java.util.* /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt index e267af7b5..e6b678b73 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt @@ -28,12 +28,12 @@ import android.content.SharedPreferences import android.content.pm.PackageManager import android.graphics.PorterDuff import android.os.Parcelable -import android.support.annotation.UiThread -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.content.ContextCompat -import android.support.v4.view.MenuItemCompat -import android.support.v7.widget.ShareActionProvider +import androidx.annotation.UiThread +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.core.content.ContextCompat +import androidx.core.view.MenuItemCompat +import androidx.appcompat.widget.ShareActionProvider import android.util.Log import android.view.ContextMenu import android.view.Menu @@ -213,8 +213,8 @@ object MenuUtils { } fun handleStatusClick(context: Context, fragment: Fragment?, fm: FragmentManager, - preferences: SharedPreferences, colorNameManager: UserColorNameManager, - twitter: AsyncTwitterWrapper, status: ParcelableStatus, item: MenuItem): Boolean { + preferences: SharedPreferences, colorNameManager: UserColorNameManager, + twitter: AsyncTwitterWrapper, status: ParcelableStatus, item: MenuItem): Boolean { when (item.itemId) { R.id.copy -> { if (ClipboardUtils.setText(context, status.text_plain)) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/OnLinkClickHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/OnLinkClickHandler.kt index 8d598dd91..6a08a959a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/OnLinkClickHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/OnLinkClickHandler.kt @@ -25,7 +25,7 @@ import android.content.Intent import android.content.SharedPreferences import android.net.Uri import android.os.BadParcelableException -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import okhttp3.HttpUrl import org.mariotaku.kpreferences.get import org.mariotaku.twidere.TwidereConstants.USER_TYPE_TWITTER_COM diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/PreviewGridItemDecoration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/PreviewGridItemDecoration.kt index f12c6b84a..5f0b61de7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/PreviewGridItemDecoration.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/PreviewGridItemDecoration.kt @@ -20,12 +20,12 @@ package org.mariotaku.twidere.util import android.graphics.Rect -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View class PreviewGridItemDecoration(private val previewGridSpacing: Int) : RecyclerView.ItemDecoration() { - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) { + override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { outRect.left = previewGridSpacing outRect.right = previewGridSpacing } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt index ba4d19030..8fe3da1a0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.util -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import org.mariotaku.twidere.util.ContentScrollHandler.ContentListSupport @@ -29,11 +29,11 @@ class RecyclerViewScrollHandler(contentListSupport: ContentListSupport, vi val touchListener: View.OnTouchListener get() = scrollHandler.touchListener - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { scrollHandler.handleScrollStateChanged(newState, RecyclerView.SCROLL_STATE_IDLE) } - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { val scrollState = recyclerView!!.scrollState scrollHandler.handleScroll(dy, scrollState, oldState, RecyclerView.SCROLL_STATE_IDLE) oldState = scrollState diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusAdapterLinkClickHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusAdapterLinkClickHandler.kt index 1739e63af..fca97ccc2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusAdapterLinkClickHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusAdapterLinkClickHandler.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.util import android.content.Context import android.content.SharedPreferences -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import org.mariotaku.kpreferences.get import org.mariotaku.twidere.Constants import org.mariotaku.twidere.adapter.iface.IStatusesAdapter diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/TaskServiceRunner.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/TaskServiceRunner.kt index e4407d388..5f204eaaa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/TaskServiceRunner.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/TaskServiceRunner.kt @@ -2,7 +2,7 @@ package org.mariotaku.twidere.util import android.content.Context import android.content.SharedPreferences -import android.support.annotation.StringDef +import androidx.annotation.StringDef import android.util.Log import com.squareup.otto.Bus import org.mariotaku.abstask.library.AbstractTask diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt index 26535ac24..d0db5a3fa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt @@ -28,17 +28,17 @@ import android.graphics.PorterDuff import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Drawable import android.os.Build -import android.support.annotation.AttrRes -import android.support.annotation.ColorInt -import android.support.annotation.StyleRes -import android.support.v4.content.ContextCompat -import android.support.v4.graphics.ColorUtils -import android.support.v7.app.TwilightManagerAccessor -import android.support.v7.view.menu.ActionMenuItemView -import android.support.v7.widget.ActionMenuView -import android.support.v7.widget.TintTypedArray -import android.support.v7.widget.Toolbar -import android.support.v7.widget.TwidereToolbar +import androidx.annotation.AttrRes +import androidx.annotation.ColorInt +import androidx.annotation.StyleRes +import androidx.core.content.ContextCompat +import androidx.core.graphics.ColorUtils +import androidx.appcompat.app.TwilightManagerAccessor +import androidx.appcompat.view.menu.ActionMenuItemView +import androidx.appcompat.widget.ActionMenuView +import androidx.appcompat.widget.TintTypedArray +import androidx.appcompat.widget.Toolbar +import androidx.appcompat.widget.TwidereToolbar import android.util.TypedValue import android.view.* import android.widget.FrameLayout @@ -371,7 +371,7 @@ object ThemeUtils { fun setCompatContentViewOverlay(window: Window, overlay: Drawable?) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) return - val contentLayout = window.findViewById(android.support.v7.appcompat.R.id.action_bar_activity_content) + val contentLayout = window.findViewById(com.google.android.material.R.id.action_bar_activity_content) ?: window.findViewById(android.R.id.content) ?: return ViewSupport.setForeground(contentLayout, overlay) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwidereViewUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwidereViewUtils.kt index 8d2b39918..8844dc941 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwidereViewUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwidereViewUtils.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util import android.graphics.RectF -import android.support.annotation.UiThread +import androidx.annotation.UiThread import android.view.MotionEvent import android.view.View diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/UserColorNameManager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/UserColorNameManager.kt index 6abf1168a..60c177082 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/UserColorNameManager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/UserColorNameManager.kt @@ -23,8 +23,8 @@ import android.content.Context import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.graphics.Color -import android.support.v4.util.ArrayMap -import android.support.v4.util.LruCache +import androidx.collection.ArrayMap +import androidx.collection.LruCache import org.mariotaku.microblog.library.twitter.model.User import org.mariotaku.twidere.TwidereConstants.USER_COLOR_PREFERENCES_NAME import org.mariotaku.twidere.TwidereConstants.USER_NICKNAME_PREFERENCES_NAME diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt index b42500e90..9a092e80e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt @@ -36,12 +36,12 @@ import android.nfc.NfcAdapter.CreateNdefMessageCallback import android.os.BatteryManager import android.os.Build import android.os.Bundle -import android.support.annotation.DrawableRes -import android.support.annotation.StringRes -import android.support.v4.net.ConnectivityManagerCompat -import android.support.v4.view.GravityCompat -import android.support.v4.view.accessibility.AccessibilityEventCompat -import android.support.v7.app.AppCompatActivity +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.core.net.ConnectivityManagerCompat +import androidx.core.view.GravityCompat +import androidx.core.view.accessibility.AccessibilityEventCompat +import androidx.appcompat.app.AppCompatActivity import android.text.TextUtils import android.text.format.DateFormat import android.text.format.DateUtils @@ -536,7 +536,7 @@ object Utils { return 0 } - fun getActionBarHeight(actionBar: android.support.v7.app.ActionBar?): Int { + fun getActionBarHeight(actionBar: androidx.appcompat.app.ActionBar?): Int { if (actionBar == null) return 0 val context = actionBar.themedContext val tv = TypedValue() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/api/TwitterConverterFactory.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/api/TwitterConverterFactory.kt index 9358b2bb1..00908656b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/api/TwitterConverterFactory.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/api/TwitterConverterFactory.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.util.api -import android.support.v4.util.SimpleArrayMap +import androidx.collection.SimpleArrayMap import com.bluelinelabs.logansquare.JsonMapper import com.bluelinelabs.logansquare.ParameterizedType import org.mariotaku.commons.logansquare.LoganSquareMapperFinder diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt index fc299d1f7..1e944736f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt @@ -22,6 +22,7 @@ package org.mariotaku.twidere.util.cache import android.net.Uri import com.bumptech.glide.disklrucache.DiskLruCache import okio.ByteString +import okio.ByteString.Companion.encode import org.mariotaku.mediaviewer.library.FileCache import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.provider.CacheProvider @@ -86,6 +87,6 @@ class DiskLRUFileCache(val cacheDir: File) : FileCache { } private fun hash(key: String): String { - return ByteString.encodeString(key, Charsets.UTF_8).sha256().hex() + return key.encode(Charsets.UTF_8).sha256().hex() } } \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt index c1d959267..070681bb5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt @@ -25,8 +25,8 @@ import android.location.LocationManager import android.net.ConnectivityManager import android.os.Build import android.os.Looper -import android.support.v4.net.ConnectivityManagerCompat -import android.support.v4.text.BidiFormatter +import androidx.core.net.ConnectivityManagerCompat +import androidx.core.text.BidiFormatter import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSourceFactory import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory import com.google.android.exoplayer2.extractor.ExtractorsFactory diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/GeneralComponent.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/GeneralComponent.kt index ec6758d76..0c8133215 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/GeneralComponent.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/GeneralComponent.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util.dagger import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import dagger.Component import org.mariotaku.twidere.activity.* import org.mariotaku.twidere.adapter.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/PauseRecyclerViewOnScrollListener.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/PauseRecyclerViewOnScrollListener.kt index e0dd4b5a0..ffbacec11 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/PauseRecyclerViewOnScrollListener.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/PauseRecyclerViewOnScrollListener.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.util.glide -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.RequestManager class PauseRecyclerViewOnScrollListener( @@ -28,7 +28,7 @@ class PauseRecyclerViewOnScrollListener( private val requestManager: RequestManager ) : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { when (newState) { RecyclerView.SCROLL_STATE_IDLE -> { if (!requestManager.isPaused) return diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt index dfdab473e..a84452bd5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.ConnectivityManager import android.os.Build -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import org.mariotaku.twidere.extension.activateNetworkCompat import java.net.InetAddress diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/notification/ContentNotificationManager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/notification/ContentNotificationManager.kt index 46769aa23..5e0b302eb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/notification/ContentNotificationManager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/notification/ContentNotificationManager.kt @@ -27,7 +27,7 @@ import android.content.Intent import android.content.SharedPreferences import android.media.AudioManager import android.net.Uri -import android.support.v4.app.NotificationCompat +import androidx.core.app.NotificationCompat import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.forEachRow import org.mariotaku.ktextension.isEmpty diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt index f99883732..a23f53bca 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt @@ -2,7 +2,7 @@ package org.mariotaku.twidere.util.premium import android.content.Context import android.content.Intent -import android.support.annotation.CallSuper +import androidx.annotation.CallSuper import org.mariotaku.twidere.R import org.mariotaku.twidere.view.ContainerView import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/LegacyAutoRefreshController.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/LegacyAutoRefreshController.kt index 8f88cd65d..32ba533e4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/LegacyAutoRefreshController.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/LegacyAutoRefreshController.kt @@ -8,7 +8,7 @@ import android.content.Context import android.content.Intent import android.os.Build import android.os.SystemClock -import android.support.v4.util.ArrayMap +import androidx.collection.ArrayMap import org.mariotaku.kpreferences.KPreferences import org.mariotaku.twidere.annotation.AutoRefreshType import org.mariotaku.twidere.constant.refreshIntervalKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt index 7ccf2995c..3ed434627 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.util.schedule import android.content.Context import android.content.Intent -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.twidere.model.ParcelableStatusUpdate import org.mariotaku.twidere.model.schedule.ScheduleInfo import org.mariotaku.twidere.task.twitter.UpdateStatusTask diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/shortcut/ShortcutCreator.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/shortcut/ShortcutCreator.kt index 082623f52..f11c8b1fb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/shortcut/ShortcutCreator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/shortcut/ShortcutCreator.kt @@ -24,9 +24,9 @@ import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.drawable.Drawable import android.os.Build -import android.support.v4.content.pm.ShortcutInfoCompat -import android.support.v4.content.pm.ShortcutManagerCompat -import android.support.v4.graphics.drawable.IconCompat +import androidx.core.content.pm.ShortcutInfoCompat +import androidx.core.content.pm.ShortcutManagerCompat +import androidx.core.graphics.drawable.IconCompat import com.bumptech.glide.Glide import nl.komponents.kovenant.Promise import nl.komponents.kovenant.combine.and @@ -142,13 +142,14 @@ object ShortcutCreator { } inline fun performCreation(fragment: BaseFragment, createPromise: () -> Promise) { - if (!ShortcutManagerCompat.isRequestPinShortcutSupported(fragment.context)) return + val fragmentContext = fragment.context ?: return + if (!ShortcutManagerCompat.isRequestPinShortcutSupported(fragmentContext)) return val promise = fragment.showProgressDialog("create_shortcut") .and(createPromise()) val weakThis = WeakReference(fragment) promise.successUi { (_, shortcut) -> - val f = weakThis.get() ?: return@successUi - ShortcutManagerCompat.requestPinShortcut(f.context, shortcut, null) + val f = weakThis.get()?.context ?: return@successUi + ShortcutManagerCompat.requestPinShortcut(f, shortcut, null) }.alwaysUi { val f = weakThis.get() ?: return@alwaysUi f.dismissProgressDialog("create_shortcut") diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/TwitterTimelineStreamCallback.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/TwitterTimelineStreamCallback.kt index bfc567c2c..6fe4d86f1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/TwitterTimelineStreamCallback.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/TwitterTimelineStreamCallback.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.util.streaming -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import org.mariotaku.microblog.library.twitter.callback.SimpleUserStreamCallback import org.mariotaku.microblog.library.twitter.model.* import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/support/AccountManagerSupport.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/support/AccountManagerSupport.kt index d1ebc222c..473c5a59b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/support/AccountManagerSupport.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/support/AccountManagerSupport.kt @@ -5,7 +5,7 @@ import android.app.Activity import android.os.Build import android.os.Bundle import android.os.Handler -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import java.io.IOException import java.util.concurrent.TimeUnit diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/FileBasedDraftsSyncAction.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/FileBasedDraftsSyncAction.kt index 96fcf8da3..327ccb0aa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/FileBasedDraftsSyncAction.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/FileBasedDraftsSyncAction.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.util.sync import android.content.Context -import android.support.v4.util.LongSparseArray +import androidx.collection.LongSparseArray import org.mariotaku.ktextension.map import org.mariotaku.ktextension.set import org.mariotaku.library.objectcursor.ObjectCursor diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/ISyncAction.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/ISyncAction.kt index d7ffc6373..c9287637c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/ISyncAction.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/ISyncAction.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.util.sync -import android.support.annotation.WorkerThread +import androidx.annotation.WorkerThread import java.io.IOException /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/LegacySyncController.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/LegacySyncController.kt index 7d97b7aa1..08a967370 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/LegacySyncController.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/LegacySyncController.kt @@ -6,7 +6,7 @@ import android.content.Context import android.content.Intent import android.os.Build import android.os.SystemClock -import android.support.v4.util.ArrayMap +import androidx.collection.ArrayMap import org.mariotaku.twidere.service.JobTaskService import org.mariotaku.twidere.service.LegacyTaskService import org.mariotaku.twidere.util.TaskServiceRunner diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt index 2b367479f..2d8f9515b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt @@ -21,10 +21,11 @@ package org.mariotaku.twidere.util.sync import android.content.Context import android.net.Uri -import android.support.v4.util.ArrayMap +import androidx.collection.ArrayMap import nl.komponents.kovenant.Promise import nl.komponents.kovenant.then import okio.ByteString +import okio.ByteString.Companion.encodeUtf8 import org.mariotaku.twidere.TwidereConstants.TIMELINE_SYNC_CACHE_PREFERENCES_NAME import org.mariotaku.twidere.annotation.ReadPositionTag import org.mariotaku.twidere.util.DebugLog @@ -98,7 +99,7 @@ abstract class TimelineSyncManager(val context: Context) { private fun cacheKey(@ReadPositionTag positionTag: String, currentTag: String?): String { if (currentTag == null) return positionTag - return ByteString.encodeUtf8("$positionTag:${Uri.encode(currentTag)}").sha1().hex() + return "$positionTag:${Uri.encode(currentTag)}".encodeUtf8().sha1().hex() } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt index 445c63368..ec9958a34 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt @@ -22,11 +22,11 @@ package org.mariotaku.twidere.util.view import android.content.Context import android.content.res.TypedArray import android.graphics.Rect -import android.support.annotation.Keep -import android.support.annotation.StyleableRes -import android.support.design.widget.AppBarLayout -import android.support.design.widget.CoordinatorLayout -import android.support.v4.view.ViewCompat +import androidx.annotation.Keep +import androidx.annotation.StyleableRes +import com.google.android.material.appbar.AppBarLayout +import androidx.coordinatorlayout.widget.CoordinatorLayout +import androidx.core.view.ViewCompat import android.util.AttributeSet import android.util.TypedValue import android.view.View diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ActionIconThemedTextView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ActionIconThemedTextView.kt index 0727b33ee..345e9cd1b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ActionIconThemedTextView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ActionIconThemedTextView.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.view import android.annotation.SuppressLint import android.content.Context import android.graphics.PorterDuff.Mode -import android.support.annotation.ColorInt +import androidx.annotation.ColorInt import android.util.AttributeSet import org.mariotaku.chameleon.Chameleon import org.mariotaku.chameleon.ChameleonView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/BoundsImageView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/BoundsImageView.kt index 536dfd089..ce0d3aecd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/BoundsImageView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/BoundsImageView.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.view import android.content.Context import android.graphics.Canvas -import android.support.v7.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatImageView import android.util.AttributeSet /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ComposeEditText.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ComposeEditText.kt index 943e029dc..5ba1b5c9e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ComposeEditText.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ComposeEditText.kt @@ -21,9 +21,9 @@ package org.mariotaku.twidere.view import android.content.Context import android.os.Build -import android.support.v13.view.inputmethod.EditorInfoCompat -import android.support.v13.view.inputmethod.InputConnectionCompat -import android.support.v13.view.inputmethod.InputContentInfoCompat +import androidx.core.view.inputmethod.EditorInfoCompat +import androidx.core.view.inputmethod.InputConnectionCompat +import androidx.core.view.inputmethod.InputContentInfoCompat import android.text.InputType import android.text.Selection import android.text.method.ArrowKeyMovementMethod diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt index 21b46c14a..26b7cb35a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import android.support.v4.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt index 9d2ba7b44..0cd3e63c9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt @@ -23,8 +23,8 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import android.support.v4.view.WindowInsetsCompat -import android.support.v7.widget.AppCompatImageView +import androidx.core.view.WindowInsetsCompat +import androidx.appcompat.widget.AppCompatImageView import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt index 5e9214c39..d85c04097 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import android.support.v4.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRecyclerView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRecyclerView.kt index 6e01b33a5..e2108d5ad 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRecyclerView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRecyclerView.kt @@ -23,7 +23,7 @@ import android.annotation.TargetApi import android.content.Context import android.graphics.Rect import android.os.Build -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.util.AttributeSet import android.util.TypedValue import android.view.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt index 4e3ab3ac9..c0a63c885 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt @@ -25,8 +25,8 @@ import android.content.Context import android.graphics.Rect import android.graphics.drawable.Drawable import android.os.Build -import android.support.annotation.DrawableRes -import android.support.v4.view.WindowInsetsCompat +import androidx.annotation.DrawableRes +import androidx.core.view.WindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt index 2a0da8d15..56c13a857 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import android.support.v4.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedViewPager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedViewPager.kt index f2081253d..bc5124a52 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedViewPager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedViewPager.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.view import android.annotation.SuppressLint import android.content.Context -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.util.AttributeSet import android.view.MotionEvent diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionButton.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionButton.kt index 5583c1304..bbc3e721c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionButton.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionButton.kt @@ -3,9 +3,9 @@ package org.mariotaku.twidere.view import android.content.Context import android.content.res.ColorStateList import android.graphics.Color -import android.support.annotation.ColorInt -import android.support.v4.view.ViewCompat -import android.support.v7.widget.AppCompatImageButton +import androidx.annotation.ColorInt +import androidx.core.view.ViewCompat +import androidx.appcompat.widget.AppCompatImageButton import android.util.AttributeSet import android.widget.ImageView import org.mariotaku.chameleon.Chameleon diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt index 98b630048..f2615ed94 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt @@ -3,9 +3,9 @@ package org.mariotaku.twidere.view import android.content.Context import android.content.res.ColorStateList import android.graphics.Color -import android.support.annotation.ColorInt -import android.support.v4.view.ViewCompat -import android.support.v7.widget.AppCompatImageView +import androidx.annotation.ColorInt +import androidx.core.view.ViewCompat +import androidx.appcompat.widget.AppCompatImageView import android.util.AttributeSet import org.mariotaku.chameleon.Chameleon import org.mariotaku.chameleon.ChameleonView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/NameView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/NameView.kt index 358cf42c5..9df9b6a83 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/NameView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/NameView.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.view import android.content.Context import android.content.res.Resources -import android.support.v4.text.BidiFormatter +import androidx.core.text.BidiFormatter import android.text.SpannableStringBuilder import android.text.Spanned import android.text.TextUtils diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt index ff5d41440..a97275867 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import android.support.v4.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.View diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ShortTimeView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ShortTimeView.kt index da8c469b6..3f326ed14 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ShortTimeView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ShortTimeView.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.view import android.content.Context import android.os.SystemClock -import android.support.v7.widget.AppCompatTextView +import androidx.appcompat.widget.AppCompatTextView import android.text.format.DateUtils import android.util.AttributeSet import org.mariotaku.twidere.Constants diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/StatusTextCountView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/StatusTextCountView.kt index d9358738c..cadd47fe6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/StatusTextCountView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/StatusTextCountView.kt @@ -21,8 +21,8 @@ package org.mariotaku.twidere.view import android.content.Context import android.graphics.Color -import android.support.annotation.ColorInt -import android.support.v7.widget.AppCompatTextView +import androidx.annotation.ColorInt +import androidx.appcompat.widget.AppCompatTextView import android.util.AttributeSet import org.mariotaku.twidere.util.Utils.getLocalizedNumber import java.util.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusFrameLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusFrameLayout.kt index 15e649c4f..7cf10db06 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusFrameLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusFrameLayout.kt @@ -24,7 +24,7 @@ import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.os.Build -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat import android.util.AttributeSet import android.view.View import org.mariotaku.chameleon.Chameleon @@ -33,7 +33,7 @@ import org.mariotaku.chameleon.ChameleonUtils import org.mariotaku.chameleon.ChameleonView import org.mariotaku.chameleon.internal.SupportMethods import org.mariotaku.twidere.R -import android.support.v4.view.OnApplyWindowInsetsListener as OnApplyWindowInsetsListenerCompat +import androidx.core.view.OnApplyWindowInsetsListener as OnApplyWindowInsetsListenerCompat /** * Created by mariotaku on 14/11/26. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusRelativeLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusRelativeLayout.kt index 6ff6fa4f4..6bfe8aad9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusRelativeLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/TintedStatusRelativeLayout.kt @@ -24,7 +24,7 @@ import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint import android.os.Build -import android.support.v4.view.ViewCompat +import androidx.core.view.ViewCompat import android.util.AttributeSet import android.view.View import org.mariotaku.chameleon.Chameleon @@ -33,7 +33,7 @@ import org.mariotaku.chameleon.ChameleonUtils import org.mariotaku.chameleon.ChameleonView import org.mariotaku.chameleon.internal.SupportMethods import org.mariotaku.twidere.R -import android.support.v4.view.OnApplyWindowInsetsListener as OnApplyWindowInsetsListenerCompat +import androidx.core.view.OnApplyWindowInsetsListener as OnApplyWindowInsetsListenerCompat class TintedStatusRelativeLayout(context: Context, attrs: AttributeSet? = null) : ExtendedRelativeLayout(context, attrs), TintedStatusLayout, ChameleonView, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt index ba030be85..8441e3ecb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt @@ -3,7 +3,7 @@ package org.mariotaku.twidere.view.controller.premium import android.app.Dialog import android.content.Intent import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.View import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.Bundle @@ -91,15 +91,15 @@ class SyncStatusViewController : PremiumDashboardActivity.ExtraFeatureViewContro class ConnectNetworkStorageSelectionDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val providers = DataSyncProvider.Factory.getSupportedProviders(context) + val providers = DataSyncProvider.Factory.getSupportedProviders(context!!) val itemNames = providers.mapToArray(SyncProviderEntry::name) - val builder = AlertDialog.Builder(context) + val builder = AlertDialog.Builder(context!!) builder.setTitle(R.string.title_dialog_sync_connect_to) builder.setItems(itemNames) { _, which -> val activity = activity as PremiumDashboardActivity activity.startActivityForControllerResult(providers[which].authIntent, - arguments.getInt(EXTRA_POSITION), REQUEST_CONNECT_NETWORK_STORAGE) + arguments!!.getInt(EXTRA_POSITION), REQUEST_CONNECT_NETWORK_STORAGE) } val dialog = builder.create() dialog.onShow { it.applyTheme() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/twitter/card/CardPollViewController.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/twitter/card/CardPollViewController.kt index 68b99ef0d..72b114ef5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/twitter/card/CardPollViewController.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/twitter/card/CardPollViewController.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.view.controller.twitter.card import android.accounts.AccountManager import android.graphics.* import android.graphics.drawable.Drawable -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.text.format.DateUtils import android.util.Log import android.view.LayoutInflater diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/AccountViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/AccountViewHolder.kt index c69400c51..29d4a8e68 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/AccountViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/AccountViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.CompoundButton import android.widget.ImageView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/ActivityTitleSummaryViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/ActivityTitleSummaryViewHolder.kt index 4bbf31b58..f3dd13d24 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/ActivityTitleSummaryViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/ActivityTitleSummaryViewHolder.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.view.holder import android.graphics.PorterDuff -import android.support.v4.view.MarginLayoutParamsCompat -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.core.view.MarginLayoutParamsCompat +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.view.View import android.view.ViewGroup import kotlinx.android.synthetic.main.list_item_activity_summary_compact.view.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/DraftViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/DraftViewHolder.kt index a524ee945..795dfba97 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/DraftViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/DraftViewHolder.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.view.holder import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.list_item_draft.view.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/EmptyViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/EmptyViewHolder.kt index 43006ac11..d13186ceb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/EmptyViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/EmptyViewHolder.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GapViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GapViewHolder.kt index aa7936b76..0b3da6ceb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GapViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GapViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.view.View.OnClickListener import kotlinx.android.synthetic.main.card_item_gap.view.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GroupViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GroupViewHolder.kt index 520b69134..c24107a84 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GroupViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/GroupViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.view.View import kotlinx.android.synthetic.main.card_item_group_compact.view.* import org.mariotaku.ktextension.hideIfEmpty diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/LoadIndicatorViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/LoadIndicatorViewHolder.kt index e87adb3f4..7e8dec83a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/LoadIndicatorViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/LoadIndicatorViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import kotlinx.android.synthetic.main.list_item_load_indicator.view.* import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt index 049454d2c..11a45f943 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/MediaStatusViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.ImageView import com.commonsware.cwac.layouts.AspectLockedFrameLayout diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserListViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserListViewHolder.kt index a13e467c3..2360de19d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserListViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserListViewHolder.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.TextView import kotlinx.android.synthetic.main.list_item_simple_user_list.view.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserViewHolder.kt index 3e80fe7da..63f1b6155 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/SimpleUserViewHolder.kt @@ -1,6 +1,6 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.CheckBox import android.widget.TextView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt index 9ee64050d..32a539830 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt @@ -1,10 +1,10 @@ package org.mariotaku.twidere.view.holder -import android.support.annotation.DrawableRes -import android.support.v4.content.ContextCompat -import android.support.v4.widget.TextViewCompat -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat +import androidx.core.widget.TextViewCompat +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.text.SpannableString import android.text.SpannableStringBuilder import android.text.Spanned diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TimelineFilterHeaderViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TimelineFilterHeaderViewHolder.kt index 5146da0cb..edaef025e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TimelineFilterHeaderViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TimelineFilterHeaderViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import kotlinx.android.synthetic.main.header_user_timeline_filter.view.* import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt index 3ada1b3cf..40c0c2a14 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.CheckBox import android.widget.ImageView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserListViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserListViewHolder.kt index e014be825..f67b3f4d8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserListViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserListViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.view.View import android.widget.TextView import kotlinx.android.synthetic.main.list_item_user_list.view.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserViewHolder.kt index f7d7d9a30..36e04c125 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/UserViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder -import android.support.v7.widget.RecyclerView.ViewHolder +import androidx.recyclerview.widget.RecyclerView.ViewHolder import android.view.View import android.view.View.OnClickListener import android.view.View.OnLongClickListener diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt index 99a273086..280c5f4ce 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder.compose -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import com.bumptech.glide.load.resource.drawable.GlideDrawable import com.bumptech.glide.request.RequestListener diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/AbsMessageViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/AbsMessageViewHolder.kt index b5d1ade83..4627660e1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/AbsMessageViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/AbsMessageViewHolder.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.view.holder.message import android.os.Build -import android.support.v4.view.GravityCompat -import android.support.v7.widget.RecyclerView +import androidx.core.view.GravityCompat +import androidx.recyclerview.widget.RecyclerView import android.text.format.DateUtils import android.view.View import android.widget.FrameLayout diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/MessageEntryViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/MessageEntryViewHolder.kt index e17fff644..6bb22c747 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/MessageEntryViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/message/MessageEntryViewHolder.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.holder.message -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import kotlinx.android.synthetic.main.list_item_message_entry.view.* import org.mariotaku.ktextension.spannable diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt index 450a290af..883813851 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt @@ -22,12 +22,12 @@ package org.mariotaku.twidere.view.holder.status import android.content.Context import android.content.SharedPreferences import android.graphics.Rect -import android.support.annotation.UiThread -import android.support.v4.content.ContextCompat -import android.support.v4.view.ViewCompat -import android.support.v7.widget.ActionMenuView -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.annotation.UiThread +import androidx.core.content.ContextCompat +import androidx.core.view.ViewCompat +import androidx.appcompat.widget.ActionMenuView +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.text.SpannableString import android.text.SpannableStringBuilder import android.text.Spanned @@ -363,7 +363,7 @@ class DetailStatusViewHolder( } } itemView.profileContainer -> { - val activity = fragment.activity + val activity = fragment.activity ?: return IntentUtils.openUserProfile(activity, status.account_key, status.user_key, status.user_screen_name, status.extras?.user_statusnet_profile_url, preferences[newDocumentApiKey], null) @@ -401,7 +401,7 @@ class DetailStatusViewHolder( val preferences = fragment.preferences val twitter = fragment.twitterWrapper val manager = fragment.userColorNameManager - val activity = fragment.activity + val activity = fragment.activity ?: return false return MenuUtils.handleStatusClick(activity, fragment, fragment.childFragmentManager, preferences, manager, twitter, status, item) } @@ -415,7 +415,7 @@ class DetailStatusViewHolder( private fun initViews() { itemView.menuBar.setOnMenuItemClickListener(this) val fragment = adapter.fragment - val activity = fragment.activity + val activity = fragment.activity ?: return val inflater = activity.menuInflater val menu = itemView.menuBar.menu inflater.inflate(R.menu.menu_detail_status, menu) @@ -758,7 +758,7 @@ class DetailStatusViewHolder( private class SpacingItemDecoration(private val spacing: Int) : RecyclerView.ItemDecoration() { - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) { + override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { if (ViewCompat.getLayoutDirection(parent) == ViewCompat.LAYOUT_DIRECTION_RTL) { outRect.set(spacing, 0, 0, 0) } else { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IExtendedView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IExtendedView.kt index e1cfc40f0..01506e750 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IExtendedView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IExtendedView.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.iface -import android.support.v4.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsCompat import android.view.MotionEvent import android.view.View diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IIconActionButton.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IIconActionButton.kt index 7a5dda36b..3d830e2dc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IIconActionButton.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/iface/IIconActionButton.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.view.iface import android.content.Context -import android.support.annotation.ColorInt +import androidx.annotation.ColorInt import android.util.AttributeSet import org.mariotaku.chameleon.Chameleon diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/transformer/AccountsSelectorTransformer.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/transformer/AccountsSelectorTransformer.kt index d5ce76442..3964368ed 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/transformer/AccountsSelectorTransformer.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/transformer/AccountsSelectorTransformer.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.view.transformer -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.view.View object AccountsSelectorTransformer : ViewPager.PageTransformer { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/viewer/MediaSwipeCloseContainer.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/viewer/MediaSwipeCloseContainer.kt index 4bc0b39c8..f13629159 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/viewer/MediaSwipeCloseContainer.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/viewer/MediaSwipeCloseContainer.kt @@ -2,10 +2,10 @@ package org.mariotaku.twidere.view.viewer import android.annotation.SuppressLint import android.content.Context -import android.support.annotation.FloatRange -import android.support.v4.graphics.drawable.DrawableCompat -import android.support.v4.view.ViewCompat -import android.support.v4.widget.ViewDragHelper +import androidx.annotation.FloatRange +import androidx.core.graphics.drawable.DrawableCompat +import androidx.core.view.ViewCompat +import androidx.customview.widget.ViewDragHelper import android.util.AttributeSet import android.view.MotionEvent import android.view.View @@ -19,7 +19,7 @@ import org.mariotaku.ktextension.coerceInOr class MediaSwipeCloseContainer(context: Context, attrs: AttributeSet? = null) : ViewGroup(context, attrs) { private val dragHelper: ViewDragHelper = ViewDragHelper.create(this, 0.5f, object : ViewDragHelper.Callback() { - override fun onViewPositionChanged(changedView: View?, left: Int, top: Int, dx: Int, dy: Int) { + override fun onViewPositionChanged(changedView: View, left: Int, top: Int, dx: Int, dy: Int) { val container = this@MediaSwipeCloseContainer container.childTop = top container.listener?.onSwipeOffsetChanged(top) @@ -40,7 +40,7 @@ class MediaSwipeCloseContainer(context: Context, attrs: AttributeSet? = null) : return top.coerceInOr(-container.height..container.height, 0) } - override fun getViewVerticalDragRange(child: View?): Int { + override fun getViewVerticalDragRange(child: View): Int { val container = this@MediaSwipeCloseContainer return container.height } diff --git a/twidere/src/main/res/layout-sw600dp/activity_link_handler.xml b/twidere/src/main/res/layout-sw600dp/activity_link_handler.xml index 1ff4a99e8..e08132ae4 100644 --- a/twidere/src/main/res/layout-sw600dp/activity_link_handler.xml +++ b/twidere/src/main/res/layout-sw600dp/activity_link_handler.xml @@ -15,7 +15,7 @@ android:layout_height="match_parent" android:layout_below="@+id/toolbar"/> - - - - - + - - - - - + . --> - - + diff --git a/twidere/src/main/res/layout/activity_sign_in.xml b/twidere/src/main/res/layout/activity_sign_in.xml index 8a6131d48..6e5b8ce83 100644 --- a/twidere/src/main/res/layout/activity_sign_in.xml +++ b/twidere/src/main/res/layout/activity_sign_in.xml @@ -60,7 +60,7 @@ app:backgroundTint="?colorControlStateful"/> - - - \ No newline at end of file + \ No newline at end of file diff --git a/twidere/src/main/res/layout/adapter_item_media_status.xml b/twidere/src/main/res/layout/adapter_item_media_status.xml index 29f8558da..a8d7062c8 100644 --- a/twidere/src/main/res/layout/adapter_item_media_status.xml +++ b/twidere/src/main/res/layout/adapter_item_media_status.xml @@ -17,7 +17,7 @@ ~ along with this program. If not, see . --> - - \ No newline at end of file + \ No newline at end of file diff --git a/twidere/src/main/res/layout/dialog_auto_complete_textview.xml b/twidere/src/main/res/layout/dialog_auto_complete_textview.xml index 72b5ff8f1..f6cd069fe 100644 --- a/twidere/src/main/res/layout/dialog_auto_complete_textview.xml +++ b/twidere/src/main/res/layout/dialog_auto_complete_textview.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:padding="8dp"> - - - - . --> - - - + - - - - - + - - + + - - \ No newline at end of file + \ No newline at end of file diff --git a/twidere/src/main/res/layout/fragment_messages_conversation_new.xml b/twidere/src/main/res/layout/fragment_messages_conversation_new.xml index 88d3ccdb1..285a991dc 100644 --- a/twidere/src/main/res/layout/fragment_messages_conversation_new.xml +++ b/twidere/src/main/res/layout/fragment_messages_conversation_new.xml @@ -35,7 +35,7 @@ android:minLines="1" app:backgroundTint="?colorControlStateful"/> - - - - . --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml b/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml index 8aaf984db..60750f6e4 100644 --- a/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml +++ b/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml @@ -18,7 +18,7 @@ ~ along with this program. If not, see . --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/twidere/src/main/res/layout/header_status.xml b/twidere/src/main/res/layout/header_status.xml index 78e2a9b10..02893de45 100644 --- a/twidere/src/main/res/layout/header_status.xml +++ b/twidere/src/main/res/layout/header_status.xml @@ -408,7 +408,7 @@ - - - - - - diff --git a/twidere/src/main/res/layout/layout_preference_switch_indicator.xml b/twidere/src/main/res/layout/layout_preference_switch_indicator.xml index 1f8063168..edc7823aa 100644 --- a/twidere/src/main/res/layout/layout_preference_switch_indicator.xml +++ b/twidere/src/main/res/layout/layout_preference_switch_indicator.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:layout_gravity="center"> - - . --> - - \ No newline at end of file + \ No newline at end of file diff --git a/twidere/src/main/res/layout/list_item_conversation_info_space.xml b/twidere/src/main/res/layout/list_item_conversation_info_space.xml index de361351a..58bb74778 100644 --- a/twidere/src/main/res/layout/list_item_conversation_info_space.xml +++ b/twidere/src/main/res/layout/list_item_conversation_info_space.xml @@ -17,7 +17,7 @@ ~ along with this program. If not, see . --> -. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/twidere/src/main/res/layout/preference_widget_account_preference_item.xml b/twidere/src/main/res/layout/preference_widget_account_preference_item.xml index d8f19c9e8..2ed54d169 100644 --- a/twidere/src/main/res/layout/preference_widget_account_preference_item.xml +++ b/twidere/src/main/res/layout/preference_widget_account_preference_item.xml @@ -28,7 +28,7 @@ android:orientation="horizontal" android:showDividers="middle"> -