From 9ec8006168122007a0314e097275b5487b16a5fe Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Thu, 21 Dec 2017 11:19:17 +0800 Subject: [PATCH] refactoring API library --- .../mariotaku/microblog/library/Fanfou.java | 18 ++++----- .../microblog/library/FanfouStream.java | 2 +- .../mariotaku/microblog/library/Mastodon.java | 30 +++++++------- .../microblog/library/MastodonOAuth2.java | 3 +- .../microblog/library/MastodonStreaming.java | 3 +- .../microblog/library/MicroBlog.java | 2 +- .../microblog/library/MicroBlogException.java | 8 ++-- .../microblog/library/StatusNet.java | 13 +++--- .../mariotaku/microblog/library/Twitter.java | 28 ++++++------- .../microblog/library/TwitterCaps.java | 8 ++-- .../microblog/library/TwitterOAuth2.java | 5 +-- .../microblog/library/TwitterPrivate.java | 14 +++---- .../microblog/library/TwitterUpload.java | 9 ++--- .../microblog/library/TwitterUserStream.java | 4 +- .../mastodon}/AuthScope.java | 2 +- .../mastodon}/StatusVisibility.java | 2 +- .../twitter}/MediaCategory.java | 2 +- .../twitter}/StreamWith.java | 2 +- .../api => api/fanfou}/BlocksResources.java | 8 ++-- .../fanfou}/DirectMessagesResources.java | 10 ++--- .../fanfou}/FavoritesResources.java | 4 +- .../fanfou}/FriendshipsResources.java | 8 ++-- .../api => api/fanfou}/PhotosResources.java | 10 ++--- .../api => api/fanfou}/SearchResources.java | 10 ++--- .../api => api/fanfou}/StatusesResources.java | 8 ++-- .../api => api/fanfou}/TrendsResources.java | 4 +- .../api => api/fanfou}/UsersResources.java | 8 ++-- .../mastodon}/AccountsResources.java | 16 ++++---- .../api => api/mastodon}/AppsResources.java | 4 +- .../api => api/mastodon}/BlocksResources.java | 8 ++-- .../mastodon}/FavouritesResources.java | 8 ++-- .../mastodon}/FollowRequestsResources.java | 10 ++--- .../mastodon}/FollowsResources.java | 4 +- .../mastodon}/InstancesResources.java | 2 +- .../api => api/mastodon}/ListsResources.java | 8 ++-- .../api => api/mastodon}/MediaResources.java | 4 +- .../api => api/mastodon}/MutesResources.java | 8 ++-- .../mastodon}/NotificationsResources.java | 8 ++-- .../mastodon}/ReportsResources.java | 2 +- .../api => api/mastodon}/SearchResources.java | 6 +-- .../mastodon}/StatusesResources.java | 16 ++++---- .../mastodon}/TimelinesResources.java | 8 ++-- .../microblog}/DirectMessagesResources.java | 8 ++-- .../api => api/statusnet}/GroupResources.java | 12 +++--- .../statusnet}/SearchResources.java | 8 ++-- .../statusnet}/StatusNetResources.java | 10 ++--- .../statusnet}/TimelineResources.java | 8 ++-- .../api => api/statusnet}/UserResources.java | 8 ++-- .../twitter}/CollectionResources.java | 2 +- .../DirectMessagesEventResources.java | 10 ++--- .../twitter}/FavoritesResources.java | 8 ++-- .../twitter}/FriendsFollowersResources.java | 18 ++++----- .../api => api/twitter}/HelpResources.java | 10 ++--- .../api => api/twitter}/ListResources.java | 16 ++++---- .../api => api/twitter}/MutesResources.java | 10 ++--- .../twitter}/PlacesGeoResources.java | 12 +++--- .../twitter}/PrivateAccountResources.java | 4 +- .../twitter}/PrivateActivityResources.java | 10 ++--- .../PrivateDirectMessagesResources.java | 16 ++++---- .../PrivateFriendsFollowersResources.java | 4 +- .../twitter}/PrivateMutesResources.java | 10 ++--- .../api => api/twitter}/PrivateResources.java | 2 +- .../twitter}/PrivateSearchResources.java | 6 +-- .../twitter}/PrivateTimelineResources.java | 8 ++-- .../twitter}/PrivateTweetResources.java | 16 ++++---- .../twitter}/SavedSearchesResources.java | 6 +-- .../api => api/twitter}/SearchResources.java | 6 +-- .../twitter}/SpamReportingResources.java | 4 +- .../twitter}/TimelineResources.java | 10 ++--- .../api => api/twitter}/TrendsResources.java | 10 ++--- .../api => api/twitter}/TweetResources.java | 12 +++--- .../api => api/twitter}/UsersResources.java | 22 +++++----- .../auth/BasicAuthorization.java | 5 +-- .../auth/BearerAuthorization.java | 7 +--- .../auth/EmptyAuthorization.java | 5 +-- .../auth/OAuth2GetTokenHeader.java | 7 +--- .../{twitter => }/auth/OAuth2Token.java | 5 +-- .../fanfou}/FanfouUserStreamCallback.java | 8 ++-- .../SimpleFanfouUserStreamCallback.java | 6 +-- .../mastodon}/MastodonUserStreamCallback.java | 6 +-- .../twitter}/SimpleUserStreamCallback.java | 16 ++++---- .../twitter}/UserStreamCallback.java | 24 +++++------ .../{twitter => }/http/HttpResponseCode.java | 2 +- .../model => model/fanfou}/Conversation.java | 4 +- .../fanfou}/FanfouStreamObject.java | 6 +-- .../{fanfou/model => model/fanfou}/Photo.java | 5 +-- .../fanfou}/PhotoStatusUpdate.java | 2 +- .../fanfou}/util/StreamDateConverter.java | 2 +- .../model => model/gnusocial}/Attachment.java | 4 +- .../model => model/mastodon}/Account.java | 2 +- .../mastodon}/AccountUpdate.java | 2 +- .../model => model/mastodon}/Application.java | 2 +- .../model => model/mastodon}/Attachment.java | 2 +- .../model => model/mastodon}/Card.java | 2 +- .../model => model/mastodon}/Context.java | 2 +- .../model => model/mastodon}/Emoji.java | 2 +- .../model => model/mastodon}/Error.java | 2 +- .../model => model/mastodon}/Instance.java | 2 +- .../LinkHeaderList$$JsonObjectMapper.java | 2 +- .../mastodon}/LinkHeaderList.java | 2 +- .../mastodon}/LinkHeaderResponse.java | 2 +- .../model => model/mastodon}/List.java | 2 +- .../model => model/mastodon}/Mention.java | 2 +- .../mastodon}/Notification.java | 2 +- .../mastodon}/RegisteredApplication.java | 2 +- .../mastodon}/Relationship.java | 2 +- .../model => model/mastodon}/Report.java | 2 +- .../model => model/mastodon}/Results.java | 2 +- .../model => model/mastodon}/Status.java | 4 +- .../mastodon}/StatusUpdate.java | 4 +- .../model => model/mastodon}/Tag.java | 2 +- .../mastodon}/TimelineOption.java | 2 +- .../microblog}/AccountSettings.java | 2 +- .../model => model/microblog}/Activity.java | 4 +- .../microblog}/CardDataMap.java | 2 +- .../model => model/microblog}/CardEntity.java | 7 +--- .../microblog}/CardResponse.java | 2 +- .../model => model/microblog}/Category.java | 3 +- .../microblog}/Contributor.java | 5 +-- .../microblog}/ConversationTimeline.java | 2 +- .../microblog}/CreateCardData.java | 2 +- .../microblog}/CreateCardResult.java | 2 +- .../microblog}/CursorSupport.java | 2 +- .../microblog}/CursorTimestampResponse.java | 2 +- .../model => model/microblog}/DMResponse.java | 7 +--- .../microblog}/DeletionEvent.java | 2 +- .../microblog}/DirectMessage.java | 7 +--- .../microblog}/DirectMessageEventObject.java | 2 +- .../model => model/microblog}/Entities.java | 5 +-- .../microblog}/EntitySupport.java | 2 +- .../model => model/microblog}/ErrorInfo.java | 2 +- .../microblog}/ExtendedEntitySupport.java | 2 +- .../microblog}/ExtendedProfile.java | 6 +-- .../model => model/microblog}/Friendship.java | 2 +- .../microblog}/FriendshipUpdate.java | 2 +- .../microblog}/GeoLocation.java | 2 +- .../model => model/microblog}/GeoPoint.java | 5 +-- .../model => model/microblog}/GeoQuery.java | 2 +- .../microblog}/HashtagEntity.java | 5 +-- .../microblog}/IDs$$JsonObjectMapper.java | 2 +- .../model => model/microblog}/IDs.java | 5 +-- .../model => model/microblog}/Indices.java | 5 +-- .../microblog}/IndicesConverter.java | 2 +- .../model => model/microblog}/Language.java | 5 +-- .../model => model/microblog}/Location.java | 5 +-- .../microblog}/MediaEntity.java | 7 +--- .../microblog}/MediaUploadResponse.java | 2 +- .../microblog}/MutedKeyword.java | 2 +- .../model => model/microblog}/NewDm.java | 2 +- .../microblog}/NewMediaMetadata.java | 5 +-- ...ageableResponseList$$JsonObjectMapper.java | 2 +- .../microblog}/PageableResponseList.java | 2 +- .../model => model/microblog}/Paging.java | 2 +- .../microblog}/PinTweetResult.java | 2 +- .../model => model/microblog}/Place.java | 5 +-- .../microblog}/ProfileUpdate.java | 2 +- .../microblog}/QueryResult.java | 3 +- .../microblog}/RateLimitStatus.java | 2 +- .../microblog}/Relationship.java | 2 +- .../microblog}/ResponseCode.java | 2 +- .../ResponseList$$JsonObjectMapper.java | 2 +- .../microblog}/ResponseList.java | 2 +- .../microblog}/SavedSearch.java | 4 +- .../microblog}/ScheduledStatus.java | 4 +- .../microblog}/SearchQuery.java | 2 +- .../microblog}/SettingsUpdate.java | 2 +- .../microblog}/SimilarPlaces.java | 2 +- .../model => model/microblog}/Status.java | 13 +++--- .../microblog}/StatusActivitySummary.java | 5 +-- .../microblog}/StatusTargetObjectEvent.java | 4 +- .../microblog}/StatusUpdate.java | 2 +- .../microblog}/StickerEntity.java | 7 +--- .../microblog}/StreamEvent.java | 4 +- .../model => model/microblog}/TimeZone.java | 5 +-- .../microblog}/TimelineOption.java | 2 +- .../microblog}/TimestampResponse.java | 5 +-- .../microblog}/TranslationResult.java | 2 +- .../model => model/microblog}/Trend.java | 5 +-- .../model => model/microblog}/Trends.java | 5 +-- .../microblog}/TwitterAPIConfiguration.java | 2 +- .../microblog}/TwitterResponse.java | 2 +- .../microblog}/TwitterResponseObject.java | 2 +- .../microblog}/TwitterStreamObject.java | 2 +- .../microblog}/UniversalSearchQuery.java | 2 +- .../microblog}/UniversalSearchResult.java | 4 +- .../model => model/microblog}/UrlEntity.java | 5 +-- .../model => model/microblog}/User.java | 7 +--- .../microblog}/UserEntities.java | 5 +-- .../model => model/microblog}/UserEvents.java | 5 +-- .../model => model/microblog}/UserInbox.java | 5 +-- .../model => model/microblog}/UserList.java | 7 +--- .../microblog}/UserListTargetObjectEvent.java | 2 +- .../microblog}/UserListUpdate.java | 2 +- .../microblog}/UserMentionEntity.java | 5 +-- .../model => model/microblog}/Warning.java | 2 +- .../model => model/statusnet}/Attention.java | 5 +-- .../model => model/statusnet}/Group.java | 7 +--- .../statusnet}/StatusNetConfig.java | 5 +-- .../model/util/ParcelMapBagger.java | 2 +- .../auth/AuthorizationConfiguration.java | 40 ------------------- .../twitter/util/InternalParseUtil.java | 2 +- .../twitter}/TwitterDateConverter.java | 5 +-- .../twidere/model/ParcelableCardEntity.java | 4 +- .../twidere/model/ParcelableMedia.java | 2 +- .../twidere/model/account/AccountExtras.java | 2 +- .../TwitterOfficialConversationExtras.java | 2 +- .../util/CustomEmojiMapParcelBagger.java | 2 +- twidere/build.gradle | 2 +- .../model/util/ParcelableStatusUtilsTest.kt | 2 +- .../util/stetho/UserStreamDumperPlugin.kt | 12 +++--- twidere/src/main/AndroidManifest.xml | 32 +++++++-------- .../text/translate/LookupTranslator.java | 5 +-- .../library/model/microblog/IDsAccessor.kt | 25 ++++++++++++ .../twidere/adapter/SavedSearchesAdapter.java | 4 +- .../ExtendedDividerItemDecoration.java | 9 ++--- .../fragment/KeyboardShortcutsFragment.java | 16 ++------ .../twidere/model/StatusListResponse.java | 2 +- .../model/event/GetMessagesTaskEvent.java | 3 -- .../model/event/GetStatusesTaskEvent.java | 3 -- .../model/pagination/CursorPagination.java | 2 +- .../model/pagination/PagePagination.java | 2 +- .../twidere/model/pagination/Pagination.java | 2 +- .../model/pagination/SinceMaxPagination.java | 2 +- .../preference/MultiSelectListPreference.java | 7 +--- .../SettingsImportExportPreference.java | 15 +------ .../twidere/util/AbsServiceInterface.java | 8 +--- .../mariotaku/twidere/util/ServiceUtils.java | 3 +- .../SwipeDismissListViewTouchListener.java | 9 ++--- .../twidere/util/TwidereColorUtils.java | 2 +- .../view/ViewOutlineProviderCompat.java | 6 +-- .../twidere/view/iface/IForegroundView.java | 2 +- .../mariotaku/ktextension/CursorExtensions.kt | 30 +------------- .../microblog}/InternalActivityCreator.kt | 9 ++--- .../twidere/activity/ComposeActivity.kt | 2 +- .../twidere/activity/SignInActivity.kt | 32 ++++++--------- .../TrendsLocationSelectorActivity.kt | 2 +- .../adapter/ParcelableActivitiesAdapter.kt | 16 ++++---- .../twidere/adapter/StatusDetailsAdapter.kt | 8 ++-- .../twidere/alias/MastodonAliases.kt | 8 ++-- .../mariotaku/twidere/alias/TwitterAliases.kt | 3 ++ .../twidere/data/StatusesDataSourceFactory.kt | 4 +- .../twidere/data/fetcher/ActivitiesFetcher.kt | 10 ++--- .../data/fetcher/GroupTimelineFetcher.kt | 8 ++-- .../data/fetcher/HomeTimelineFetcher.kt | 8 ++-- .../data/fetcher/ListTimelineFetcher.kt | 8 ++-- .../fetcher/MediaSearchTimelineFetcher.kt | 17 ++++---- .../fetcher/NetworkPublicTimelineFetcher.kt | 8 ++-- .../data/fetcher/PublicTimelineFetcher.kt | 8 ++-- .../data/fetcher/SearchTimelineFetcher.kt | 21 +++++----- .../twidere/data/fetcher/StatusesFetcher.kt | 6 +-- .../data/fetcher/UserFavoritesFetcher.kt | 8 ++-- .../data/fetcher/UserMediaTimelineFetcher.kt | 15 ++++--- .../fetcher/UserMentionsTimelineFetcher.kt | 20 +++++----- .../data/fetcher/UserTimelineFetcher.kt | 10 ++--- .../activities/ActivitiesAboutMeFetcher.kt | 10 ++--- .../twidere/data/impl/UserLiveData.kt | 4 +- .../predicate/ParcelableActivityProcessor.kt | 4 +- .../twidere/extension/GlideExtensions.kt | 3 ++ .../extension/api/MastodonExtensions.kt | 2 +- .../extension/api/MicroBlogExtensions.kt | 6 +-- .../model/AccountDetailsExtensions.kt | 2 +- .../extension/model/CredentialsExtensions.kt | 4 +- .../extension/model/FiltersDataExtensions.kt | 25 ++++++------ .../model/ParcelableActivityExtensions.kt | 7 +--- .../model/ParcelableCardEntityExtensions.kt | 2 +- .../model/ParcelableStatusExtensions.kt | 2 +- .../model/api/DirectMessageEventObjectDsl.kt | 28 +++++++------ .../extension/model/api/EntityExtensions.kt | 2 +- .../extension/model/api/PagingExtensions.kt | 6 +-- .../extension/model/api/StatusExtensions.kt | 14 ++++--- .../extension/model/api/UserExtensions.kt | 2 +- .../api/gnusocial/AttathmentExtensions.kt | 2 +- .../model/api/gnusocial/GroupExtensions.kt | 2 +- .../model/api/mastodon/AccountExtensions.kt | 4 +- .../api/mastodon/ApplicationExtensions.kt | 2 +- .../api/mastodon/AttachmentExtensions.kt | 2 +- .../api/mastodon/LinkHeaderListExtensions.kt | 4 +- .../model/api/mastodon/MentionExtensions.kt | 2 +- .../api/mastodon/NotificationExtensions.kt | 20 +++++----- .../api/mastodon/RelationshipExtensions.kt | 2 +- .../model/api/mastodon/ResultsExtensions.kt | 2 +- .../model/api/mastodon/StatusExtensions.kt | 4 +- .../model/api/microblog/ActivityExtensions.kt | 6 +-- .../api/microblog/RelationshipExtensions.kt | 2 +- .../api/microblog/ResponseListExtensions.kt | 4 +- .../model/api/microblog/UserListExtensions.kt | 5 ++- .../api/twitter/UserListUpdateExtensions.kt | 6 +-- .../fragment/CreateUserListDialogFragment.kt | 2 +- .../fragment/EditUserListDialogFragment.kt | 2 +- .../fragment/NetworkDiagnosticsFragment.kt | 4 +- .../fragment/SavedSearchesListFragment.kt | 12 +++--- .../twidere/fragment/UserFragment.kt | 6 +-- .../twidere/fragment/group/GroupFragment.kt | 2 +- .../fragment/media/ImagePageFragment.kt | 22 +++++++--- .../twidere/fragment/status/StatusFragment.kt | 4 +- .../twidere/loader/CacheUserSearchLoader.kt | 2 +- .../twidere/loader/ParcelableStatusLoader.kt | 2 +- .../twidere/loader/SavedSearchesLoader.kt | 4 +- .../twidere/loader/group/BaseGroupsLoader.kt | 4 +- .../twidere/loader/group/UserGroupsLoader.kt | 5 +-- .../statuses/AbsRequestStatusesLoader.kt | 4 +- .../loader/statuses/ConversationLoader.kt | 8 ++-- .../loader/userlists/BaseUserListsLoader.kt | 6 +-- .../userlists/UserListMembershipsLoader.kt | 6 +-- .../userlists/UserListOwnershipsLoader.kt | 4 +- .../userlists/UserListSubscriptionsLoader.kt | 6 +-- .../loader/users/AbsRequestUsersLoader.kt | 2 +- .../loader/users/GroupMembersLoader.kt | 6 +-- .../loader/users/IncomingFriendshipsLoader.kt | 4 +- .../twidere/loader/users/MutesUsersLoader.kt | 4 +- .../loader/users/StatusFavoritersLoader.kt | 10 ++--- .../loader/users/StatusRetweetersLoader.kt | 4 +- .../twidere/loader/users/UserBlocksLoader.kt | 4 +- .../loader/users/UserFollowersLoader.kt | 4 +- .../twidere/loader/users/UserFriendsLoader.kt | 8 +--- .../loader/users/UserListMembersLoader.kt | 6 +-- .../users/UserListRelatedUsersLoader.kt | 6 +-- .../loader/users/UserListSubscribersLoader.kt | 6 +-- .../loader/users/UserRelatedUsersLoader.kt | 2 +- .../twidere/loader/users/UserSearchLoader.kt | 4 +- .../model/ActivityTitleSummaryMessage.kt | 28 ++++++------- .../conf/TrendsLocationExtraConfiguration.kt | 2 +- .../model/util/ParcelableCardEntityUtils.kt | 4 -- .../model/util/ParcelableMediaUtils.kt | 8 ++-- .../model/util/ParcelableMessageUtils.kt | 10 ++--- .../model/util/ParcelableRelationshipUtils.kt | 2 +- .../preference/sync/SyncItemPreference.kt | 2 + .../twidere/promise/FriendshipPromises.kt | 4 +- .../twidere/promise/SavedSearchPromises.kt | 2 +- .../twidere/promise/StatusPromises.kt | 4 +- .../twidere/promise/UpdateStatusPromise.kt | 15 +++---- .../twidere/promise/UserListPromises.kt | 2 +- .../twidere/promise/UserProfilePromises.kt | 6 +-- .../service/LengthyOperationsService.kt | 4 +- .../twidere/service/StreamingService.kt | 4 +- .../twidere/task/status/PinStatusTask.kt | 2 +- .../twidere/task/status/UnpinStatusTask.kt | 2 +- .../twidere/task/statuses/GetStatusesTask.kt | 6 +-- .../twidere/task/twitter/GetActivitiesTask.kt | 10 ++--- .../task/twitter/message/GetMessagesTask.kt | 11 ++--- .../task/twitter/message/SendMessageTask.kt | 6 +-- .../twidere/util/ContentValuesCreator.kt | 2 +- .../mariotaku/twidere/util/DataStoreUtils.kt | 9 ++--- .../util/MastodonApplicationRegistry.kt | 4 +- .../org/mariotaku/twidere/util/MenuUtils.kt | 2 +- .../twidere/util/StatusCodeMessageUtils.kt | 17 ++++---- .../twidere/util/UserColorNameManager.kt | 2 +- .../util/api/TwitterConverterFactory.kt | 11 +++-- .../util/emoji/CustomEmojiTranslator.kt | 2 +- .../ContentNotificationManager.kt | 6 +-- .../streaming/FanfouTimelineStreamCallback.kt | 10 ++--- .../TwitterTimelineStreamCallback.kt | 4 +- .../twitter/card/CardPollViewController.kt | 11 ++--- .../holder/status/DetailStatusViewHolder.kt | 2 +- .../view/holder/status/StatusViewHolder.kt | 2 +- .../layout-sw600dp/activity_link_handler.xml | 1 + .../main/res/layout/activity_link_handler.xml | 1 + 357 files changed, 986 insertions(+), 1192 deletions(-) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/annotation => annotation/mastodon}/AuthScope.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/annotation => annotation/mastodon}/StatusVisibility.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/annotation => annotation/twitter}/MediaCategory.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/annotation => annotation/twitter}/StreamWith.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/BlocksResources.java (84%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/DirectMessagesResources.java (83%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/FavoritesResources.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/FriendshipsResources.java (87%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/PhotosResources.java (81%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/SearchResources.java (80%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/StatusesResources.java (83%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/TrendsResources.java (89%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/api => api/fanfou}/UsersResources.java (84%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/AccountsResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/AppsResources.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/BlocksResources.java (81%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/FavouritesResources.java (82%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/FollowRequestsResources.java (82%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/FollowsResources.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/InstancesResources.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/ListsResources.java (90%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/MediaResources.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/MutesResources.java (81%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/NotificationsResources.java (81%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/ReportsResources.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/SearchResources.java (85%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/StatusesResources.java (82%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/api => api/mastodon}/TimelinesResources.java (88%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{microblog/api => api/microblog}/DirectMessagesResources.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/api => api/statusnet}/GroupResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/api => api/statusnet}/SearchResources.java (81%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/api => api/statusnet}/StatusNetResources.java (80%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/api => api/statusnet}/TimelineResources.java (81%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/api => api/statusnet}/UserResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/CollectionResources.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/DirectMessagesEventResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/FavoritesResources.java (88%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/FriendsFollowersResources.java (90%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/HelpResources.java (88%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/ListResources.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/MutesResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PlacesGeoResources.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateAccountResources.java (90%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateActivityResources.java (84%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateDirectMessagesResources.java (88%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateFriendsFollowersResources.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateMutesResources.java (80%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateResources.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateSearchResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateTimelineResources.java (85%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/PrivateTweetResources.java (78%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/SavedSearchesResources.java (89%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/SearchResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/SpamReportingResources.java (92%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/TimelineResources.java (87%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/TrendsResources.java (82%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/TweetResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/api => api/twitter}/UsersResources.java (86%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter => }/auth/BasicAuthorization.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter => }/auth/BearerAuthorization.java (88%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter => }/auth/EmptyAuthorization.java (92%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter => }/auth/OAuth2GetTokenHeader.java (87%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter => }/auth/OAuth2Token.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/callback => callback/fanfou}/FanfouUserStreamCallback.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/callback => callback/fanfou}/SimpleFanfouUserStreamCallback.java (89%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/callback => callback/mastodon}/MastodonUserStreamCallback.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/callback => callback/twitter}/SimpleUserStreamCallback.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/callback => callback/twitter}/UserStreamCallback.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter => }/http/HttpResponseCode.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/model => model/fanfou}/Conversation.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/model => model/fanfou}/FanfouStreamObject.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/model => model/fanfou}/Photo.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/model => model/fanfou}/PhotoStatusUpdate.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{fanfou/model => model/fanfou}/util/StreamDateConverter.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{gnusocial/model => model/gnusocial}/Attachment.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Account.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/AccountUpdate.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Application.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Attachment.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Card.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Context.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Emoji.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Error.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Instance.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/LinkHeaderList$$JsonObjectMapper.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/LinkHeaderList.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/LinkHeaderResponse.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/List.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Mention.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Notification.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/RegisteredApplication.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Relationship.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Report.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Results.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Status.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/StatusUpdate.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/Tag.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{mastodon/model => model/mastodon}/TimelineOption.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/AccountSettings.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Activity.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/CardDataMap.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/CardEntity.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/CardResponse.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Category.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Contributor.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ConversationTimeline.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/CreateCardData.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/CreateCardResult.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/CursorSupport.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/CursorTimestampResponse.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/DMResponse.java (99%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/DeletionEvent.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/DirectMessage.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/DirectMessageEventObject.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Entities.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/EntitySupport.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ErrorInfo.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ExtendedEntitySupport.java (93%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ExtendedProfile.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Friendship.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/FriendshipUpdate.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/GeoLocation.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/GeoPoint.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/GeoQuery.java (99%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/HashtagEntity.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/IDs$$JsonObjectMapper.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/IDs.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Indices.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/IndicesConverter.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Language.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Location.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/MediaEntity.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/MediaUploadResponse.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/MutedKeyword.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/NewDm.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/NewMediaMetadata.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/PageableResponseList$$JsonObjectMapper.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/PageableResponseList.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Paging.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/PinTweetResult.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Place.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ProfileUpdate.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/QueryResult.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/RateLimitStatus.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Relationship.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ResponseCode.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ResponseList$$JsonObjectMapper.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ResponseList.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/SavedSearch.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/ScheduledStatus.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/SearchQuery.java (99%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/SettingsUpdate.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/SimilarPlaces.java (92%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Status.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/StatusActivitySummary.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/StatusTargetObjectEvent.java (91%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/StatusUpdate.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/StickerEntity.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/StreamEvent.java (92%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TimeZone.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TimelineOption.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TimestampResponse.java (94%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TranslationResult.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Trend.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Trends.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TwitterAPIConfiguration.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TwitterResponse.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TwitterResponseObject.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/TwitterStreamObject.java (99%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UniversalSearchQuery.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UniversalSearchResult.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UrlEntity.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/User.java (98%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UserEntities.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UserEvents.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UserInbox.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UserList.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UserListTargetObjectEvent.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UserListUpdate.java (95%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/UserMentionEntity.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/model => model/microblog}/Warning.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/model => model/statusnet}/Attention.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/model => model/statusnet}/Group.java (96%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{statusnet/model => model/statusnet}/StatusNetConfig.java (97%) rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter => }/model/util/ParcelMapBagger.java (96%) delete mode 100644 twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/AuthorizationConfiguration.java rename twidere.component.common/src/main/java/org/mariotaku/microblog/library/{twitter/util => util/twitter}/TwitterDateConverter.java (92%) create mode 100644 twidere/src/main/java/org/mariotaku/microblog/library/model/microblog/IDsAccessor.kt rename twidere/src/main/kotlin/org/mariotaku/microblog/library/{twitter/model => model/microblog}/InternalActivityCreator.kt (96%) diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Fanfou.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Fanfou.java index e732d5b7c..dc7f0052d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Fanfou.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Fanfou.java @@ -18,15 +18,15 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.fanfou.api.BlocksResources; -import org.mariotaku.microblog.library.fanfou.api.DirectMessagesResources; -import org.mariotaku.microblog.library.fanfou.api.FavoritesResources; -import org.mariotaku.microblog.library.fanfou.api.FriendshipsResources; -import org.mariotaku.microblog.library.fanfou.api.PhotosResources; -import org.mariotaku.microblog.library.fanfou.api.SearchResources; -import org.mariotaku.microblog.library.fanfou.api.StatusesResources; -import org.mariotaku.microblog.library.fanfou.api.TrendsResources; -import org.mariotaku.microblog.library.fanfou.api.UsersResources; +import org.mariotaku.microblog.library.api.fanfou.BlocksResources; +import org.mariotaku.microblog.library.api.fanfou.DirectMessagesResources; +import org.mariotaku.microblog.library.api.fanfou.FavoritesResources; +import org.mariotaku.microblog.library.api.fanfou.FriendshipsResources; +import org.mariotaku.microblog.library.api.fanfou.PhotosResources; +import org.mariotaku.microblog.library.api.fanfou.SearchResources; +import org.mariotaku.microblog.library.api.fanfou.StatusesResources; +import org.mariotaku.microblog.library.api.fanfou.TrendsResources; +import org.mariotaku.microblog.library.api.fanfou.UsersResources; /** * Created by mariotaku on 16/3/10. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/FanfouStream.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/FanfouStream.java index 8ce0d5f37..2888c5444 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/FanfouStream.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/FanfouStream.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.fanfou.callback.FanfouUserStreamCallback; +import org.mariotaku.microblog.library.callback.fanfou.FanfouUserStreamCallback; import org.mariotaku.restfu.annotation.method.GET; /** diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Mastodon.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Mastodon.java index 5559d13bb..62ad2cc18 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Mastodon.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Mastodon.java @@ -18,21 +18,21 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.mastodon.api.AccountsResources; -import org.mariotaku.microblog.library.mastodon.api.AppsResources; -import org.mariotaku.microblog.library.mastodon.api.BlocksResources; -import org.mariotaku.microblog.library.mastodon.api.FavouritesResources; -import org.mariotaku.microblog.library.mastodon.api.FollowRequestsResources; -import org.mariotaku.microblog.library.mastodon.api.FollowsResources; -import org.mariotaku.microblog.library.mastodon.api.InstancesResources; -import org.mariotaku.microblog.library.mastodon.api.ListsResources; -import org.mariotaku.microblog.library.mastodon.api.MediaResources; -import org.mariotaku.microblog.library.mastodon.api.MutesResources; -import org.mariotaku.microblog.library.mastodon.api.NotificationsResources; -import org.mariotaku.microblog.library.mastodon.api.ReportsResources; -import org.mariotaku.microblog.library.mastodon.api.SearchResources; -import org.mariotaku.microblog.library.mastodon.api.StatusesResources; -import org.mariotaku.microblog.library.mastodon.api.TimelinesResources; +import org.mariotaku.microblog.library.api.mastodon.AccountsResources; +import org.mariotaku.microblog.library.api.mastodon.AppsResources; +import org.mariotaku.microblog.library.api.mastodon.BlocksResources; +import org.mariotaku.microblog.library.api.mastodon.FavouritesResources; +import org.mariotaku.microblog.library.api.mastodon.FollowRequestsResources; +import org.mariotaku.microblog.library.api.mastodon.FollowsResources; +import org.mariotaku.microblog.library.api.mastodon.InstancesResources; +import org.mariotaku.microblog.library.api.mastodon.ListsResources; +import org.mariotaku.microblog.library.api.mastodon.MediaResources; +import org.mariotaku.microblog.library.api.mastodon.MutesResources; +import org.mariotaku.microblog.library.api.mastodon.NotificationsResources; +import org.mariotaku.microblog.library.api.mastodon.ReportsResources; +import org.mariotaku.microblog.library.api.mastodon.SearchResources; +import org.mariotaku.microblog.library.api.mastodon.StatusesResources; +import org.mariotaku.microblog.library.api.mastodon.TimelinesResources; public interface Mastodon extends AccountsResources, AppsResources, BlocksResources, FavouritesResources, FollowRequestsResources, FollowsResources, InstancesResources, diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonOAuth2.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonOAuth2.java index 48945bf09..3723c3b2b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonOAuth2.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonOAuth2.java @@ -18,8 +18,7 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.auth.OAuth2Token; +import org.mariotaku.microblog.library.auth.OAuth2Token; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.KeyValue; import org.mariotaku.restfu.annotation.param.Param; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonStreaming.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonStreaming.java index d92158d77..7367e72ce 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonStreaming.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MastodonStreaming.java @@ -18,8 +18,7 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.callback.MastodonUserStreamCallback; +import org.mariotaku.microblog.library.callback.mastodon.MastodonUserStreamCallback; import org.mariotaku.restfu.annotation.method.GET; /** diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlog.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlog.java index 1c21c25b9..174a38688 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlog.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlog.java @@ -18,7 +18,7 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.microblog.api.DirectMessagesResources; +import org.mariotaku.microblog.library.api.microblog.DirectMessagesResources; @Deprecated public interface MicroBlog extends Twitter, StatusNet, Fanfou, DirectMessagesResources { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java index ede08f180..590e6d588 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java @@ -21,10 +21,10 @@ package org.mariotaku.microblog.library; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import org.mariotaku.microblog.library.twitter.http.HttpResponseCode; -import org.mariotaku.microblog.library.twitter.model.ErrorInfo; -import org.mariotaku.microblog.library.twitter.model.RateLimitStatus; -import org.mariotaku.microblog.library.twitter.model.TwitterResponse; +import org.mariotaku.microblog.library.http.HttpResponseCode; +import org.mariotaku.microblog.library.model.microblog.ErrorInfo; +import org.mariotaku.microblog.library.model.microblog.RateLimitStatus; +import org.mariotaku.microblog.library.model.microblog.TwitterResponse; import org.mariotaku.microblog.library.twitter.util.InternalParseUtil; import org.mariotaku.restfu.http.HttpRequest; import org.mariotaku.restfu.http.HttpResponse; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/StatusNet.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/StatusNet.java index 2dc318cda..101307148 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/StatusNet.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/StatusNet.java @@ -18,15 +18,14 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.statusnet.api.TimelineResources; +import org.mariotaku.microblog.library.api.statusnet.TimelineResources; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; -import org.mariotaku.microblog.library.statusnet.api.GroupResources; -import org.mariotaku.microblog.library.statusnet.api.SearchResources; -import org.mariotaku.microblog.library.statusnet.api.StatusNetResources; -import org.mariotaku.microblog.library.statusnet.api.UserResources; -import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.api.statusnet.GroupResources; +import org.mariotaku.microblog.library.api.statusnet.SearchResources; +import org.mariotaku.microblog.library.api.statusnet.StatusNetResources; +import org.mariotaku.microblog.library.api.statusnet.UserResources; +import org.mariotaku.microblog.library.model.microblog.User; /** * Created by mariotaku on 16/3/4. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Twitter.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Twitter.java index 1aae844d9..f65a3d656 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Twitter.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/Twitter.java @@ -18,20 +18,20 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.twitter.api.DirectMessagesEventResources; -import org.mariotaku.microblog.library.twitter.api.FavoritesResources; -import org.mariotaku.microblog.library.twitter.api.FriendsFollowersResources; -import org.mariotaku.microblog.library.twitter.api.HelpResources; -import org.mariotaku.microblog.library.twitter.api.ListResources; -import org.mariotaku.microblog.library.twitter.api.MutesResources; -import org.mariotaku.microblog.library.twitter.api.PlacesGeoResources; -import org.mariotaku.microblog.library.twitter.api.SavedSearchesResources; -import org.mariotaku.microblog.library.twitter.api.SearchResources; -import org.mariotaku.microblog.library.twitter.api.SpamReportingResources; -import org.mariotaku.microblog.library.twitter.api.TimelineResources; -import org.mariotaku.microblog.library.twitter.api.TrendsResources; -import org.mariotaku.microblog.library.twitter.api.TweetResources; -import org.mariotaku.microblog.library.twitter.api.UsersResources; +import org.mariotaku.microblog.library.api.twitter.DirectMessagesEventResources; +import org.mariotaku.microblog.library.api.twitter.FavoritesResources; +import org.mariotaku.microblog.library.api.twitter.FriendsFollowersResources; +import org.mariotaku.microblog.library.api.twitter.HelpResources; +import org.mariotaku.microblog.library.api.twitter.ListResources; +import org.mariotaku.microblog.library.api.twitter.MutesResources; +import org.mariotaku.microblog.library.api.twitter.PlacesGeoResources; +import org.mariotaku.microblog.library.api.twitter.SavedSearchesResources; +import org.mariotaku.microblog.library.api.twitter.SearchResources; +import org.mariotaku.microblog.library.api.twitter.SpamReportingResources; +import org.mariotaku.microblog.library.api.twitter.TimelineResources; +import org.mariotaku.microblog.library.api.twitter.TrendsResources; +import org.mariotaku.microblog.library.api.twitter.TweetResources; +import org.mariotaku.microblog.library.api.twitter.UsersResources; /** * Created by mariotaku on 16/5/13. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterCaps.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterCaps.java index 90a1589a3..cbb2a69b9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterCaps.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterCaps.java @@ -24,10 +24,10 @@ import org.mariotaku.restfu.annotation.param.Param; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.restfu.http.BodyType; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.CardDataMap; -import org.mariotaku.microblog.library.twitter.model.CardResponse; -import org.mariotaku.microblog.library.twitter.model.CreateCardData; -import org.mariotaku.microblog.library.twitter.model.CreateCardResult; +import org.mariotaku.microblog.library.model.microblog.CardDataMap; +import org.mariotaku.microblog.library.model.microblog.CardResponse; +import org.mariotaku.microblog.library.model.microblog.CreateCardData; +import org.mariotaku.microblog.library.model.microblog.CreateCardResult; /** * Card API maybe?? diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterOAuth2.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterOAuth2.java index d720b688e..be3417bb6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterOAuth2.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterOAuth2.java @@ -22,9 +22,8 @@ import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Header; import org.mariotaku.restfu.annotation.param.KeyValue; import org.mariotaku.restfu.annotation.param.Params; -import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.auth.OAuth2GetTokenHeader; -import org.mariotaku.microblog.library.twitter.auth.OAuth2Token; +import org.mariotaku.microblog.library.auth.OAuth2GetTokenHeader; +import org.mariotaku.microblog.library.auth.OAuth2Token; /** * Created by mariotaku on 16/1/4. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterPrivate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterPrivate.java index c366dbea5..5c10923f0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterPrivate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterPrivate.java @@ -18,13 +18,13 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.twitter.api.PrivateAccountResources; -import org.mariotaku.microblog.library.twitter.api.PrivateActivityResources; -import org.mariotaku.microblog.library.twitter.api.PrivateDirectMessagesResources; -import org.mariotaku.microblog.library.twitter.api.PrivateFriendsFollowersResources; -import org.mariotaku.microblog.library.twitter.api.PrivateSearchResources; -import org.mariotaku.microblog.library.twitter.api.PrivateTimelineResources; -import org.mariotaku.microblog.library.twitter.api.PrivateTweetResources; +import org.mariotaku.microblog.library.api.twitter.PrivateAccountResources; +import org.mariotaku.microblog.library.api.twitter.PrivateActivityResources; +import org.mariotaku.microblog.library.api.twitter.PrivateDirectMessagesResources; +import org.mariotaku.microblog.library.api.twitter.PrivateFriendsFollowersResources; +import org.mariotaku.microblog.library.api.twitter.PrivateSearchResources; +import org.mariotaku.microblog.library.api.twitter.PrivateTimelineResources; +import org.mariotaku.microblog.library.api.twitter.PrivateTweetResources; /** * Created by mariotaku on 16/3/4. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUpload.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUpload.java index 4027cde46..9ecf55a49 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUpload.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUpload.java @@ -18,11 +18,10 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.annotation.MediaCategory; -import org.mariotaku.microblog.library.twitter.model.MediaUploadResponse; -import org.mariotaku.microblog.library.twitter.model.NewMediaMetadata; -import org.mariotaku.microblog.library.twitter.model.ResponseCode; +import org.mariotaku.microblog.library.annotation.twitter.MediaCategory; +import org.mariotaku.microblog.library.model.microblog.MediaUploadResponse; +import org.mariotaku.microblog.library.model.microblog.NewMediaMetadata; +import org.mariotaku.microblog.library.model.microblog.ResponseCode; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.KeyValue; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUserStream.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUserStream.java index 82c666bb0..2c6ff4ed7 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUserStream.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/TwitterUserStream.java @@ -18,8 +18,8 @@ package org.mariotaku.microblog.library; -import org.mariotaku.microblog.library.twitter.annotation.StreamWith; -import org.mariotaku.microblog.library.twitter.callback.UserStreamCallback; +import org.mariotaku.microblog.library.annotation.twitter.StreamWith; +import org.mariotaku.microblog.library.callback.twitter.UserStreamCallback; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Params; 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/annotation/mastodon/AuthScope.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/AuthScope.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/mastodon/AuthScope.java index a8bf2e96d..5072fa01a 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/annotation/mastodon/AuthScope.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.annotation; +package org.mariotaku.microblog.library.annotation.mastodon; import android.support.annotation.StringDef; 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/annotation/mastodon/StatusVisibility.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/annotation/StatusVisibility.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/mastodon/StatusVisibility.java index 82cbaa619..bdb22999c 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/annotation/mastodon/StatusVisibility.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.annotation; +package org.mariotaku.microblog.library.annotation.mastodon; import android.support.annotation.StringDef; 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/annotation/twitter/MediaCategory.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/MediaCategory.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/twitter/MediaCategory.java index efac472df..e2cd1339b 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/annotation/twitter/MediaCategory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.annotation; +package org.mariotaku.microblog.library.annotation.twitter; import android.support.annotation.StringDef; 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/annotation/twitter/StreamWith.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/annotation/StreamWith.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/twitter/StreamWith.java index 8878d8e1e..a27e91b2b 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/annotation/twitter/StreamWith.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.annotation; +package org.mariotaku.microblog.library.annotation.twitter; import android.support.annotation.StringDef; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/BlocksResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/BlocksResources.java similarity index 84% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/BlocksResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/BlocksResources.java index 8cf9f8ff9..830986bbe 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/BlocksResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/BlocksResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.User; /** * Created by mariotaku on 16/3/11. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/DirectMessagesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/DirectMessagesResources.java similarity index 83% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/DirectMessagesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/DirectMessagesResources.java index a8d61e449..f14d2800b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/DirectMessagesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/DirectMessagesResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.fanfou.model.Conversation; -import org.mariotaku.microblog.library.twitter.model.DirectMessage; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; +import org.mariotaku.microblog.library.model.fanfou.Conversation; +import org.mariotaku.microblog.library.model.microblog.DirectMessage; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FavoritesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/FavoritesResources.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FavoritesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/FavoritesResources.java index e2234182d..5401d0978 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FavoritesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/FavoritesResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Path; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Status; /** * Created by mariotaku on 16/3/11. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FriendshipsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/FriendshipsResources.java similarity index 87% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FriendshipsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/FriendshipsResources.java index 462e994bc..bc9222404 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/FriendshipsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/FriendshipsResources.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.User; /** * Created by mariotaku on 16/3/11. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/PhotosResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/PhotosResources.java similarity index 81% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/PhotosResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/PhotosResources.java index 04dcdf649..bfaaf3d4a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/PhotosResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/PhotosResources.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.restfu.http.BodyType; -import org.mariotaku.microblog.library.fanfou.model.PhotoStatusUpdate; +import org.mariotaku.microblog.library.model.fanfou.PhotoStatusUpdate; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; /** * Created by mariotaku on 16/3/10. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/SearchResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/SearchResources.java similarity index 80% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/SearchResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/SearchResources.java index bc7454b14..f3b543e1f 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/SearchResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/SearchResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/StatusesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/StatusesResources.java similarity index 83% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/StatusesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/StatusesResources.java index d9653746d..86dc0c6a0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/StatusesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/StatusesResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; /** * Created by mariotaku on 16/3/10. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/TrendsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/TrendsResources.java similarity index 89% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/TrendsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/TrendsResources.java index 49804c1c2..9ae5b2748 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/TrendsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/TrendsResources.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Trends; +import org.mariotaku.microblog.library.model.microblog.Trends; import org.mariotaku.restfu.annotation.method.GET; /** diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/UsersResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/UsersResources.java similarity index 84% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/UsersResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/UsersResources.java index 53ed1d882..87185c2f5 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/api/UsersResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/fanfou/UsersResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.api; +package org.mariotaku.microblog.library.api.fanfou; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.User; /** * Created by mariotaku on 16/3/10. 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/api/mastodon/AccountsResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AccountsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/AccountsResources.java index 888e01808..189d9d321 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/api/mastodon/AccountsResources.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import android.support.annotation.Nullable; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Account; -import org.mariotaku.microblog.library.mastodon.model.AccountUpdate; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.mastodon.model.Relationship; -import org.mariotaku.microblog.library.mastodon.model.Status; -import org.mariotaku.microblog.library.mastodon.model.TimelineOption; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.Account; +import org.mariotaku.microblog.library.model.mastodon.AccountUpdate; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.mastodon.Relationship; +import org.mariotaku.microblog.library.model.mastodon.Status; +import org.mariotaku.microblog.library.model.mastodon.TimelineOption; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.PATCH; import org.mariotaku.restfu.annotation.method.POST; 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/api/mastodon/AppsResources.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/AppsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/AppsResources.java index b7d4d1fff..5efaf8b77 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/api/mastodon/AppsResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import android.support.annotation.Nullable; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.RegisteredApplication; +import org.mariotaku.microblog.library.model.mastodon.RegisteredApplication; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/BlocksResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/BlocksResources.java similarity index 81% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/BlocksResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/BlocksResources.java index a32ff1bc8..8886c4d38 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/BlocksResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/BlocksResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Account; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.Account; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FavouritesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FavouritesResources.java similarity index 82% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FavouritesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FavouritesResources.java index 5983462de..8cf8dbe30 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FavouritesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FavouritesResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.mastodon.model.Status; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.mastodon.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowRequestsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowRequestsResources.java similarity index 82% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowRequestsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowRequestsResources.java index a1f81c437..70a02f9e0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowRequestsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowRequestsResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Account; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseCode; +import org.mariotaku.microblog.library.model.mastodon.Account; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseCode; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Path; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java index 6d0908e99..e0de6dd7c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Account; +import org.mariotaku.microblog.library.model.mastodon.Account; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/InstancesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/InstancesResources.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/InstancesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/InstancesResources.java index 12d4f94fd..6ff1182da 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/InstancesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/InstancesResources.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; /** * Created by mariotaku on 2017/4/17. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/ListsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/ListsResources.java similarity index 90% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/ListsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/ListsResources.java index 4f1cbb2f8..e095e5496 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/ListsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/ListsResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import android.support.annotation.NonNull; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.mastodon.model.List; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.mastodon.List; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.DELETE; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/MediaResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/MediaResources.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/MediaResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/MediaResources.java index d359dcef4..3a2c136e9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/MediaResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/MediaResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Attachment; +import org.mariotaku.microblog.library.model.mastodon.Attachment; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; import org.mariotaku.restfu.http.BodyType; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/MutesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/MutesResources.java similarity index 81% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/MutesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/MutesResources.java index 5ea5c7082..6a3ea2970 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/MutesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/MutesResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Account; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.Account; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/NotificationsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/NotificationsResources.java similarity index 81% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/NotificationsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/NotificationsResources.java index 7613a5884..9fcef71b7 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/NotificationsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/NotificationsResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.mastodon.model.Notification; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.mastodon.Notification; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/ReportsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/ReportsResources.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/ReportsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/ReportsResources.java index c09d024e2..0af5c78a4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/ReportsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/ReportsResources.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; /** * Created by mariotaku on 2017/4/17. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/SearchResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/SearchResources.java similarity index 85% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/SearchResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/SearchResources.java index f4d310eb1..66a73128d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/SearchResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/SearchResources.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Results; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.Results; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/StatusesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/StatusesResources.java similarity index 82% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/StatusesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/StatusesResources.java index 81026fb19..5547d3509 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/StatusesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/StatusesResources.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Account; -import org.mariotaku.microblog.library.mastodon.model.Card; -import org.mariotaku.microblog.library.mastodon.model.Context; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.mastodon.model.Status; -import org.mariotaku.microblog.library.mastodon.model.StatusUpdate; -import org.mariotaku.microblog.library.twitter.model.ResponseCode; +import org.mariotaku.microblog.library.model.mastodon.Account; +import org.mariotaku.microblog.library.model.mastodon.Card; +import org.mariotaku.microblog.library.model.mastodon.Context; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.mastodon.Status; +import org.mariotaku.microblog.library.model.mastodon.StatusUpdate; +import org.mariotaku.microblog.library.model.microblog.ResponseCode; import org.mariotaku.restfu.annotation.method.DELETE; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/TimelinesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/TimelinesResources.java similarity index 88% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/TimelinesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/TimelinesResources.java index f1a214ee3..4bcf1782e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/TimelinesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/TimelinesResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.api; +package org.mariotaku.microblog.library.api.mastodon; import android.support.annotation.NonNull; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList; -import org.mariotaku.microblog.library.mastodon.model.Status; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList; +import org.mariotaku.microblog.library.model.mastodon.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.BooleanEncoding; import org.mariotaku.restfu.annotation.param.Path; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/microblog/api/DirectMessagesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/microblog/DirectMessagesResources.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/microblog/api/DirectMessagesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/microblog/DirectMessagesResources.java index 3b8afbd98..c007dd485 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/microblog/api/DirectMessagesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/microblog/DirectMessagesResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.microblog.api; +package org.mariotaku.microblog.library.api.microblog; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.DirectMessage; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; +import org.mariotaku.microblog.library.model.microblog.DirectMessage; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; import org.mariotaku.microblog.library.twitter.template.DirectMessageAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/GroupResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/GroupResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/GroupResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/GroupResources.java index 208bebcf5..15add4e34 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/GroupResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/GroupResources.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.api; +package org.mariotaku.microblog.library.api.statusnet; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Path; import org.mariotaku.restfu.annotation.param.Query; -import org.mariotaku.microblog.library.statusnet.model.Group; +import org.mariotaku.microblog.library.model.statusnet.Group; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.User; /** * Created by mariotaku on 16/3/4. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/SearchResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/SearchResources.java similarity index 81% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/SearchResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/SearchResources.java index d33ffff7f..10a0b7547 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/SearchResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/SearchResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.api; +package org.mariotaku.microblog.library.api.statusnet; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; /** * Created by mariotaku on 16/3/4. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/StatusNetResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/StatusNetResources.java similarity index 80% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/StatusNetResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/StatusNetResources.java index edb15cd3e..6c9ad9d08 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/StatusNetResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/StatusNetResources.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.api; +package org.mariotaku.microblog.library.api.statusnet; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Path; import org.mariotaku.restfu.annotation.param.Query; -import org.mariotaku.microblog.library.statusnet.model.StatusNetConfig; +import org.mariotaku.microblog.library.model.statusnet.StatusNetConfig; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; /** * Created by mariotaku on 16/2/27. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/TimelineResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/TimelineResources.java similarity index 81% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/TimelineResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/TimelineResources.java index fd1d1849e..6639c22ef 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/TimelineResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/TimelineResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.api; +package org.mariotaku.microblog.library.api.statusnet; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/UserResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/UserResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/UserResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/UserResources.java index 2f041e6f1..604d9757e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/api/UserResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/statusnet/UserResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.api; +package org.mariotaku.microblog.library.api.statusnet; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.User; /** * Created by mariotaku on 16/3/4. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/CollectionResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/CollectionResources.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/CollectionResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/CollectionResources.java index e4a615dd5..728b73ec7 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/CollectionResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/CollectionResources.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.param.Params; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/DirectMessagesEventResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/DirectMessagesEventResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/DirectMessagesEventResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/DirectMessagesEventResources.java index fc57d9deb..92864d414 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/DirectMessagesEventResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/DirectMessagesEventResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.DirectMessageEventObject; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseCode; +import org.mariotaku.microblog.library.model.microblog.DirectMessageEventObject; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseCode; import org.mariotaku.microblog.library.twitter.template.DirectMessageAnnotationTemplate; import org.mariotaku.restfu.annotation.method.DELETE; import org.mariotaku.restfu.annotation.method.GET; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FavoritesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/FavoritesResources.java similarity index 88% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FavoritesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/FavoritesResources.java index 2093624ce..2c12d4970 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FavoritesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/FavoritesResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FriendsFollowersResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/FriendsFollowersResources.java similarity index 90% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FriendsFollowersResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/FriendsFollowersResources.java index bc7dfc08f..4ad2e7816 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/FriendsFollowersResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/FriendsFollowersResources.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Friendship; -import org.mariotaku.microblog.library.twitter.model.FriendshipUpdate; -import org.mariotaku.microblog.library.twitter.model.IDs; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.Relationship; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.Friendship; +import org.mariotaku.microblog.library.model.microblog.FriendshipUpdate; +import org.mariotaku.microblog.library.model.microblog.IDs; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.Relationship; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.microblog.library.twitter.template.UserAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/HelpResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/HelpResources.java similarity index 88% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/HelpResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/HelpResources.java index ef5e5eb7e..5f6934239 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/HelpResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/HelpResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Language; -import org.mariotaku.microblog.library.twitter.model.RateLimitStatus; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.TwitterAPIConfiguration; +import org.mariotaku.microblog.library.model.microblog.Language; +import org.mariotaku.microblog.library.model.microblog.RateLimitStatus; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.TwitterAPIConfiguration; import java.util.Map; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/ListResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/ListResources.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/ListResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/ListResources.java index 529212d75..1c391ded9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/ListResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/ListResources.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import android.support.annotation.NonNull; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.User; -import org.mariotaku.microblog.library.twitter.model.UserList; -import org.mariotaku.microblog.library.twitter.model.UserListUpdate; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.User; +import org.mariotaku.microblog.library.model.microblog.UserList; +import org.mariotaku.microblog.library.model.microblog.UserListUpdate; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.microblog.library.twitter.template.UserAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/MutesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/MutesResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/MutesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/MutesResources.java index 7a1a9ccc8..3af211a3d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/MutesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/MutesResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.IDs; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.IDs; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.microblog.library.twitter.template.UserAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PlacesGeoResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PlacesGeoResources.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PlacesGeoResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PlacesGeoResources.java index 0147bc555..c6002bda9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PlacesGeoResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PlacesGeoResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.GeoLocation; -import org.mariotaku.microblog.library.twitter.model.GeoQuery; -import org.mariotaku.microblog.library.twitter.model.Place; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.SimilarPlaces; +import org.mariotaku.microblog.library.model.microblog.GeoLocation; +import org.mariotaku.microblog.library.model.microblog.GeoQuery; +import org.mariotaku.microblog.library.model.microblog.Place; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.SimilarPlaces; /** * @author Yusuke Yamamoto - yusuke at mac.com diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateAccountResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateAccountResources.java similarity index 90% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateAccountResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateAccountResources.java index 9e6a699af..0b5e9e349 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateAccountResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateAccountResources.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.PinTweetResult; +import org.mariotaku.microblog.library.model.microblog.PinTweetResult; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateActivityResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateActivityResources.java similarity index 84% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateActivityResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateActivityResources.java index 92e13c820..c3c1d2e76 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateActivityResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateActivityResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Activity; -import org.mariotaku.microblog.library.twitter.model.CursorTimestampResponse; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Activity; +import org.mariotaku.microblog.library.model.microblog.CursorTimestampResponse; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateDirectMessagesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateDirectMessagesResources.java similarity index 88% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateDirectMessagesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateDirectMessagesResources.java index 8aedefa37..c62c4f09b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateDirectMessagesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateDirectMessagesResources.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import android.support.annotation.Nullable; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.ConversationTimeline; -import org.mariotaku.microblog.library.twitter.model.DMResponse; -import org.mariotaku.microblog.library.twitter.model.NewDm; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseCode; -import org.mariotaku.microblog.library.twitter.model.UserEvents; -import org.mariotaku.microblog.library.twitter.model.UserInbox; +import org.mariotaku.microblog.library.model.microblog.ConversationTimeline; +import org.mariotaku.microblog.library.model.microblog.DMResponse; +import org.mariotaku.microblog.library.model.microblog.NewDm; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseCode; +import org.mariotaku.microblog.library.model.microblog.UserEvents; +import org.mariotaku.microblog.library.model.microblog.UserInbox; import org.mariotaku.microblog.library.twitter.template.DMAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateFriendsFollowersResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateFriendsFollowersResources.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateFriendsFollowersResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateFriendsFollowersResources.java index 82cbedbd7..15a298a66 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateFriendsFollowersResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateFriendsFollowersResources.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.KeyValue; import org.mariotaku.restfu.annotation.param.Param; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateMutesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateMutesResources.java similarity index 80% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateMutesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateMutesResources.java index deb4e98dc..9b87ccccd 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateMutesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateMutesResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.IDs; -import org.mariotaku.microblog.library.twitter.model.MutedKeyword; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.microblog.IDs; +import org.mariotaku.microblog.library.model.microblog.MutedKeyword; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; import org.mariotaku.microblog.library.twitter.template.UserAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Params; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateResources.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateResources.java index 03a6f8c98..d230c5140 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateResources.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; public interface PrivateResources { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateSearchResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateSearchResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateSearchResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateSearchResources.java index 750fd4dac..bbeb91857 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateSearchResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateSearchResources.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.UniversalSearchQuery; -import org.mariotaku.microblog.library.twitter.model.UniversalSearchResult; +import org.mariotaku.microblog.library.model.microblog.UniversalSearchQuery; +import org.mariotaku.microblog.library.model.microblog.UniversalSearchResult; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Params; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTimelineResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateTimelineResources.java similarity index 85% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTimelineResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateTimelineResources.java index 3b589dac1..87288e64d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTimelineResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateTimelineResources.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Params; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTweetResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateTweetResources.java similarity index 78% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTweetResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateTweetResources.java index 5d2b37faa..03b4f2f47 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/PrivateTweetResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/PrivateTweetResources.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.StatusActivitySummary; -import org.mariotaku.microblog.library.twitter.model.TranslationResult; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.StatusActivitySummary; +import org.mariotaku.microblog.library.model.microblog.TranslationResult; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Params; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SavedSearchesResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SavedSearchesResources.java similarity index 89% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SavedSearchesResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SavedSearchesResources.java index 1058d1acc..fe280a8e3 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SavedSearchesResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SavedSearchesResources.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; @@ -24,8 +24,8 @@ import org.mariotaku.restfu.annotation.param.Param; import org.mariotaku.restfu.annotation.param.Path; import org.mariotaku.restfu.http.BodyType; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.SavedSearch; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.SavedSearch; @SuppressWarnings("RedundantThrows") public interface SavedSearchesResources { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SearchResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SearchResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SearchResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SearchResources.java index c1264ba27..ea6a16763 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SearchResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SearchResources.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.QueryResult; -import org.mariotaku.microblog.library.twitter.model.SearchQuery; +import org.mariotaku.microblog.library.model.microblog.QueryResult; +import org.mariotaku.microblog.library.model.microblog.SearchQuery; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Params; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SpamReportingResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SpamReportingResources.java similarity index 92% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SpamReportingResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SpamReportingResources.java index 92900d910..ccf1cc950 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/SpamReportingResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/SpamReportingResources.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.restfu.annotation.method.POST; import org.mariotaku.restfu.annotation.param.Param; import org.mariotaku.restfu.http.BodyType; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.User; /** * @author Joern Huxhorn - jhuxhorn at googlemail.com diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TimelineResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TimelineResources.java similarity index 87% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TimelineResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TimelineResources.java index 17edf9f98..cf38ce787 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TimelineResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TimelineResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.TimelineOption; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.TimelineOption; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Params; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TrendsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TrendsResources.java similarity index 82% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TrendsResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TrendsResources.java index 87961fd8e..b281395f7 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TrendsResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TrendsResources.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.param.Query; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.GeoLocation; -import org.mariotaku.microblog.library.twitter.model.Location; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Trends; +import org.mariotaku.microblog.library.model.microblog.GeoLocation; +import org.mariotaku.microblog.library.model.microblog.Location; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Trends; /** * @author Joern Huxhorn - jhuxhorn at googlemail.com diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TweetResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TweetResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TweetResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TweetResources.java index d1e5f2677..7557db1db 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/TweetResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/TweetResources.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.IDs; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.StatusUpdate; +import org.mariotaku.microblog.library.model.microblog.IDs; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.StatusUpdate; import org.mariotaku.microblog.library.twitter.template.StatusAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/UsersResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/UsersResources.java similarity index 86% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/UsersResources.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/UsersResources.java index abe68da1f..150875bee 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/api/UsersResources.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/twitter/UsersResources.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.api; +package org.mariotaku.microblog.library.api.twitter; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.AccountSettings; -import org.mariotaku.microblog.library.twitter.model.Category; -import org.mariotaku.microblog.library.twitter.model.IDs; -import org.mariotaku.microblog.library.twitter.model.PageableResponseList; -import org.mariotaku.microblog.library.twitter.model.Paging; -import org.mariotaku.microblog.library.twitter.model.ProfileUpdate; -import org.mariotaku.microblog.library.twitter.model.ResponseCode; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.SettingsUpdate; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.AccountSettings; +import org.mariotaku.microblog.library.model.microblog.Category; +import org.mariotaku.microblog.library.model.microblog.IDs; +import org.mariotaku.microblog.library.model.microblog.PageableResponseList; +import org.mariotaku.microblog.library.model.microblog.Paging; +import org.mariotaku.microblog.library.model.microblog.ProfileUpdate; +import org.mariotaku.microblog.library.model.microblog.ResponseCode; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.SettingsUpdate; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.microblog.library.twitter.template.UserAnnotationTemplate; import org.mariotaku.restfu.annotation.method.GET; import org.mariotaku.restfu.annotation.method.POST; 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/auth/BasicAuthorization.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BasicAuthorization.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/BasicAuthorization.java index 1de3f1868..c2bb8fb5f 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/auth/BasicAuthorization.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.auth; +package org.mariotaku.microblog.library.auth; import android.support.annotation.NonNull; import android.util.Base64; @@ -25,9 +25,6 @@ import org.mariotaku.restfu.RestRequest; import org.mariotaku.restfu.http.Authorization; import org.mariotaku.restfu.http.Endpoint; -/** - * Created by mariotaku on 15/4/19. - */ public final class BasicAuthorization implements Authorization { private final String user; 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/auth/BearerAuthorization.java similarity index 88% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/BearerAuthorization.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/BearerAuthorization.java index 6452e10e1..67e89b648 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/auth/BearerAuthorization.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.auth; +package org.mariotaku.microblog.library.auth; import android.support.annotation.NonNull; @@ -24,10 +24,7 @@ import org.mariotaku.restfu.RestRequest; import org.mariotaku.restfu.http.Authorization; import org.mariotaku.restfu.http.Endpoint; -/** - * Created by mariotaku on 16/1/4. - */ -public class BearerAuthorization implements Authorization { +public final class BearerAuthorization implements Authorization { private final String accessToken; public BearerAuthorization(String accessToken) { 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/auth/EmptyAuthorization.java similarity index 92% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/EmptyAuthorization.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/EmptyAuthorization.java index 75a678243..2b24559dc 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/auth/EmptyAuthorization.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.auth; +package org.mariotaku.microblog.library.auth; import android.support.annotation.NonNull; @@ -24,9 +24,6 @@ import org.mariotaku.restfu.RestRequest; import org.mariotaku.restfu.http.Authorization; import org.mariotaku.restfu.http.Endpoint; -/** - * Created by mariotaku on 15/4/19. - */ public final class EmptyAuthorization implements Authorization { @Override diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2GetTokenHeader.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/OAuth2GetTokenHeader.java similarity index 87% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2GetTokenHeader.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/OAuth2GetTokenHeader.java index 85a210033..8f6a56fd4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2GetTokenHeader.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/OAuth2GetTokenHeader.java @@ -16,17 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.auth; +package org.mariotaku.microblog.library.auth; import android.util.Base64; import org.mariotaku.restfu.http.HeaderValue; import org.mariotaku.restfu.oauth.OAuthToken; -/** - * Created by mariotaku on 16/1/4. - */ -public class OAuth2GetTokenHeader implements HeaderValue { +public final class OAuth2GetTokenHeader implements HeaderValue { private final OAuthToken token; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2Token.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/OAuth2Token.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2Token.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/OAuth2Token.java index d9fe2e6bb..2f4cd1255 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/OAuth2Token.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/auth/OAuth2Token.java @@ -16,14 +16,11 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.auth; +package org.mariotaku.microblog.library.auth; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -/** - * Created by mariotaku on 16/1/4. - */ @JsonObject public class OAuth2Token { @JsonField(name = "token_type") 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/callback/fanfou/FanfouUserStreamCallback.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/callback/fanfou/FanfouUserStreamCallback.java index 34ff7ea87..a78dbbedd 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/callback/fanfou/FanfouUserStreamCallback.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.callback; +package org.mariotaku.microblog.library.callback.fanfou; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.fanfou.model.FanfouStreamObject; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.fanfou.FanfouStreamObject; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.microblog.library.util.CRLFLineReader; import org.mariotaku.restfu.callback.RawCallback; import org.mariotaku.restfu.http.HttpResponse; 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/callback/fanfou/SimpleFanfouUserStreamCallback.java similarity index 89% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/callback/fanfou/SimpleFanfouUserStreamCallback.java index 1d0a9ae64..ea0e5c8dc 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/callback/fanfou/SimpleFanfouUserStreamCallback.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.callback; +package org.mariotaku.microblog.library.callback.fanfou; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.User; import java.io.IOException; import java.util.Date; 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/callback/mastodon/MastodonUserStreamCallback.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/callback/MastodonUserStreamCallback.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/callback/mastodon/MastodonUserStreamCallback.java index 90c3485b6..c542d17ef 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/callback/mastodon/MastodonUserStreamCallback.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.callback; +package org.mariotaku.microblog.library.callback.mastodon; import android.support.annotation.NonNull; import android.text.TextUtils; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.mastodon.model.Notification; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.mastodon.Notification; +import org.mariotaku.microblog.library.model.microblog.Status; import org.mariotaku.microblog.library.util.CRLFLineReader; import org.mariotaku.restfu.callback.RawCallback; import org.mariotaku.restfu.http.HttpResponse; 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/callback/twitter/SimpleUserStreamCallback.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/SimpleUserStreamCallback.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/callback/twitter/SimpleUserStreamCallback.java index a054a898d..a9a881f38 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/callback/twitter/SimpleUserStreamCallback.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.callback; +package org.mariotaku.microblog.library.callback.twitter; import android.support.annotation.NonNull; -import org.mariotaku.microblog.library.twitter.model.DeletionEvent; -import org.mariotaku.microblog.library.twitter.model.DirectMessage; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.TwitterStreamObject; -import org.mariotaku.microblog.library.twitter.model.User; -import org.mariotaku.microblog.library.twitter.model.UserList; -import org.mariotaku.microblog.library.twitter.model.Warning; +import org.mariotaku.microblog.library.model.microblog.DeletionEvent; +import org.mariotaku.microblog.library.model.microblog.DirectMessage; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.TwitterStreamObject; +import org.mariotaku.microblog.library.model.microblog.User; +import org.mariotaku.microblog.library.model.microblog.UserList; +import org.mariotaku.microblog.library.model.microblog.Warning; import java.io.IOException; import java.util.Date; 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/callback/twitter/UserStreamCallback.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/callback/UserStreamCallback.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/callback/twitter/UserStreamCallback.java index e226b3f5e..2f36b7d16 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/callback/twitter/UserStreamCallback.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.callback; +package org.mariotaku.microblog.library.callback.twitter; import android.support.annotation.NonNull; import android.text.TextUtils; import org.mariotaku.microblog.library.MicroBlogException; -import org.mariotaku.microblog.library.twitter.model.DeletionEvent; -import org.mariotaku.microblog.library.twitter.model.DirectMessage; -import org.mariotaku.microblog.library.twitter.model.Status; -import org.mariotaku.microblog.library.twitter.model.StatusTargetObjectEvent; -import org.mariotaku.microblog.library.twitter.model.StreamEvent; -import org.mariotaku.microblog.library.twitter.model.TwitterStreamObject; -import org.mariotaku.microblog.library.twitter.model.TwitterStreamObject.Type; -import org.mariotaku.microblog.library.twitter.model.User; -import org.mariotaku.microblog.library.twitter.model.UserList; -import org.mariotaku.microblog.library.twitter.model.UserListTargetObjectEvent; -import org.mariotaku.microblog.library.twitter.model.Warning; +import org.mariotaku.microblog.library.model.microblog.DeletionEvent; +import org.mariotaku.microblog.library.model.microblog.DirectMessage; +import org.mariotaku.microblog.library.model.microblog.Status; +import org.mariotaku.microblog.library.model.microblog.StatusTargetObjectEvent; +import org.mariotaku.microblog.library.model.microblog.StreamEvent; +import org.mariotaku.microblog.library.model.microblog.TwitterStreamObject; +import org.mariotaku.microblog.library.model.microblog.TwitterStreamObject.Type; +import org.mariotaku.microblog.library.model.microblog.User; +import org.mariotaku.microblog.library.model.microblog.UserList; +import org.mariotaku.microblog.library.model.microblog.UserListTargetObjectEvent; +import org.mariotaku.microblog.library.model.microblog.Warning; import org.mariotaku.microblog.library.util.CRLFLineReader; import org.mariotaku.restfu.callback.RawCallback; import org.mariotaku.restfu.http.HttpResponse; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/http/HttpResponseCode.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/http/HttpResponseCode.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/http/HttpResponseCode.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/http/HttpResponseCode.java index 378493f17..7fd381f2d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/http/HttpResponseCode.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/http/HttpResponseCode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.http; +package org.mariotaku.microblog.library.http; /** * @author Yusuke Yamamoto - yusuke at mac.com diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/Conversation.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/Conversation.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/Conversation.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/Conversation.java index c3aaf417e..9ff368302 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/Conversation.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/Conversation.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.model; +package org.mariotaku.microblog.library.model.fanfou; import android.os.Parcel; import android.os.Parcelable; @@ -25,7 +25,7 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.DirectMessage; +import org.mariotaku.microblog.library.model.microblog.DirectMessage; /** * Fanfou DM conversation object 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/model/fanfou/FanfouStreamObject.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/FanfouStreamObject.java index 08df2d13a..7799d7c06 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/model/fanfou/FanfouStreamObject.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.model; +package org.mariotaku.microblog.library.model.fanfou; import android.support.annotation.NonNull; @@ -24,8 +24,8 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import org.mariotaku.commons.logansquare.JsonStringConverter; -import org.mariotaku.microblog.library.fanfou.model.util.StreamDateConverter; -import org.mariotaku.microblog.library.twitter.model.User; +import org.mariotaku.microblog.library.model.fanfou.util.StreamDateConverter; +import org.mariotaku.microblog.library.model.microblog.User; import org.mariotaku.twidere.util.JsonSerializer; import java.io.IOException; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/Photo.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/Photo.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/Photo.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/Photo.java index 0e7bbc556..8c98a8683 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/Photo.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/Photo.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.model; +package org.mariotaku.microblog.library.model.fanfou; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 16/3/10. - */ @ParcelablePlease @JsonObject public class Photo implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/PhotoStatusUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/PhotoStatusUpdate.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/PhotoStatusUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/PhotoStatusUpdate.java index 42c3a255b..f1e1e86f8 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/PhotoStatusUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/PhotoStatusUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.model; +package org.mariotaku.microblog.library.model.fanfou; import org.mariotaku.restfu.http.SimpleValueMap; import org.mariotaku.restfu.http.mime.Body; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/util/StreamDateConverter.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/util/StreamDateConverter.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/util/StreamDateConverter.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/util/StreamDateConverter.java index 1342fe7a4..4d5e75090 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/model/util/StreamDateConverter.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/fanfou/util/StreamDateConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.fanfou.model.util; +package org.mariotaku.microblog.library.model.fanfou.util; import com.bluelinelabs.logansquare.typeconverters.DateTypeConverter; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/gnusocial/model/Attachment.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/gnusocial/Attachment.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/gnusocial/model/Attachment.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/gnusocial/Attachment.java index f07db9c8f..34e29a233 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/gnusocial/model/Attachment.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/gnusocial/Attachment.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.gnusocial.model; +package org.mariotaku.microblog.library.model.gnusocial; import android.os.Parcel; import android.os.Parcelable; @@ -27,8 +27,6 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; /** * GNUSocial attachment model - *

- * Created by mariotaku on 16/1/26. */ @ParcelablePlease @JsonObject diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Account.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Account.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Account.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Account.java index e3de994be..b0ac67b05 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Account.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Account.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/AccountUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/AccountUpdate.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/AccountUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/AccountUpdate.java index 613c753f5..d90a41f54 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/AccountUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/AccountUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import org.mariotaku.restfu.http.SimpleValueMap; import org.mariotaku.restfu.http.mime.Body; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Application.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Application.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Application.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Application.java index 28cc00d33..1a3c66bc4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Application.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Application.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Attachment.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Attachment.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Attachment.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Attachment.java index de8132687..5080c9a09 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Attachment.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Attachment.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Card.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Card.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Card.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Card.java index c57291667..4cc40d633 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Card.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Card.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import android.support.annotation.StringDef; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Context.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Context.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Context.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Context.java index caa9e4f4b..968226f67 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Context.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Context.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Emoji.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Emoji.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Emoji.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Emoji.java index 15d481848..4f3609b27 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Emoji.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Emoji.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Error.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Error.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Error.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Error.java index ad3a2ea51..8bddeca50 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Error.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Error.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Instance.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Instance.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Instance.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Instance.java index 0c540adca..cf61098aa 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Instance.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Instance.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/LinkHeaderList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/LinkHeaderList$$JsonObjectMapper.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/LinkHeaderList$$JsonObjectMapper.java index 09b7c6992..e9ccf338b 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/model/mastodon/LinkHeaderList$$JsonObjectMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import android.support.annotation.Keep; 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/model/mastodon/LinkHeaderList.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/LinkHeaderList.java index be7ba0fcf..0768ccb41 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/model/mastodon/LinkHeaderList.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; 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/model/mastodon/LinkHeaderResponse.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderResponse.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/LinkHeaderResponse.java index 1882d59b2..3d2ca8404 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/model/mastodon/LinkHeaderResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/List.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/List.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/List.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/List.java index 543f76b87..8b93460ed 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/List.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/List.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Mention.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Mention.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Mention.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Mention.java index 0054b6af7..7e814787c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Mention.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Mention.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Notification.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Notification.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Notification.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Notification.java index 899798146..66c8f50d3 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/model/mastodon/Notification.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import android.support.annotation.Nullable; import android.support.annotation.StringDef; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/RegisteredApplication.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/RegisteredApplication.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/RegisteredApplication.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/RegisteredApplication.java index 27668d85d..3856e9d54 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/RegisteredApplication.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/RegisteredApplication.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Relationship.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Relationship.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Relationship.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Relationship.java index c93866af8..8e85368cf 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Relationship.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Relationship.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/Report.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Report.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Report.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Report.java index 477ba36f5..a29758e2b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Report.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Report.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/model/mastodon/Results.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Results.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Results.java index 0a53c4f24..6220701a7 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/model/mastodon/Results.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Status.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Status.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Status.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Status.java index c11e6455f..b14f68c71 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Status.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Status.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import org.mariotaku.microblog.library.mastodon.annotation.StatusVisibility; +import org.mariotaku.microblog.library.annotation.mastodon.StatusVisibility; import java.util.Arrays; import java.util.Date; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/StatusUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/StatusUpdate.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/StatusUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/StatusUpdate.java index aca0d00d9..ef41cc5cb 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/StatusUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/StatusUpdate.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; -import org.mariotaku.microblog.library.mastodon.annotation.StatusVisibility; +import org.mariotaku.microblog.library.annotation.mastodon.StatusVisibility; import org.mariotaku.restfu.http.SimpleValueMap; /** diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Tag.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Tag.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Tag.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Tag.java index 43ff8e4f2..8190382b6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/Tag.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/Tag.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; 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/TimelineOption.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/TimelineOption.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/TimelineOption.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/TimelineOption.java index 40a062156..9b0fad7ba 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/TimelineOption.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/mastodon/TimelineOption.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.mastodon.model; +package org.mariotaku.microblog.library.model.mastodon; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/AccountSettings.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/AccountSettings.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/AccountSettings.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/AccountSettings.java index 9f77300dd..be9f49279 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/AccountSettings.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/AccountSettings.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; 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/model/microblog/Activity.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Activity.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Activity.java index 36857d359..6e337a5f4 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/model/microblog/Activity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -31,7 +31,7 @@ import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; import org.mariotaku.commons.logansquare.JsonStringConverter; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.io.IOException; import java.lang.annotation.Retention; 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/model/microblog/CardDataMap.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CardDataMap.java index 244c1bc4e..c1357be5c 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/model/microblog/CardDataMap.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.NonNull; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardEntity.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CardEntity.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardEntity.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CardEntity.java index 6af9aef58..5639dbf36 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardEntity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CardEntity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -28,14 +28,11 @@ import com.hannesdorfmann.parcelableplease.annotation.Bagger; import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger; +import org.mariotaku.microblog.library.model.util.ParcelMapBagger; import java.util.HashMap; import java.util.Map; -/** - * Created by mariotaku on 15/5/7. - */ @ParcelablePlease @JsonObject public class CardEntity implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CardResponse.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardResponse.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CardResponse.java index f4f3259ee..648fee521 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardResponse.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CardResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Category.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Category.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Category.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Category.java index cd06522fe..8cf8c92de 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Category.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Category.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,6 +25,7 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; + @ParcelablePlease @JsonObject public class Category implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Contributor.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Contributor.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Contributor.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Contributor.java index 698618a8e..d9a0de4a5 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Contributor.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Contributor.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/12/25. - */ @ParcelablePlease @JsonObject public class Contributor implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ConversationTimeline.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ConversationTimeline.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ConversationTimeline.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ConversationTimeline.java index a5c60ca27..62bd2ddc5 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ConversationTimeline.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ConversationTimeline.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/CreateCardData.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CreateCardData.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CreateCardData.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CreateCardData.java index ce059beaa..0f454e520 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CreateCardData.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CreateCardData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; /** * Example diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CreateCardResult.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CreateCardResult.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CreateCardResult.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CreateCardResult.java index cac601a53..8ea3650d5 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CreateCardResult.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CreateCardResult.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/CursorSupport.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CursorSupport.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CursorSupport.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CursorSupport.java index 42af721dd..be91e3921 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CursorSupport.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CursorSupport.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; /** * @author Yusuke Yamamoto - yusuke at mac.com diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CursorTimestampResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CursorTimestampResponse.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CursorTimestampResponse.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CursorTimestampResponse.java index c657a649b..effa23e92 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CursorTimestampResponse.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/CursorTimestampResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/DMResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DMResponse.java similarity index 99% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DMResponse.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DMResponse.java index 422bc6863..da36b885b 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/model/microblog/DMResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -27,16 +27,13 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.Bagger; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger; +import org.mariotaku.microblog.library.model.util.ParcelMapBagger; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Arrays; import java.util.Map; -/** - * Created by mariotaku on 16/3/1. - */ @ParcelablePlease @JsonObject public class DMResponse implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DeletionEvent.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DeletionEvent.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DeletionEvent.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DeletionEvent.java index 735d09b3b..3c6d8a16e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DeletionEvent.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DeletionEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/DirectMessage.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DirectMessage.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DirectMessage.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DirectMessage.java index 6947c6231..d819dcfb0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DirectMessage.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DirectMessage.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -26,14 +26,11 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.io.IOException; import java.util.Date; -/** - * Created by mariotaku on 15/5/7. - */ @ParcelablePlease @JsonObject public class DirectMessage extends TwitterResponseObject implements TwitterResponse, EntitySupport, diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DirectMessageEventObject.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DirectMessageEventObject.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DirectMessageEventObject.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DirectMessageEventObject.java index b1b127240..dce59fb44 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/DirectMessageEventObject.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/DirectMessageEventObject.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/Entities.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Entities.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Entities.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Entities.java index b36bc79a2..5a9741244 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Entities.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Entities.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -27,9 +27,6 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; import java.util.Arrays; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease @JsonObject public class Entities implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/EntitySupport.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/EntitySupport.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/EntitySupport.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/EntitySupport.java index e717120e2..0157dd17b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/EntitySupport.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/EntitySupport.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; /** * @author Yusuke Yamamoto - yusuke at mac.com diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ErrorInfo.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ErrorInfo.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ErrorInfo.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ErrorInfo.java index ea5ee4782..e5d4e68cd 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ErrorInfo.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ErrorInfo.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/ExtendedEntitySupport.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ExtendedEntitySupport.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedEntitySupport.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ExtendedEntitySupport.java index d9438e06a..b2467c61c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedEntitySupport.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ExtendedEntitySupport.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; public interface ExtendedEntitySupport extends EntitySupport { 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/model/microblog/ExtendedProfile.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ExtendedProfile.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ExtendedProfile.java index f803d0c52..e8d481a01 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/model/microblog/ExtendedProfile.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -26,12 +26,10 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - * Created by mariotaku on 15/7/8. - */ @ParcelablePlease @JsonObject public class ExtendedProfile implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Friendship.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Friendship.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Friendship.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Friendship.java index 30ac86266..dbe141d7f 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Friendship.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Friendship.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; public class Friendship { public long getId() { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/FriendshipUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/FriendshipUpdate.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/FriendshipUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/FriendshipUpdate.java index 012b1d389..751a8e93d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/FriendshipUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/FriendshipUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import org.mariotaku.restfu.http.SimpleValueMap; 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/model/microblog/GeoLocation.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoLocation.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/GeoLocation.java index 680effdfd..bb8285f16 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/model/microblog/GeoLocation.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoPoint.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/GeoPoint.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoPoint.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/GeoPoint.java index 4a3a78f4f..b9cd43bb5 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoPoint.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/GeoPoint.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -26,9 +26,6 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/5/7. - */ @ParcelablePlease @JsonObject public class GeoPoint implements Parcelable { 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/model/microblog/GeoQuery.java similarity index 99% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/GeoQuery.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/GeoQuery.java index 82bdc6f8b..4d972f195 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/model/microblog/GeoQuery.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.NonNull; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/HashtagEntity.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/HashtagEntity.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/HashtagEntity.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/HashtagEntity.java index 708d37acb..f8dd25a42 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/HashtagEntity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/HashtagEntity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease @JsonObject public class HashtagEntity implements Parcelable { 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/model/microblog/IDs$$JsonObjectMapper.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/IDs$$JsonObjectMapper.java index 95c9b4292..40902d55f 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/model/microblog/IDs$$JsonObjectMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.Keep; 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/model/microblog/IDs.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/IDs.java index dedf3dd40..e70d0dbaa 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/model/microblog/IDs.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -31,9 +31,6 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; import java.io.IOException; -/** - * Created by mariotaku on 15/5/10. - */ @ParcelablePlease @Keep public class IDs extends TwitterResponseObject implements TwitterResponse, CursorSupport, Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Indices.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Indices.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Indices.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Indices.java index 6644a62e3..78f4cb536 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Indices.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Indices.java @@ -16,16 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease public class Indices implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IndicesConverter.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/IndicesConverter.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IndicesConverter.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/IndicesConverter.java index 3dfbc976f..49ce51bfd 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IndicesConverter.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/IndicesConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import com.bluelinelabs.logansquare.typeconverters.TypeConverter; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Language.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Language.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Language.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Language.java index 20b1dae81..e419defc1 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Language.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Language.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/5/10. - */ @ParcelablePlease @JsonObject public class Language implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Location.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Location.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Location.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Location.java index b28e5c20f..cc444bfd7 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Location.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Location.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/5/10. - */ @ParcelablePlease @JsonObject public class Location implements Parcelable { 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/model/microblog/MediaEntity.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaEntity.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/MediaEntity.java index e13192601..629751ae8 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/model/microblog/MediaEntity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -28,16 +28,13 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.Bagger; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger; +import org.mariotaku.microblog.library.model.util.ParcelMapBagger; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Arrays; import java.util.Map; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease @JsonObject public class MediaEntity extends UrlEntity implements Parcelable { 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/model/microblog/MediaUploadResponse.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MediaUploadResponse.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/MediaUploadResponse.java index 4aae4487e..2e094dfa2 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/model/microblog/MediaUploadResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.Nullable; import android.support.annotation.StringDef; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MutedKeyword.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/MutedKeyword.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MutedKeyword.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/MutedKeyword.java index a6e8a2b94..eda361291 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/MutedKeyword.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/MutedKeyword.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/NewDm.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/NewDm.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/NewDm.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/NewDm.java index 27d1268f2..18da9b8e4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/NewDm.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/NewDm.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/NewMediaMetadata.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/NewMediaMetadata.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/NewMediaMetadata.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/NewMediaMetadata.java index 224b7f5fb..e436aba36 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/NewMediaMetadata.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/NewMediaMetadata.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 16/3/30. - */ @ParcelablePlease @JsonObject public class NewMediaMetadata implements Parcelable { 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/model/microblog/PageableResponseList$$JsonObjectMapper.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/PageableResponseList$$JsonObjectMapper.java index 6afca9bf0..7846b7f5c 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/model/microblog/PageableResponseList$$JsonObjectMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.Keep; 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/model/microblog/PageableResponseList.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/PageableResponseList.java index 784f28e2c..74e61f90c 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/model/microblog/PageableResponseList.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.Keep; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Paging.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Paging.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Paging.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Paging.java index f0a61e858..c6e2e8bea 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Paging.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Paging.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PinTweetResult.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/PinTweetResult.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PinTweetResult.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/PinTweetResult.java index 5f16978b5..8c0c1e322 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PinTweetResult.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/PinTweetResult.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/Place.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Place.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Place.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Place.java index 004407d22..397a1c7f6 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/model/microblog/Place.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -26,9 +26,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/5/7. - */ @ParcelablePlease @JsonObject public class Place extends TwitterResponseObject implements TwitterResponse, Comparable, Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ProfileUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ProfileUpdate.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ProfileUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ProfileUpdate.java index acbbacdee..0a31c37d0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ProfileUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ProfileUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/QueryResult.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/QueryResult.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/QueryResult.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/QueryResult.java index 384b02ebe..a599b963f 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/QueryResult.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/QueryResult.java @@ -16,11 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; +import org.mariotaku.microblog.library.model.microblog.Status; 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/RateLimitStatus.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/RateLimitStatus.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/RateLimitStatus.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/RateLimitStatus.java index 36aaf1df0..3160666b2 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/RateLimitStatus.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/RateLimitStatus.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/Relationship.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Relationship.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Relationship.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Relationship.java index e0a373ee8..83da80baa 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Relationship.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Relationship.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/model/microblog/ResponseCode.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseCode.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ResponseCode.java index 719f26666..b326bfc90 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/model/microblog/ResponseCode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.NonNull; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ResponseList$$JsonObjectMapper.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ResponseList$$JsonObjectMapper.java index 93a244b95..54d2c40b9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ResponseList$$JsonObjectMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/ResponseList.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ResponseList.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ResponseList.java index 32215988c..1cbfe9264 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/model/microblog/ResponseList.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.Keep; 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/model/microblog/SavedSearch.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SavedSearch.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SavedSearch.java index 14b5b06ab..f921f7600 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/model/microblog/SavedSearch.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.NonNull; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.util.Date; 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/model/microblog/ScheduledStatus.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ScheduledStatus.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/ScheduledStatus.java index 22122454a..9c0c5f0bb 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/model/microblog/ScheduledStatus.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.StringDef; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; 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/model/microblog/SearchQuery.java similarity index 99% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SearchQuery.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SearchQuery.java index 83bdf76a9..53a31db7d 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/model/microblog/SearchQuery.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.NonNull; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SettingsUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SettingsUpdate.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SettingsUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SettingsUpdate.java index 079c29015..a7806fef9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SettingsUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SettingsUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SimilarPlaces.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SimilarPlaces.java similarity index 92% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SimilarPlaces.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SimilarPlaces.java index 69a3b034e..cfe49bd77 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/SimilarPlaces.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/SimilarPlaces.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; public class SimilarPlaces extends ResponseList { } 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/model/microblog/Status.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Status.java index e89ba93b9..4f2cb596a 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/model/microblog/Status.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -30,18 +30,15 @@ import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete; import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.fanfou.model.Photo; -import org.mariotaku.microblog.library.gnusocial.model.Attachment; -import org.mariotaku.microblog.library.statusnet.model.Attention; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.model.fanfou.Photo; +import org.mariotaku.microblog.library.model.gnusocial.Attachment; +import org.mariotaku.microblog.library.model.statusnet.Attention; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.io.IOException; import java.util.Arrays; import java.util.Date; -/** - * Created by mariotaku on 15/5/5. - */ @ParcelablePlease @JsonObject public class Status extends TwitterResponseObject implements Comparable, TwitterResponse, diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusActivitySummary.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StatusActivitySummary.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusActivitySummary.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StatusActivitySummary.java index 85acb28a2..ecc6dfb8f 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusActivitySummary.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StatusActivitySummary.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/5/13. - */ @ParcelablePlease @JsonObject public class StatusActivitySummary extends TwitterResponseObject implements TwitterResponse, Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusTargetObjectEvent.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StatusTargetObjectEvent.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusTargetObjectEvent.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StatusTargetObjectEvent.java index 81465b25b..2dce6867e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusTargetObjectEvent.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StatusTargetObjectEvent.java @@ -16,11 +16,13 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; +import org.mariotaku.microblog.library.model.microblog.Status; + /** * Created by mariotaku on 16/2/26. */ 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/model/microblog/StatusUpdate.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StatusUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StatusUpdate.java index 48272da3b..2822230a1 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/model/microblog/StatusUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StickerEntity.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StickerEntity.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StickerEntity.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StickerEntity.java index 3b5de452e..8080ebd3c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StickerEntity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StickerEntity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -26,13 +26,10 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.Bagger; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger; +import org.mariotaku.microblog.library.model.util.ParcelMapBagger; import java.util.Map; -/** - * Created by mariotaku on 2017/2/12. - */ @ParcelablePlease @JsonObject public class StickerEntity implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StreamEvent.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StreamEvent.java similarity index 92% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StreamEvent.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StreamEvent.java index e41cfc828..e9a350475 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/StreamEvent.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/StreamEvent.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.util.Date; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimeZone.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimeZone.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimeZone.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimeZone.java index 07bef9aa4..dde98cf03 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimeZone.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimeZone.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/5/13. - */ @ParcelablePlease @JsonObject public class TimeZone implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimelineOption.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimelineOption.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimelineOption.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimelineOption.java index a261727c3..1837d5ba6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimelineOption.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimelineOption.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimestampResponse.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimestampResponse.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimestampResponse.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimestampResponse.java index fe7d73953..1b7266013 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TimestampResponse.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TimestampResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/12/30. - */ @ParcelablePlease @JsonObject public class TimestampResponse implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TranslationResult.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TranslationResult.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TranslationResult.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TranslationResult.java index 3f8945d2d..1f6f5a723 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TranslationResult.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TranslationResult.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/Trend.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Trend.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trend.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Trend.java index 8888ae048..1b413245b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trend.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Trend.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/5/10. - */ @ParcelablePlease @JsonObject public class Trend implements Parcelable { 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/model/microblog/Trends.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Trends.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Trends.java index a54052aeb..b6b9df9a6 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/model/microblog/Trends.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -30,9 +30,6 @@ import org.mariotaku.microblog.library.twitter.util.TwitterTrendsDateConverter; import java.util.Date; -/** - * Created by mariotaku on 15/5/10. - */ @ParcelablePlease @JsonObject public class Trends extends TwitterResponseObject implements TwitterResponse, Comparable, diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterAPIConfiguration.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterAPIConfiguration.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterAPIConfiguration.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterAPIConfiguration.java index d019e123b..98b9d5430 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterAPIConfiguration.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterAPIConfiguration.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import java.util.Map; 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/model/microblog/TwitterResponse.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponse.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterResponse.java index 4278d8367..66b080995 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/model/microblog/TwitterResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.IntDef; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponseObject.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterResponseObject.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponseObject.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterResponseObject.java index 173aa98ec..b35c721c0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterResponseObject.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterResponseObject.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import org.mariotaku.restfu.http.HttpResponse; import org.mariotaku.microblog.library.twitter.util.InternalParseUtil; 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/model/microblog/TwitterStreamObject.java similarity index 99% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/TwitterStreamObject.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/TwitterStreamObject.java index cf54c2e71..74217731f 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/model/microblog/TwitterStreamObject.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.StringDef; 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/model/microblog/UniversalSearchQuery.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchQuery.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UniversalSearchQuery.java index 13aa9d4e2..8aef2a42f 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/model/microblog/UniversalSearchQuery.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.StringDef; 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/model/microblog/UniversalSearchResult.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UniversalSearchResult.java index 9f0e3c88f..b49e0f1ef 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/model/microblog/UniversalSearchResult.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.support.annotation.StringDef; @@ -27,6 +27,8 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import org.mariotaku.microblog.library.model.microblog.Status; + import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UrlEntity.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UrlEntity.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UrlEntity.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UrlEntity.java index 4104ff514..8713561b2 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UrlEntity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UrlEntity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -26,9 +26,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease @JsonObject public class UrlEntity implements Parcelable { 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/model/microblog/User.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/User.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/User.java index 05590a608..a43719f43 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/model/microblog/User.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; @@ -29,15 +29,12 @@ import com.bluelinelabs.logansquare.annotation.JsonObject; import com.bluelinelabs.logansquare.annotation.OnJsonParseComplete; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.io.IOException; import java.util.Arrays; import java.util.Date; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease @JsonObject public class User extends TwitterResponseObject implements Comparable, Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserEntities.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserEntities.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserEntities.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserEntities.java index 164635820..27e99b738 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserEntities.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserEntities.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease @JsonObject public class UserEntities implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserEvents.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserEvents.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserEvents.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserEvents.java index 9271644b9..d81e4af96 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserEvents.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserEvents.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/7/5. - */ @ParcelablePlease @JsonObject public class UserEvents extends TwitterResponseObject implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserInbox.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserInbox.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserInbox.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserInbox.java index be42e6099..b71400220 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserInbox.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserInbox.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/7/5. - */ @ParcelablePlease @JsonObject public class UserInbox extends TwitterResponseObject implements Parcelable { 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/model/microblog/UserList.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserList.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserList.java index 3bbeff3ee..de7f013dd 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/model/microblog/UserList.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -27,15 +27,12 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Date; -/** - * Created by mariotaku on 15/4/7. - */ @ParcelablePlease @JsonObject public class UserList extends TwitterResponseObject implements Comparable, TwitterResponse, diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserListTargetObjectEvent.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserListTargetObjectEvent.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserListTargetObjectEvent.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserListTargetObjectEvent.java index 614a0bdd8..45c76f9c9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserListTargetObjectEvent.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserListTargetObjectEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/UserListUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserListUpdate.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserListUpdate.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserListUpdate.java index 95aff127b..705b3a2d5 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserListUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserListUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import org.mariotaku.restfu.http.SimpleValueMap; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserMentionEntity.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserMentionEntity.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserMentionEntity.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserMentionEntity.java index 290a115fe..aeb207fd6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UserMentionEntity.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/UserMentionEntity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 15/3/31. - */ @ParcelablePlease @JsonObject public class UserMentionEntity implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Warning.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Warning.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Warning.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Warning.java index b823f2f6f..881ad8d45 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Warning.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/microblog/Warning.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model; +package org.mariotaku.microblog.library.model.microblog; 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/statusnet/model/Attention.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/Attention.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/Attention.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/Attention.java index bc3259aec..f7fb2ac44 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/Attention.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/Attention.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.model; +package org.mariotaku.microblog.library.model.statusnet; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 16/3/7. - */ @ParcelablePlease @JsonObject public class Attention implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/Group.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/Group.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/Group.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/Group.java index 9adff37e1..febb22e09 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/Group.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/Group.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.model; +package org.mariotaku.microblog.library.model.statusnet; import android.os.Parcel; import android.os.Parcelable; @@ -25,13 +25,10 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.util.TwitterDateConverter; +import org.mariotaku.microblog.library.util.twitter.TwitterDateConverter; import java.util.Date; -/** - * Created by mariotaku on 16/3/4. - */ @ParcelablePlease @JsonObject public class Group implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/StatusNetConfig.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/StatusNetConfig.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/StatusNetConfig.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/StatusNetConfig.java index b644b1849..2d9ff9efd 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/statusnet/model/StatusNetConfig.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/statusnet/StatusNetConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.statusnet.model; +package org.mariotaku.microblog.library.model.statusnet; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,6 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -/** - * Created by mariotaku on 16/2/29. - */ @ParcelablePlease @JsonObject public class StatusNetConfig implements Parcelable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/util/ParcelMapBagger.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/util/ParcelMapBagger.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/util/ParcelMapBagger.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/util/ParcelMapBagger.java index 5a57593be..afed326df 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/util/ParcelMapBagger.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/model/util/ParcelMapBagger.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.model.util; +package org.mariotaku.microblog.library.model.util; import android.os.Parcel; import android.os.Parcelable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/AuthorizationConfiguration.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/AuthorizationConfiguration.java deleted file mode 100644 index cde320200..000000000 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/auth/AuthorizationConfiguration.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright 2012-2017 Mariotaku Lee - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.mariotaku.microblog.library.twitter.auth; - -/** - * A static factory class for Authorization. - * - * @author Yusuke Yamamoto - yusuke at mac.com - * @since Twitter4J 2.1.1 - */ -public interface AuthorizationConfiguration { - - String getOAuthAccessToken(); - - String getOAuthAccessTokenSecret(); - - String getOAuthConsumerKey(); - - String getOAuthConsumerSecret(); - - String getPassword(); - - String getUser(); -} diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java index 55581c465..f8537816f 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java @@ -19,7 +19,7 @@ package org.mariotaku.microblog.library.twitter.util; import org.mariotaku.restfu.http.HttpResponse; -import org.mariotaku.microblog.library.twitter.model.TwitterResponse; +import org.mariotaku.microblog.library.model.microblog.TwitterResponse; /** * A tiny parse utility class. diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/TwitterDateConverter.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/util/twitter/TwitterDateConverter.java similarity index 92% rename from twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/TwitterDateConverter.java rename to twidere.component.common/src/main/java/org/mariotaku/microblog/library/util/twitter/TwitterDateConverter.java index f7033cda3..41c538879 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/TwitterDateConverter.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/util/twitter/TwitterDateConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.mariotaku.microblog.library.twitter.util; +package org.mariotaku.microblog.library.util.twitter; import com.bluelinelabs.logansquare.typeconverters.DateTypeConverter; @@ -25,9 +25,6 @@ import java.text.SimpleDateFormat; import java.util.Locale; import java.util.TimeZone; -/** - * Created by mariotaku on 15/5/7. - */ public class TwitterDateConverter extends DateTypeConverter { @Override 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 03713c842..f7d62f54d 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 @@ -30,8 +30,8 @@ import com.hannesdorfmann.parcelableplease.annotation.Bagger; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; import com.hannesdorfmann.parcelableplease.annotation.ParcelableThisPlease; -import org.mariotaku.microblog.library.twitter.model.CardEntity; -import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger; +import org.mariotaku.microblog.library.model.microblog.CardEntity; +import org.mariotaku.microblog.library.model.util.ParcelMapBagger; import org.mariotaku.twidere.model.util.UserKeyConverter; import java.util.Arrays; 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..8964e9a51 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 @@ -31,7 +31,7 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelableNoThanks; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; import com.hannesdorfmann.parcelableplease.annotation.ParcelableThisPlease; -import org.mariotaku.microblog.library.twitter.model.MediaEntity; +import org.mariotaku.microblog.library.model.microblog.MediaEntity; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; 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..423004d39 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 @@ -25,7 +25,7 @@ import android.support.annotation.Nullable; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; -import org.mariotaku.microblog.library.twitter.annotation.MediaCategory; +import org.mariotaku.microblog.library.annotation.twitter.MediaCategory; /** * Created by mariotaku on 16/2/26. diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/TwitterOfficialConversationExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/TwitterOfficialConversationExtras.java index 60622ee4d..802e56202 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/TwitterOfficialConversationExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/TwitterOfficialConversationExtras.java @@ -25,7 +25,7 @@ import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.DMResponse; +import org.mariotaku.microblog.library.model.microblog.DMResponse; /** * Created by mariotaku on 2017/2/13. diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/CustomEmojiMapParcelBagger.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/CustomEmojiMapParcelBagger.java index dd28cb8e3..9f035e492 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/CustomEmojiMapParcelBagger.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/CustomEmojiMapParcelBagger.java @@ -18,7 +18,7 @@ package org.mariotaku.twidere.model.util; -import org.mariotaku.microblog.library.twitter.model.util.ParcelMapBagger; +import org.mariotaku.microblog.library.model.util.ParcelMapBagger; import org.mariotaku.twidere.model.CustomEmoji; public final class CustomEmojiMapParcelBagger extends ParcelMapBagger { diff --git a/twidere/build.gradle b/twidere/build.gradle index bc84c1a3c..fe7c597d1 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -216,7 +216,7 @@ dependencies { implementation "com.android.support:exifinterface:${libVersions['SupportLib']}" implementation "com.android.support.constraint:constraint-layout:${libVersions['ConstraintLayout']}" implementation "com.twitter:twitter-text:${libVersions['TwitterText']}" - implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' + implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0' implementation 'com.squareup:otto:1.3.8' implementation 'dnsjava:dnsjava:2.1.8' implementation 'com.commonsware.cwac:layouts:0.4.3' 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..185ef8034 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 @@ -5,7 +5,7 @@ import android.support.test.runner.AndroidJUnit4 import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.extension.model.api.toParcelable import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/debug/kotlin/org/mariotaku/twidere/util/stetho/UserStreamDumperPlugin.kt b/twidere/src/debug/kotlin/org/mariotaku/twidere/util/stetho/UserStreamDumperPlugin.kt index 25333ccf3..d62256b26 100644 --- a/twidere/src/debug/kotlin/org/mariotaku/twidere/util/stetho/UserStreamDumperPlugin.kt +++ b/twidere/src/debug/kotlin/org/mariotaku/twidere/util/stetho/UserStreamDumperPlugin.kt @@ -29,13 +29,13 @@ import org.apache.commons.cli.Options import org.mariotaku.ktextension.subArray import org.mariotaku.microblog.library.FanfouStream import org.mariotaku.microblog.library.MastodonStreaming -import org.mariotaku.microblog.library.mastodon.callback.MastodonUserStreamCallback -import org.mariotaku.microblog.library.mastodon.model.Notification import org.mariotaku.microblog.library.TwitterUserStream -import org.mariotaku.microblog.library.twitter.annotation.StreamWith -import org.mariotaku.microblog.library.twitter.model.Activity -import org.mariotaku.microblog.library.twitter.model.DirectMessage -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.annotation.twitter.StreamWith +import org.mariotaku.microblog.library.callback.mastodon.MastodonUserStreamCallback +import org.mariotaku.microblog.library.model.mastodon.Notification +import org.mariotaku.microblog.library.model.microblog.Activity +import org.mariotaku.microblog.library.model.microblog.DirectMessage +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.dagger.DependencyHolder import org.mariotaku.twidere.extension.getDetails diff --git a/twidere/src/main/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml index 54303d9ed..9aa100661 100644 --- a/twidere/src/main/AndroidManifest.xml +++ b/twidere/src/main/AndroidManifest.xml @@ -73,37 +73,37 @@ - - - - + + + + + android:permissionGroup="${applicationId}.permission.PERMISSION_GROUP"/> + android:permissionGroup="${applicationId}.permission.PERMISSION_GROUP"/> + android:permissionGroup="${applicationId}.permission.PERMISSION_GROUP"/> + android:permission="${applicationId}.permission.ACCESS_DATABASE"/> (); int currentShortest = Integer.MAX_VALUE; int currentLongest = 0; - Iterator> it = lookupMap.entrySet().iterator(); - while (it.hasNext()) { - Map.Entry pair = it.next(); + for (Map.Entry pair : lookupMap.entrySet()) { this.lookupMap.put(pair.getKey().toString(), pair.getValue().toString()); this.prefixSet.add(pair.getKey().charAt(0)); final int sz = pair.getKey().length(); diff --git a/twidere/src/main/java/org/mariotaku/microblog/library/model/microblog/IDsAccessor.kt b/twidere/src/main/java/org/mariotaku/microblog/library/model/microblog/IDsAccessor.kt new file mode 100644 index 000000000..da6b04510 --- /dev/null +++ b/twidere/src/main/java/org/mariotaku/microblog/library/model/microblog/IDsAccessor.kt @@ -0,0 +1,25 @@ +/* + * Twidere - Twitter client for Android + * + * Copyright (C) 2012-2017 Mariotaku Lee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.mariotaku.microblog.library.model.microblog + +fun IDs.setIds(array: Array?): IDs { + ids = array + return this +} diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/SavedSearchesAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/SavedSearchesAdapter.java index 3808fe5f6..ec8634c1c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/SavedSearchesAdapter.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/SavedSearchesAdapter.java @@ -26,8 +26,8 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.TextView; -import org.mariotaku.microblog.library.twitter.model.ResponseList; -import org.mariotaku.microblog.library.twitter.model.SavedSearch; +import org.mariotaku.microblog.library.model.microblog.ResponseList; +import org.mariotaku.microblog.library.model.microblog.SavedSearch; import org.mariotaku.twidere.model.UserKey; public class SavedSearchesAdapter extends BaseAdapter { 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..0ed1654a7 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 @@ -84,12 +84,9 @@ public class ExtendedDividerItemDecoration extends RecyclerView.ItemDecoration { } public void setPadding(final int left, final int top, final int right, final int bottom) { - mPadding = new Padding() { - @Override - public boolean get(int position, Rect rect) { - rect.set(left, top, right, bottom); - return true; - } + mPadding = (position, rect) -> { + rect.set(left, top, right, bottom); + return true; }; } 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..0fd795026 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java @@ -24,13 +24,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; 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.app.AlertDialog.Builder; import android.support.v7.preference.Preference; import android.view.Menu; import android.view.MenuInflater; @@ -90,12 +90,7 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements mAction = action; setPersistent(false); setTitle(KeyboardShortcutsHandler.getActionLabel(context, action)); - mPreferencesChangeListener = new OnSharedPreferenceChangeListener() { - @Override - public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { - updateSummary(); - } - }; + mPreferencesChangeListener = (preferences, key) -> updateSummary(); updateSummary(); } @@ -148,12 +143,7 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements builder.setPositiveButton(android.R.string.ok, this); builder.setNegativeButton(android.R.string.cancel, this); final AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(final DialogInterface dialog) { - DialogExtensionsKt.applyTheme((AlertDialog) dialog); - } - }); + dialog.setOnShowListener(dialog1 -> DialogExtensionsKt.applyTheme((AlertDialog) dialog1)); return dialog; } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/StatusListResponse.java b/twidere/src/main/java/org/mariotaku/twidere/model/StatusListResponse.java index a76185b9e..ded865dc7 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/StatusListResponse.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/StatusListResponse.java @@ -19,7 +19,7 @@ package org.mariotaku.twidere.model; -import org.mariotaku.microblog.library.twitter.model.Status; +import org.mariotaku.microblog.library.model.microblog.Status; import java.util.List; 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..c6998c507 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 @@ -23,9 +23,6 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -/** - * Created by mariotaku on 14/12/10. - */ public class GetMessagesTaskEvent { @NonNull 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..17d41701e 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 @@ -22,9 +22,6 @@ package org.mariotaku.twidere.model.event; import android.net.Uri; import android.support.annotation.NonNull; -/** - * Created by mariotaku on 14/12/10. - */ public class GetStatusesTaskEvent { @NonNull 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..ca4f7fa3d 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 @@ -25,7 +25,7 @@ import android.support.annotation.Nullable; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.microblog.Paging; /** * Created by mariotaku on 2017/4/21. 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..ff08595e0 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 @@ -25,7 +25,7 @@ import android.support.annotation.Nullable; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.microblog.Paging; /** * Created by mariotaku on 2017/4/21. diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/Pagination.java b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/Pagination.java index 00d427657..3aa884416 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/pagination/Pagination.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/pagination/Pagination.java @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.pagination; import android.os.Parcelable; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.microblog.Paging; public interface Pagination extends Parcelable { 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 3ebe34522..bce9e75d2 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 @@ -25,7 +25,7 @@ import android.support.annotation.Nullable; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.twitter.model.Paging; +import org.mariotaku.microblog.library.model.microblog.Paging; @ParcelablePlease public class SinceMaxPagination implements Pagination, Parcelable { 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..c7ea65301 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java @@ -100,12 +100,7 @@ abstract class MultiSelectListPreference extends DialogPreference implements IDi builder.setNegativeButton(android.R.string.cancel, null); builder.setMultiChoiceItems(mNames, mValues, this); final AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(final DialogInterface dialog) { - DialogExtensionsKt.applyTheme((AlertDialog) dialog); - } - }); + dialog.setOnShowListener(dialog1 -> DialogExtensionsKt.applyTheme((AlertDialog) dialog1)); return dialog; } 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..238ed3178 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java @@ -21,7 +21,6 @@ package org.mariotaku.twidere.preference; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; @@ -78,19 +77,9 @@ public class SettingsImportExportPreference extends DialogPreference implements entries[1] = context.getString(R.string.export_settings); values[0] = new Intent(context, DataImportActivity.class); values[1] = new Intent(context, DataExportActivity.class); - builder.setItems(entries, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - startActivity(values[which]); - } - }); + builder.setItems(entries, (dialog, which) -> startActivity(values[which])); final AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(final DialogInterface dialog) { - DialogExtensionsKt.applyTheme((AlertDialog) dialog); - } - }); + dialog.setOnShowListener(dialog1 -> DialogExtensionsKt.applyTheme((AlertDialog) dialog1)); return dialog; } 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..3a5d8ca78 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java @@ -31,7 +31,6 @@ import android.support.annotation.Nullable; import org.mariotaku.twidere.constant.IntentConstants; import org.mariotaku.twidere.util.ServiceUtils.ServiceToken; -import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; @@ -73,12 +72,7 @@ public abstract class AbsServiceInterface implements IInte final Intent intent = new Intent(IntentConstants.INTENT_ACTION_EXTENSION_SHORTEN_STATUS); final ComponentName component = ComponentName.unflattenFromString(mShortenerName); intent.setComponent(component); - final FutureTask futureTask = new FutureTask<>(new Callable() { - @Override - public Boolean call() throws Exception { - return mIInterface != null; - } - }); + final FutureTask futureTask = new FutureTask<>(() -> mIInterface != null); mToken = ServiceUtils.bindToService(mContext, intent, new ServiceConnection() { @Override public void onServiceConnected(final ComponentName name, final IBinder obj) { diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/ServiceUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/ServiceUtils.java index bc64f05b8..1c501f790 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/ServiceUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/ServiceUtils.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.ServiceConnection; +import android.os.IBinder; import java.util.HashMap; @@ -76,7 +77,7 @@ public final class ServiceUtils { } @Override - public void onServiceConnected(final ComponentName className, final android.os.IBinder service) { + public void onServiceConnected(final ComponentName className, final IBinder service) { if (mCallback != null) { mCallback.onServiceConnected(className, service); } 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..4b2f7d422 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java @@ -391,12 +391,9 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener { } }); - animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator valueAnimator) { - lp.height = (Integer) valueAnimator.getAnimatedValue(); - dismissView.setLayoutParams(lp); - } + animator.addUpdateListener(valueAnimator -> { + lp.height = (Integer) valueAnimator.getAnimatedValue(); + dismissView.setLayoutParams(lp); }); mPendingDismisses.add(new PendingDismissData(dismissPosition, dismissView)); diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereColorUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereColorUtils.java index 515deec28..cc8ecb40d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereColorUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereColorUtils.java @@ -110,7 +110,7 @@ public class TwidereColorUtils { * Get most contrasting color * * @param color Input color, alpha channel will be disposed. - * @return {@link android.graphics.Color#WHITE} or {@link android.graphics.Color#BLACK} + * @return {@link Color#WHITE} or {@link Color#BLACK} * @see Calculating Color Contrast */ public static int getContrastYIQ(int color, int threshold, int colorDark, int colorLight) { diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/view/ViewOutlineProviderCompat.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/view/ViewOutlineProviderCompat.java index b549e9b69..247ae93ff 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/view/ViewOutlineProviderCompat.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/view/ViewOutlineProviderCompat.java @@ -31,14 +31,14 @@ import org.mariotaku.twidere.util.support.DrawableSupport; import org.mariotaku.twidere.util.support.graphics.OutlineCompat; /** - * Interface by which a View builds its {@link org.mariotaku.twidere.util.support.graphics.OutlineCompat}, used for shadow casting and clipping. + * Interface by which a View builds its {@link OutlineCompat}, used for shadow casting and clipping. */ public abstract class ViewOutlineProviderCompat { /** * Called to get the provider to populate the Outline. *

* This method will be called by a View when its owned Drawables are invalidated, when the - * View's size changes, or if {@link android.view.View#invalidateOutline()} is called + * View's size changes, or if {@link View#invalidateOutline()} is called * explicitly. *

* The input outline is empty and has an alpha of 1.0f. @@ -66,7 +66,7 @@ public abstract class ViewOutlineProviderCompat { * or generates a 0 alpha, rectangular Outline the size of the View if a background * isn't present. * - * @see android.graphics.drawable.Drawable#getOutline(android.graphics.Outline) + * @see Drawable#getOutline(Outline) */ public static final ViewOutlineProviderCompat BACKGROUND = new ViewOutlineProviderCompat() { @Override 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..405a73eb0 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 @@ -56,7 +56,7 @@ public interface IForegroundView { /** * Describes how the foreground is positioned. Defaults to START and TOP. * - * @param foregroundGravity See {@link android.view.Gravity} + * @param foregroundGravity See {@link Gravity} */ void setForegroundGravity(int foregroundGravity); diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt index ac6952906..15cd046e8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt @@ -4,34 +4,6 @@ import android.database.Cursor import org.mariotaku.library.objectcursor.ObjectCursor import java.util.* -/** - * Created by mariotaku on 16/6/29. - */ - -fun Cursor.safeMoveToPosition(pos: Int) = try { - moveToPosition(pos) -} catch (e: IllegalStateException) { - false -} - -fun Cursor.safeGetLong(columnIndex: Int, def: Long = -1) = try { - getLong(columnIndex) -} catch (e: IllegalStateException) { - def -} - -fun Cursor.safeGetInt(columnIndex: Int, def: Int = -1) = try { - getInt(columnIndex) -} catch (e: IllegalStateException) { - def -} - -fun Cursor.safeGetString(columnIndex: Int, def: String = "") = try { - getString(columnIndex) -} catch (e: IllegalStateException) { - def -} - fun Cursor.map(indices: ObjectCursor.CursorIndices): List { val list = ArrayList() moveToFirst() @@ -42,7 +14,7 @@ fun Cursor.map(indices: ObjectCursor.CursorIndices): List { return list } -val Cursor.isEmpty: Boolean +inline val Cursor.isEmpty: Boolean get() = count == 0 diff --git a/twidere/src/main/kotlin/org/mariotaku/microblog/library/twitter/model/InternalActivityCreator.kt b/twidere/src/main/kotlin/org/mariotaku/microblog/library/model/microblog/InternalActivityCreator.kt similarity index 96% rename from twidere/src/main/kotlin/org/mariotaku/microblog/library/twitter/model/InternalActivityCreator.kt rename to twidere/src/main/kotlin/org/mariotaku/microblog/library/model/microblog/InternalActivityCreator.kt index 306aca20c..9003c63ea 100644 --- a/twidere/src/main/kotlin/org/mariotaku/microblog/library/twitter/model/InternalActivityCreator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/microblog/library/model/microblog/InternalActivityCreator.kt @@ -17,17 +17,14 @@ * along with this program. If not, see . */ -package org.mariotaku.microblog.library.twitter.model +package org.mariotaku.microblog.library.model.microblog +import org.mariotaku.twidere.alias.TwitterActivity import java.util.* -/** - * Created by mariotaku on 2017/3/10. - */ - object InternalActivityCreator { fun status(status: Status, accountId: String): Activity { - val activity = Activity() + val activity = TwitterActivity() activity.minPosition = status.getId() activity.maxPosition = activity.minPosition 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 ebbd928df..29d95833e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -69,7 +69,7 @@ import org.mariotaku.kpreferences.edit import org.mariotaku.kpreferences.get import org.mariotaku.kpreferences.set import org.mariotaku.ktextension.* -import org.mariotaku.microblog.library.mastodon.annotation.StatusVisibility +import org.mariotaku.microblog.library.annotation.mastodon.StatusVisibility import org.mariotaku.pickncrop.library.MediaPickerActivity import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.R 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 0050dbb22..a863f9802 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt @@ -62,17 +62,13 @@ import nl.komponents.kovenant.ui.failUi import nl.komponents.kovenant.ui.successUi import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.* -import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.MastodonOAuth2 -import org.mariotaku.microblog.library.mastodon.annotation.AuthScope -import org.mariotaku.microblog.library.TwitterOAuth -import org.mariotaku.microblog.library.twitter.auth.BasicAuthorization -import org.mariotaku.microblog.library.twitter.auth.EmptyAuthorization -import org.mariotaku.microblog.library.twitter.model.ErrorInfo -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.* +import org.mariotaku.microblog.library.annotation.mastodon.AuthScope +import org.mariotaku.microblog.library.auth.BasicAuthorization +import org.mariotaku.microblog.library.auth.EmptyAuthorization +import org.mariotaku.microblog.library.model.microblog.ErrorInfo +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.restfu.http.Endpoint import org.mariotaku.restfu.oauth.OAuthToken import org.mariotaku.restfu.oauth2.OAuth2Authorization @@ -951,16 +947,14 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, val auth = BasicAuthorization(username, password) val twitter = newMicroBlogInstance(activity, endpoint = endpoint, auth = auth, accountType = apiConfig.type, cls = MicroBlog::class.java) - val apiUser: User - try { - apiUser = twitter.verifyCredentials() + val apiUser = try { + twitter.verifyCredentials() } catch (e: MicroBlogException) { - if (e.statusCode == 401) { - throw WrongBasicCredentialException() - } else if (e.statusCode == 404) { - throw WrongAPIURLFormatException() + when (e.statusCode) { + 401 -> throw WrongBasicCredentialException() + 404 -> throw WrongAPIURLFormatException() + else -> throw e } - throw e } var color = analyseUserProfileColor(apiUser) 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 f10ce078f..a4cb4b737 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt @@ -28,7 +28,7 @@ import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.getTypedArray import org.mariotaku.ktextension.set import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.twitter.model.Location +import org.mariotaku.microblog.library.model.microblog.Location import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.extension.applyTheme 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 44d0a0537..5113fc4d0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt @@ -33,7 +33,7 @@ import com.bumptech.glide.RequestManager import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.contains import org.mariotaku.ktextension.rangeOfSize -import org.mariotaku.microblog.library.twitter.model.Activity +import org.mariotaku.microblog.library.model.microblog.Activity.Action import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.callback.ItemCountsAdapterListUpdateCallback import org.mariotaku.twidere.adapter.iface.IActivitiesAdapter @@ -221,15 +221,15 @@ class ParcelableActivitiesAdapter( } val action = getAction(position) when (action) { - Activity.Action.MENTION, Activity.Action.QUOTE, Activity.Action.REPLY -> { + Action.MENTION, Action.QUOTE, Action.REPLY -> { return ITEM_VIEW_TYPE_STATUS } - Activity.Action.FOLLOW, Activity.Action.FAVORITE, Activity.Action.RETWEET, - Activity.Action.FAVORITED_RETWEET, Activity.Action.RETWEETED_RETWEET, - Activity.Action.RETWEETED_MENTION, Activity.Action.FAVORITED_MENTION, - Activity.Action.LIST_CREATED, Activity.Action.LIST_MEMBER_ADDED, - Activity.Action.MEDIA_TAGGED, Activity.Action.RETWEETED_MEDIA_TAGGED, - Activity.Action.FAVORITED_MEDIA_TAGGED, Activity.Action.JOINED_TWITTER -> { + Action.FOLLOW, Action.FAVORITE, Action.RETWEET, + Action.FAVORITED_RETWEET, Action.RETWEETED_RETWEET, + Action.RETWEETED_MENTION, Action.FAVORITED_MENTION, + Action.LIST_CREATED, Action.LIST_MEMBER_ADDED, + Action.MEDIA_TAGGED, Action.RETWEETED_MEDIA_TAGGED, + Action.FAVORITED_MEDIA_TAGGED, Action.JOINED_TWITTER -> { return ITEM_VIEW_TYPE_TITLE_SUMMARY } } 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 1c8e630bb..acb0c36d1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -30,7 +30,7 @@ import android.widget.Space import android.widget.TextView import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.contains -import org.mariotaku.microblog.library.twitter.model.TranslationResult +import org.mariotaku.microblog.library.model.microblog.TranslationResult import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.iface.IGapSupportedAdapter import org.mariotaku.twidere.adapter.iface.IItemCountsAdapter @@ -79,10 +79,10 @@ class StatusDetailsAdapter( internal set var translationResult: TranslationResult? = null internal set(translation) { - if (translation == null || status?.originalId != translation.id) { - field = null + field = if (translation == null || status?.originalId != translation.id) { + null } else { - field = translation + translation } notifyDataSetChanged() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/alias/MastodonAliases.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/alias/MastodonAliases.kt index 6da63a4c3..63d19f3e6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/alias/MastodonAliases.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/alias/MastodonAliases.kt @@ -19,10 +19,10 @@ package org.mariotaku.twidere.alias -import org.mariotaku.microblog.library.mastodon.model.Notification -import org.mariotaku.microblog.library.mastodon.model.Status -import org.mariotaku.microblog.library.mastodon.model.StatusUpdate -import org.mariotaku.microblog.library.mastodon.model.TimelineOption +import org.mariotaku.microblog.library.model.mastodon.Notification +import org.mariotaku.microblog.library.model.mastodon.Status +import org.mariotaku.microblog.library.model.mastodon.StatusUpdate +import org.mariotaku.microblog.library.model.mastodon.TimelineOption typealias MastodonStatus = Status typealias MastodonTimelineOption = TimelineOption diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt index d14098ebf..47f9137c2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt @@ -19,4 +19,7 @@ package org.mariotaku.twidere.alias + typealias TwitterRegex = com.twitter.Regex +typealias TwitterActivity = org.mariotaku.microblog.library.model.microblog.Activity +typealias TwitterStatus = org.mariotaku.microblog.library.model.microblog.Status diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/StatusesDataSourceFactory.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/StatusesDataSourceFactory.kt index 1382de047..488e69cf4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/StatusesDataSourceFactory.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/StatusesDataSourceFactory.kt @@ -24,9 +24,9 @@ import android.accounts.AccountManager import android.arch.paging.DataSource import android.arch.paging.PageKeyedDataSource import android.content.Context -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.R import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.data.fetcher.StatusesFetcher diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ActivitiesFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ActivitiesFetcher.kt index 791194be5..bba0ed627 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ActivitiesFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ActivitiesFetcher.kt @@ -19,12 +19,12 @@ package org.mariotaku.twidere.data.fetcher -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Activity -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Activity +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonNotification import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/GroupTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/GroupTimelineFetcher.kt index 7159f6436..89bfb9727 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/GroupTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/GroupTimelineFetcher.kt @@ -19,12 +19,12 @@ package org.mariotaku.twidere.data.fetcher +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/HomeTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/HomeTimelineFetcher.kt index 692d7bb70..907a71ac3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/HomeTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/HomeTimelineFetcher.kt @@ -19,11 +19,11 @@ package org.mariotaku.twidere.data.fetcher -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.model.AccountDetails import org.mariotaku.twidere.model.timeline.TimelineFilter diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ListTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ListTimelineFetcher.kt index 892add157..df78d7c35 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ListTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/ListTimelineFetcher.kt @@ -19,12 +19,12 @@ package org.mariotaku.twidere.data.fetcher +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/MediaSearchTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/MediaSearchTimelineFetcher.kt index 4e747ff53..8efeb64e8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/MediaSearchTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/MediaSearchTimelineFetcher.kt @@ -20,10 +20,12 @@ package org.mariotaku.twidere.data.fetcher import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.SearchQuery -import org.mariotaku.microblog.library.twitter.model.Status -import org.mariotaku.microblog.library.twitter.model.UniversalSearchQuery +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.SearchQuery +import org.mariotaku.microblog.library.model.microblog.Status +import org.mariotaku.microblog.library.model.microblog.UniversalSearchQuery +import org.mariotaku.microblog.library.model.microblog.UniversalSearchQuery.Module +import org.mariotaku.microblog.library.model.microblog.UniversalSearchQuery.ResultType import org.mariotaku.twidere.exception.RequiredFieldNotFoundException import org.mariotaku.twidere.extension.model.official import org.mariotaku.twidere.model.AccountDetails @@ -35,15 +37,14 @@ class MediaSearchTimelineFetcher(val query: String?) : StatusesFetcher { if (account.official) { val searchQuery = SearchTimelineFetcher.smQuery("$query filter:media", paging) val universalQuery = UniversalSearchQuery(searchQuery) - universalQuery.setModules(UniversalSearchQuery.Module.TWEET) - universalQuery.setResultType(UniversalSearchQuery.ResultType.RECENT) + universalQuery.setModules(Module.TWEET) + universalQuery.setResultType(ResultType.RECENT) universalQuery.setPaging(paging) val searchResult = twitter.universalSearch(universalQuery) return searchResult.modules.mapNotNull { it.status?.data } } - val searchQuery = SearchQuery("$query filter:media exclude:retweets") - searchQuery.paging(paging) + val searchQuery = SearchQuery("$query filter:media exclude:retweets").paging(paging) return twitter.search(searchQuery) } } \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/NetworkPublicTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/NetworkPublicTimelineFetcher.kt index 14c57fea2..d0c8ab267 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/NetworkPublicTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/NetworkPublicTimelineFetcher.kt @@ -19,12 +19,12 @@ package org.mariotaku.twidere.data.fetcher +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.model.AccountDetails import org.mariotaku.twidere.model.timeline.TimelineFilter diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/PublicTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/PublicTimelineFetcher.kt index 74656bcdf..5f66b2675 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/PublicTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/PublicTimelineFetcher.kt @@ -19,11 +19,11 @@ package org.mariotaku.twidere.data.fetcher -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.model.AccountDetails import org.mariotaku.twidere.model.timeline.TimelineFilter diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/SearchTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/SearchTimelineFetcher.kt index 7a0ebb634..27b7eff6a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/SearchTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/SearchTimelineFetcher.kt @@ -19,14 +19,14 @@ package org.mariotaku.twidere.data.fetcher +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.SearchQuery -import org.mariotaku.microblog.library.twitter.model.Status -import org.mariotaku.microblog.library.twitter.model.UniversalSearchQuery +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.SearchQuery +import org.mariotaku.microblog.library.model.microblog.Status +import org.mariotaku.microblog.library.model.microblog.UniversalSearchQuery import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.extension.model.official import org.mariotaku.twidere.model.AccountDetails @@ -41,10 +41,11 @@ class SearchTimelineFetcher(val query: String?, val local: Boolean) : StatusesFe searchQuery.paging(paging) return twitter.search(searchQuery) } - val universalQuery = UniversalSearchQuery(smQuery(query, paging)) - universalQuery.setModules(UniversalSearchQuery.Module.TWEET) - universalQuery.setResultType(UniversalSearchQuery.ResultType.RECENT) - universalQuery.setPaging(paging) + val universalQuery = UniversalSearchQuery(smQuery(query, paging)).apply { + setModules(UniversalSearchQuery.Module.TWEET) + setResultType(UniversalSearchQuery.ResultType.RECENT) + setPaging(paging) + } val searchResult = twitter.universalSearch(universalQuery) return searchResult.modules.mapNotNull { it.status?.data } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/StatusesFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/StatusesFetcher.kt index 0d857df9c..2e9e0af49 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/StatusesFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/StatusesFetcher.kt @@ -21,9 +21,9 @@ package org.mariotaku.twidere.data.fetcher import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserFavoritesFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserFavoritesFetcher.kt index 91b1146f6..fe903ee19 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserFavoritesFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserFavoritesFetcher.kt @@ -19,11 +19,11 @@ package org.mariotaku.twidere.data.fetcher -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.exception.RequiredFieldNotFoundException import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMediaTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMediaTimelineFetcher.kt index f9a644786..442c1716c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMediaTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMediaTimelineFetcher.kt @@ -19,13 +19,13 @@ package org.mariotaku.twidere.data.fetcher -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.ResponseList -import org.mariotaku.microblog.library.twitter.model.SearchQuery -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.ResponseList +import org.mariotaku.microblog.library.model.microblog.SearchQuery +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.alias.MastodonTimelineOption import org.mariotaku.twidere.annotation.AccountType @@ -53,8 +53,7 @@ class UserMediaTimelineFetcher( userKey != null -> UserMentionsTimelineFetcher.findScreenName(twitter, userKey, AccountType.TWITTER) else -> throw RequiredFieldNotFoundException("user_id", "screen_name") } - val query = SearchQuery("from:$screenName filter:media exclude:retweets") - query.paging(paging) + val query = SearchQuery("from:$screenName filter:media exclude:retweets").paging(paging) val result = ResponseList() twitter.search(query).filterTo(result) { status -> val user = status.user diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMentionsTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMentionsTimelineFetcher.kt index b78b13f08..f9b8d5a63 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMentionsTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserMentionsTimelineFetcher.kt @@ -21,10 +21,10 @@ package org.mariotaku.twidere.data.fetcher import android.support.v4.util.ArrayMap import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.SearchQuery -import org.mariotaku.microblog.library.twitter.model.Status -import org.mariotaku.microblog.library.twitter.model.UniversalSearchQuery +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.SearchQuery +import org.mariotaku.microblog.library.model.microblog.Status +import org.mariotaku.microblog.library.model.microblog.UniversalSearchQuery import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.exception.RequiredFieldNotFoundException import org.mariotaku.twidere.extension.api.tryShowUser @@ -38,14 +38,14 @@ class UserMentionsTimelineFetcher(val userKey: UserKey?, val userScreenName: Str override fun forTwitter(account: AccountDetails, twitter: MicroBlog, paging: Paging, filter: TimelineFilter?): List { val screenName = getSearchScreenName(twitter, account.type) if (!account.official) { - val searchQuery = SearchQuery("@$screenName exclude:retweets") - searchQuery.paging(paging) + val searchQuery = SearchQuery("@$screenName exclude:retweets").paging(paging) return twitter.search(searchQuery) } - val universalQuery = UniversalSearchQuery(SearchTimelineFetcher.smQuery("@$screenName", paging)) - universalQuery.setModules(UniversalSearchQuery.Module.TWEET) - universalQuery.setResultType(UniversalSearchQuery.ResultType.RECENT) - universalQuery.setPaging(paging) + val universalQuery = UniversalSearchQuery(SearchTimelineFetcher.smQuery("@$screenName", paging)).apply { + setModules(UniversalSearchQuery.Module.TWEET) + setResultType(UniversalSearchQuery.ResultType.RECENT) + setPaging(paging) + } val searchResult = twitter.universalSearch(universalQuery) return searchResult.modules.mapNotNull { it.status?.data } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserTimelineFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserTimelineFetcher.kt index f087233b5..314bbf1e8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserTimelineFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/UserTimelineFetcher.kt @@ -25,14 +25,14 @@ import org.attoparser.ParseException import org.attoparser.config.ParseConfiguration import org.attoparser.simple.AbstractSimpleMarkupHandler import org.attoparser.simple.SimpleMarkupParser +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList import org.mariotaku.microblog.library.StatusNet -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status -import org.mariotaku.microblog.library.twitter.model.TimelineOption +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status +import org.mariotaku.microblog.library.model.microblog.TimelineOption import org.mariotaku.restfu.RestAPIFactory import org.mariotaku.restfu.annotation.method.GET import org.mariotaku.restfu.http.Endpoint diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/activities/ActivitiesAboutMeFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/activities/ActivitiesAboutMeFetcher.kt index 571aa757d..c392c0d0b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/activities/ActivitiesAboutMeFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/fetcher/activities/ActivitiesAboutMeFetcher.kt @@ -19,12 +19,12 @@ package org.mariotaku.twidere.data.fetcher.activities -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.Activity -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.Activity +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.alias.MastodonNotification import org.mariotaku.twidere.data.fetcher.ActivitiesFetcher import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/impl/UserLiveData.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/impl/UserLiveData.kt index d7bfa0799..dfa7b44e6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/impl/UserLiveData.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/impl/UserLiveData.kt @@ -21,10 +21,10 @@ package org.mariotaku.twidere.data.impl import android.accounts.AccountManager import android.content.Context +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.sqliteqb.library.Columns import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/data/predicate/ParcelableActivityProcessor.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/data/predicate/ParcelableActivityProcessor.kt index 7a2936190..4d400d5b3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/data/predicate/ParcelableActivityProcessor.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/data/predicate/ParcelableActivityProcessor.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.data.predicate import android.content.ContentResolver import org.mariotaku.ktextension.isNullOrEmpty -import org.mariotaku.microblog.library.twitter.model.Activity +import org.mariotaku.microblog.library.model.microblog.Activity.Action import org.mariotaku.twidere.annotation.FilterScope import org.mariotaku.twidere.data.processor.DataSourceItemProcessor import org.mariotaku.twidere.model.ParcelableActivity @@ -50,7 +50,7 @@ class ParcelableActivityProcessor( } override fun process(obj: ParcelableActivity): ParcelableActivity? { - if (mentionsOnly && obj.action !in Activity.Action.MENTION_ACTIONS) return null + if (mentionsOnly && obj.action !in Action.MENTION_ACTIONS) return null val sources = ParcelableActivityUtils.filterSources(obj.sources_lite, filteredUserKeys, filteredNameKeywords, filteredDescriptionKeywords, followingOnly) obj.after_filtered_sources = sources diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt index 4af2191c3..e86a5373b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/GlideExtensions.kt @@ -161,6 +161,9 @@ internal inline fun configureLoadProfileImage(context: Context, @ImageShapeS builder.bitmapTransform(RoundedRectTransformation(context, cornerRadius, cornerRadiusRatio)) } + ImageShapeStyle.SHAPE_NONE -> { + // No-op + } } return builder } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MastodonExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MastodonExtensions.kt index 5a7c3a773..483481ea9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MastodonExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MastodonExtensions.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.extension.api import org.mariotaku.ktextension.subArray import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.Relationship +import org.mariotaku.microblog.library.model.mastodon.Relationship fun Mastodon.batchGetRelationships(ids: Collection): Map { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MicroBlogExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MicroBlogExtensions.kt index 0db3c429e..839309cd8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MicroBlogExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/api/MicroBlogExtensions.kt @@ -21,9 +21,9 @@ package org.mariotaku.twidere.extension.api import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.IDs -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.IDs +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.model.pagination.CursorPagination import org.mariotaku.twidere.model.pagination.PaginatedArrayList diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt index a70c84ef1..3df74e29d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt @@ -1,7 +1,7 @@ package org.mariotaku.twidere.extension.model import android.content.Context -import org.mariotaku.microblog.library.twitter.annotation.MediaCategory +import org.mariotaku.microblog.library.annotation.twitter.MediaCategory import org.mariotaku.twidere.R import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/CredentialsExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/CredentialsExtensions.kt index fa2e775cd..3f59d8b1c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/CredentialsExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/CredentialsExtensions.kt @@ -9,8 +9,8 @@ import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MastodonOAuth2 import org.mariotaku.microblog.library.MastodonStreaming import org.mariotaku.microblog.library.twitter.* -import org.mariotaku.microblog.library.twitter.auth.BasicAuthorization -import org.mariotaku.microblog.library.twitter.auth.EmptyAuthorization +import org.mariotaku.microblog.library.auth.BasicAuthorization +import org.mariotaku.microblog.library.auth.EmptyAuthorization import org.mariotaku.restfu.RestAPIFactory import org.mariotaku.restfu.RestRequest import org.mariotaku.restfu.http.Authorization diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensions.kt index 35302ec74..ea6b00903 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/FiltersDataExtensions.kt @@ -16,6 +16,18 @@ import org.xmlpull.v1.XmlSerializer import java.io.IOException import java.util.* +private const val TAG_FILTERS = "filters" +private const val TAG_KEYWORD = "keyword" +private const val TAG_SOURCE = "source" +private const val TAG_LINK = "link" +private const val TAG_USER = "user" + +private const val ATTR_SCREEN_NAME = "screenName" +private const val ATTR_NAME = "name" +private const val ATTR_KEY = "key" +private const val ATTR_SCOPE = "scope" +private const val ATTR_USER_KEY = "userKey" + fun FiltersData.read(cr: ContentResolver, loadSubscription: Boolean = false) { fun readBaseItems(uri: Uri): List? { val where = if (loadSubscription) null else Expression.lesserThan(Filters.SOURCE, 0).sql @@ -59,19 +71,6 @@ fun FiltersData.write(cr: ContentResolver, deleteOld: Boolean = true) { } } -private const val TAG_FILTERS = "filters" -private const val TAG_KEYWORD = "keyword" -private const val TAG_SOURCE = "source" -private const val TAG_LINK = "link" -private const val TAG_USER = "user" - -private const val ATTR_SCREEN_NAME = "screenName" -private const val ATTR_NAME = "name" -private const val ATTR_KEY = "key" -private const val ATTR_SCOPE = "scope" -private const val ATTR_USER_KEY = "userKey" - - @Throws(IOException::class) fun FiltersData.serialize(serializer: XmlSerializer) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableActivityExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableActivityExtensions.kt index 953cf5fd7..b7c1aeffe 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableActivityExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableActivityExtensions.kt @@ -20,15 +20,12 @@ package org.mariotaku.twidere.extension.model import org.mariotaku.ktextension.addAllTo -import org.mariotaku.microblog.library.twitter.model.Activity +import org.mariotaku.microblog.library.model.microblog.Activity.Action import org.mariotaku.twidere.model.ParcelableActivity import java.util.* val ParcelableActivity.activityStatus: ParcelableActivity? - get() = when (action) { - Activity.Action.MENTION, Activity.Action.REPLY, Activity.Action.QUOTE -> this - else -> null - } + get() = takeIf { action in Action.MENTION_ACTIONS } val ParcelableActivity.reachedCountLimit: Boolean get() { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableCardEntityExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableCardEntityExtensions.kt index 089c83ea9..078fa69c7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableCardEntityExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableCardEntityExtensions.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.extension.model import org.mariotaku.ktextension.mapToArray import org.mariotaku.ktextension.toIntOr import org.mariotaku.ktextension.toLongOr -import org.mariotaku.microblog.library.twitter.model.CardEntity +import org.mariotaku.microblog.library.model.microblog.CardEntity import org.mariotaku.twidere.extension.model.api.toParcelable import org.mariotaku.twidere.model.ParcelableCardEntity import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt index 9fcf37198..5321320e5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt @@ -3,7 +3,7 @@ package org.mariotaku.twidere.extension.model import android.content.Context import org.mariotaku.ktextension.addAllTo import org.mariotaku.ktextension.toLongOr -import org.mariotaku.microblog.library.mastodon.annotation.StatusVisibility +import org.mariotaku.microblog.library.annotation.mastodon.StatusVisibility import org.mariotaku.twidere.R import org.mariotaku.twidere.TwidereConstants.USER_TYPE_FANFOU_COM import org.mariotaku.twidere.model.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/DirectMessageEventObjectDsl.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/DirectMessageEventObjectDsl.kt index 468284d0d..53d96cd63 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/DirectMessageEventObjectDsl.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/DirectMessageEventObjectDsl.kt @@ -19,45 +19,47 @@ package org.mariotaku.twidere.extension.model.api -import org.mariotaku.microblog.library.twitter.model.DirectMessageEventObject +import org.mariotaku.microblog.library.model.microblog.DirectMessageEventObject +import org.mariotaku.microblog.library.model.microblog.DirectMessageEventObject.Event +import org.mariotaku.microblog.library.model.microblog.DirectMessageEventObject.Event.MessageCreate /** * Created by mariotaku on 2017/5/11. */ -fun DirectMessageEventObject(action: DirectMessageEventObject.Event.() -> Unit): DirectMessageEventObject { +fun DirectMessageEventObject(action: Event.() -> Unit): DirectMessageEventObject { val obj = DirectMessageEventObject() - val event = DirectMessageEventObject.Event() + val event = Event() action(event) obj.event = event return obj } -fun DirectMessageEventObject.Event.messageCreate(action: DirectMessageEventObject.Event.MessageCreate.() -> Unit) { - val messageCreate = DirectMessageEventObject.Event.MessageCreate() +fun Event.messageCreate(action: MessageCreate.() -> Unit) { + val messageCreate = MessageCreate() action(messageCreate) this.messageCreate = messageCreate } -fun DirectMessageEventObject.Event.MessageCreate.target(action: DirectMessageEventObject.Event.MessageCreate.Target.() -> Unit) { - val target = DirectMessageEventObject.Event.MessageCreate.Target() +fun MessageCreate.target(action: MessageCreate.Target.() -> Unit) { + val target = MessageCreate.Target() action(target) this.target = target } -fun DirectMessageEventObject.Event.MessageCreate.messageData(action: DirectMessageEventObject.Event.MessageCreate.MessageData.() -> Unit) { - val messageData = DirectMessageEventObject.Event.MessageCreate.MessageData() +fun MessageCreate.messageData(action: MessageCreate.MessageData.() -> Unit) { + val messageData = MessageCreate.MessageData() action(messageData) this.messageData = messageData } -fun DirectMessageEventObject.Event.MessageCreate.MessageData.attachment(action: DirectMessageEventObject.Event.MessageCreate.MessageData.Attachment.() -> Unit) { - val attachment = DirectMessageEventObject.Event.MessageCreate.MessageData.Attachment() +fun MessageCreate.MessageData.attachment(action: MessageCreate.MessageData.Attachment.() -> Unit) { + val attachment = MessageCreate.MessageData.Attachment() action(attachment) this.attachment = attachment } -fun DirectMessageEventObject.Event.MessageCreate.MessageData.Attachment.media(action: DirectMessageEventObject.Event.MessageCreate.MessageData.Attachment.Media.() -> Unit) { - val media = DirectMessageEventObject.Event.MessageCreate.MessageData.Attachment.Media() +fun MessageCreate.MessageData.Attachment.media(action: MessageCreate.MessageData.Attachment.Media.() -> Unit) { + val media = MessageCreate.MessageData.Attachment.Media() action(media) this.media = media } \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/EntityExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/EntityExtensions.kt index a0c29ac1e..2bf7a58b2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/EntityExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/EntityExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api -import org.mariotaku.microblog.library.twitter.model.* +import org.mariotaku.microblog.library.model.microblog.* import org.mariotaku.twidere.model.ParcelableMedia import org.mariotaku.twidere.model.ParcelableUserMention import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/PagingExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/PagingExtensions.kt index 178256958..c9c3cd2f2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/PagingExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/PagingExtensions.kt @@ -19,14 +19,10 @@ package org.mariotaku.twidere.extension.model.api -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.model.AccountDetails -/** - * Created by mariotaku on 2017/4/21. - */ - fun Paging.applyLoadLimit(account: AccountDetails, limit: Int) { when (account.type) { AccountType.MASTODON -> { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt index 8641611f7..f84a95d2d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt @@ -25,13 +25,15 @@ import org.apache.commons.text.translate.LookupTranslator import org.mariotaku.commons.text.CodePointArray import org.mariotaku.ktextension.isNotNullOrEmpty import org.mariotaku.ktextension.mapToArray -import org.mariotaku.microblog.library.twitter.model.EntitySupport -import org.mariotaku.microblog.library.twitter.model.ExtendedEntitySupport -import org.mariotaku.microblog.library.twitter.model.MediaEntity -import org.mariotaku.microblog.library.twitter.model.Status -import org.mariotaku.twidere.annotation.FilterScope +import org.mariotaku.microblog.library.model.microblog.EntitySupport +import org.mariotaku.microblog.library.model.microblog.ExtendedEntitySupport +import org.mariotaku.microblog.library.model.microblog.MediaEntity +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.exception.MalformedResponseException -import org.mariotaku.twidere.extension.model.* +import org.mariotaku.twidere.extension.model.addFilterFlag +import org.mariotaku.twidere.extension.model.toParcelable +import org.mariotaku.twidere.extension.model.updateContentFilterInfo +import org.mariotaku.twidere.extension.model.updateFilterInfo import org.mariotaku.twidere.extension.toSpanItem import org.mariotaku.twidere.model.* import org.mariotaku.twidere.model.util.ParcelableMediaUtils diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/UserExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/UserExtensions.kt index 04b3f9533..d6212ac1e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/UserExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/UserExtensions.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.extension.model.api import android.text.TextUtils import org.mariotaku.ktextension.isNotNullOrEmpty -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.TwidereConstants.USER_TYPE_FANFOU_COM import org.mariotaku.twidere.TwidereConstants.USER_TYPE_TWITTER_COM import org.mariotaku.twidere.annotation.AccountType diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/AttathmentExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/AttathmentExtensions.kt index cd02de5dd..a1a6ced76 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/AttathmentExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/AttathmentExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.gnusocial -import org.mariotaku.microblog.library.gnusocial.model.Attachment +import org.mariotaku.microblog.library.model.gnusocial.Attachment import org.mariotaku.twidere.model.ParcelableMedia /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/GroupExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/GroupExtensions.kt index e06344bf1..8fe1fef64 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/GroupExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/gnusocial/GroupExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.gnusocial -import org.mariotaku.microblog.library.statusnet.model.Group +import org.mariotaku.microblog.library.model.statusnet.Group import org.mariotaku.twidere.model.ParcelableGroup import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AccountExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AccountExtensions.kt index a939b4781..334b8f867 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AccountExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AccountExtensions.kt @@ -19,8 +19,8 @@ package org.mariotaku.twidere.extension.model.api.mastodon -import org.mariotaku.microblog.library.mastodon.model.Account -import org.mariotaku.microblog.library.mastodon.model.Relationship +import org.mariotaku.microblog.library.model.mastodon.Account +import org.mariotaku.microblog.library.model.mastodon.Relationship import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.extension.model.api.isHtml import org.mariotaku.twidere.extension.model.api.spanItems diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ApplicationExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ApplicationExtensions.kt index e46d46cbb..934458247 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ApplicationExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ApplicationExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.mastodon -import org.mariotaku.microblog.library.mastodon.model.Application +import org.mariotaku.microblog.library.model.mastodon.Application import org.mariotaku.twidere.util.HtmlEscapeHelper /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AttachmentExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AttachmentExtensions.kt index 4d8b5a842..fb383c802 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AttachmentExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/AttachmentExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.mastodon -import org.mariotaku.microblog.library.mastodon.model.Attachment +import org.mariotaku.microblog.library.model.mastodon.Attachment import org.mariotaku.twidere.model.ParcelableMedia /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/LinkHeaderListExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/LinkHeaderListExtensions.kt index d6ef7d334..793a6418a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/LinkHeaderListExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/LinkHeaderListExtensions.kt @@ -20,8 +20,8 @@ package org.mariotaku.twidere.extension.model.api.mastodon import android.net.Uri -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderResponse +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderResponse import org.mariotaku.twidere.model.pagination.PaginatedArrayList import org.mariotaku.twidere.model.pagination.PaginatedList import org.mariotaku.twidere.model.pagination.Pagination diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/MentionExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/MentionExtensions.kt index 40d677f4b..2d8ebe74c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/MentionExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/MentionExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.mastodon -import org.mariotaku.microblog.library.mastodon.model.Mention +import org.mariotaku.microblog.library.model.mastodon.Mention import org.mariotaku.twidere.model.ParcelableUserMention import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/NotificationExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/NotificationExtensions.kt index 2aabd9cad..2bd638e9d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/NotificationExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/NotificationExtensions.kt @@ -20,9 +20,9 @@ package org.mariotaku.twidere.extension.model.api.mastodon import org.mariotaku.ktextension.mapToArray -import org.mariotaku.microblog.library.mastodon.model.Notification -import org.mariotaku.microblog.library.mastodon.model.Relationship -import org.mariotaku.microblog.library.twitter.model.Activity +import org.mariotaku.microblog.library.model.mastodon.Notification +import org.mariotaku.microblog.library.model.mastodon.Relationship +import org.mariotaku.microblog.library.model.microblog.Activity.Action import org.mariotaku.twidere.extension.model.toLite import org.mariotaku.twidere.extension.model.toSummaryLine import org.mariotaku.twidere.extension.model.updateActivityFilterInfo @@ -56,34 +56,34 @@ fun Notification.toParcelable(accountKey: UserKey, relationships: Map { if (status == null) { - result.action = Activity.Action.INVALID + result.action = Action.INVALID return result } - result.action = Activity.Action.MENTION + result.action = Action.MENTION status.applyTo(accountKey, result) } Notification.Type.REBLOG -> { if (status == null) { - result.action = Activity.Action.INVALID + result.action = Action.INVALID return result } - result.action = Activity.Action.RETWEET + result.action = Action.RETWEET val parcelableStatus = status.toParcelable(accountKey) result.target_objects = ParcelableActivity.RelatedObject.statuses(parcelableStatus) result.summary_line = arrayOf(parcelableStatus.toSummaryLine()) } Notification.Type.FAVOURITE -> { if (status == null) { - result.action = Activity.Action.INVALID + result.action = Action.INVALID return result } - result.action = Activity.Action.FAVORITE + result.action = Action.FAVORITE val parcelableStatus = status.toParcelable(accountKey) result.targets = ParcelableActivity.RelatedObject.statuses(parcelableStatus) result.summary_line = arrayOf(parcelableStatus.toSummaryLine()) } Notification.Type.FOLLOW -> { - result.action = Activity.Action.FOLLOW + result.action = Action.FOLLOW } else -> { result.action = type diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/RelationshipExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/RelationshipExtensions.kt index 2c4f9562f..00e3d1f13 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/RelationshipExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/RelationshipExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.mastodon -import org.mariotaku.microblog.library.mastodon.model.Relationship +import org.mariotaku.microblog.library.model.mastodon.Relationship import org.mariotaku.twidere.model.ParcelableRelationship import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ResultsExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ResultsExtensions.kt index df2545310..1016a4f2d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ResultsExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/ResultsExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.mastodon -import org.mariotaku.microblog.library.mastodon.model.Results +import org.mariotaku.microblog.library.model.mastodon.Results import org.mariotaku.twidere.model.pagination.PaginatedArrayList import org.mariotaku.twidere.model.pagination.PaginatedList diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/StatusExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/StatusExtensions.kt index dba34315d..b3c2fa854 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/StatusExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/mastodon/StatusExtensions.kt @@ -24,8 +24,8 @@ import android.text.Editable import android.text.Spanned import org.mariotaku.ktextension.isNotNullOrEmpty import org.mariotaku.ktextension.mapToArray -import org.mariotaku.microblog.library.mastodon.model.Emoji -import org.mariotaku.microblog.library.mastodon.model.Status +import org.mariotaku.microblog.library.model.mastodon.Emoji +import org.mariotaku.microblog.library.model.mastodon.Status import org.mariotaku.twidere.extension.model.addFilterFlag import org.mariotaku.twidere.extension.model.api.isHtml import org.mariotaku.twidere.extension.model.api.spanItems diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt index 8f3f9b0db..b5ab1ad65 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt @@ -20,9 +20,9 @@ package org.mariotaku.twidere.extension.model.api.microblog import org.mariotaku.ktextension.mapToArray -import org.mariotaku.microblog.library.twitter.model.Activity -import org.mariotaku.microblog.library.twitter.model.Activity.Action -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.microblog.Activity +import org.mariotaku.microblog.library.model.microblog.Activity.Action +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.extension.model.api.applyTo import org.mariotaku.twidere.extension.model.api.toParcelable import org.mariotaku.twidere.extension.model.toLite diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/RelationshipExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/RelationshipExtensions.kt index 65d351568..71a3968fb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/RelationshipExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/RelationshipExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.model.api.microblog -import org.mariotaku.microblog.library.twitter.model.Relationship +import org.mariotaku.microblog.library.model.microblog.Relationship import org.mariotaku.twidere.model.ParcelableRelationship import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ResponseListExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ResponseListExtensions.kt index 6b9413a9a..a27a7ed88 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ResponseListExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ResponseListExtensions.kt @@ -19,8 +19,8 @@ package org.mariotaku.twidere.extension.model.api.microblog -import org.mariotaku.microblog.library.twitter.model.PageableResponseList -import org.mariotaku.microblog.library.twitter.model.ResponseList +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.ResponseList import org.mariotaku.twidere.model.pagination.* /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/UserListExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/UserListExtensions.kt index 44e5c9a62..0befc5b7c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/UserListExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/UserListExtensions.kt @@ -19,7 +19,8 @@ package org.mariotaku.twidere.extension.model.api.microblog -import org.mariotaku.microblog.library.twitter.model.UserList +import org.mariotaku.microblog.library.model.microblog.UserList +import org.mariotaku.microblog.library.model.microblog.UserList.Mode import org.mariotaku.twidere.extension.model.api.getProfileImageOfSize import org.mariotaku.twidere.extension.model.api.key import org.mariotaku.twidere.model.ParcelableUserList @@ -32,7 +33,7 @@ fun UserList.toParcelable(accountKey: UserKey, position: Long = 0, isFollowing: obj.position = position obj.account_key = accountKey obj.id = id - obj.is_public = UserList.Mode.PUBLIC == mode + obj.is_public = Mode.PUBLIC == mode obj.is_following = isFollowing obj.name = name obj.description = description diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/twitter/UserListUpdateExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/twitter/UserListUpdateExtensions.kt index 1c82d3ed1..87558d29b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/twitter/UserListUpdateExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/twitter/UserListUpdateExtensions.kt @@ -19,9 +19,9 @@ package org.mariotaku.twidere.extension.model.api.twitter -import org.mariotaku.microblog.library.twitter.model.UserList -import org.mariotaku.microblog.library.twitter.model.UserListUpdate +import org.mariotaku.microblog.library.model.microblog.UserList.Mode +import org.mariotaku.microblog.library.model.microblog.UserListUpdate fun UserListUpdate.setPublic(isPublic: Boolean) { - setMode(if (isPublic) UserList.Mode.PUBLIC else UserList.Mode.PRIVATE) + setMode(if (isPublic) Mode.PUBLIC else Mode.PRIVATE) } \ No newline at end of file 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 7ef74e84f..66fbdf4db 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt @@ -25,7 +25,7 @@ import android.support.v7.app.AlertDialog import kotlinx.android.synthetic.main.dialog_user_list_detail_editor.* import org.mariotaku.ktextension.empty import org.mariotaku.ktextension.string -import org.mariotaku.microblog.library.twitter.model.UserListUpdate +import org.mariotaku.microblog.library.model.microblog.UserListUpdate import org.mariotaku.twidere.R import org.mariotaku.twidere.extension.* import org.mariotaku.twidere.extension.model.api.twitter.setPublic 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 f2269ab17..deb16f784 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt @@ -25,7 +25,7 @@ import android.support.v7.app.AlertDialog import kotlinx.android.synthetic.main.dialog_user_list_detail_editor.* import org.mariotaku.ktextension.empty import org.mariotaku.ktextension.string -import org.mariotaku.microblog.library.twitter.model.UserListUpdate +import org.mariotaku.microblog.library.model.microblog.UserListUpdate import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_DESCRIPTION import org.mariotaku.twidere.constant.IntentConstants.EXTRA_IS_PUBLIC diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/NetworkDiagnosticsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/NetworkDiagnosticsFragment.kt index 64277f27f..391f01951 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/NetworkDiagnosticsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/NetworkDiagnosticsFragment.kt @@ -20,9 +20,9 @@ import android.view.ViewGroup import kotlinx.android.synthetic.main.fragment_network_diagnostics.* import okhttp3.Dns import org.mariotaku.ktextension.weak -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.restfu.RestFuUtils import org.mariotaku.restfu.annotation.method.GET import org.mariotaku.restfu.http.HttpRequest 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 aca6baffd..22b0f5137 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt @@ -29,8 +29,8 @@ import android.widget.AdapterView import com.bumptech.glide.RequestManager import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.fragment_content_listview.* -import org.mariotaku.microblog.library.twitter.model.ResponseList -import org.mariotaku.microblog.library.twitter.model.SavedSearch +import org.mariotaku.microblog.library.model.microblog.ResponseList +import org.mariotaku.microblog.library.model.microblog.SavedSearch import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.SavedSearchesAdapter import org.mariotaku.twidere.extension.accountKey @@ -54,6 +54,8 @@ class SavedSearchesListFragment : AbsContentListViewFragment { object1, object2 -> object1.position - object2.position } + override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) linkHandlerTitle = getString(R.string.saved_searches) @@ -99,7 +101,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment?>, data: ResponseList?) { if (data != null) { - Collections.sort(data, POSITION_COMPARATOR) + Collections.sort(data, positionComparator) } adapter.setData(data) showContent() @@ -117,8 +119,4 @@ class SavedSearchesListFragment : AbsContentListViewFragment { object1, object2 -> object1.position - object2.position } - } } 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 a57d4bd48..b45b2949a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -74,9 +74,9 @@ import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.* import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.FriendshipUpdate -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.UserList +import org.mariotaku.microblog.library.model.microblog.FriendshipUpdate +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.UserList import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.R import org.mariotaku.twidere.activity.AccountSelectorActivity diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/group/GroupFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/group/GroupFragment.kt index adc8c8698..48ae2dfd8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/group/GroupFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/group/GroupFragment.kt @@ -30,7 +30,7 @@ import android.support.v4.content.FixedAsyncTaskLoader import android.support.v4.content.Loader import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.statusnet.model.Group +import org.mariotaku.microblog.library.model.statusnet.Group import org.mariotaku.twidere.Constants.EXTRA_OMIT_INTENT_EXTRA import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.SupportTabsAdapter 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 0d05543f8..a6a842a4d 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 @@ -27,7 +27,9 @@ import android.net.Uri import android.os.Bundle import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView +import com.davemorrissey.labs.subscaleview.decoder.DecoderFactory import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder +import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder import org.mariotaku.ktextension.nextPowerOf2 import org.mariotaku.mediaviewer.library.CacheDownloadLoader import org.mariotaku.mediaviewer.library.subsampleimageview.SubsampleImageViewerFragment @@ -43,7 +45,6 @@ import java.lang.ref.WeakReference class ImagePageFragment : SubsampleImageViewerFragment() { - private val media: ParcelableMedia? get() = arguments!!.getParcelable(EXTRA_MEDIA) @@ -92,8 +93,8 @@ class ImagePageFragment : SubsampleImageViewerFragment() { override fun setupImageView(imageView: SubsamplingScaleImageView) { imageView.maxScale = resources.displayMetrics.density - imageView.setBitmapDecoderClass(PreviewBitmapDecoder::class.java) - imageView.setParallelLoadingEnabled(true) + imageView.setBitmapDecoderFactory(PreviewBitmapDecoder.Factory) + imageView.setRegionDecoderFactory(RegionDecoderFactory) imageView.setOnClickListener { val activity = activity as? MediaViewerActivity ?: return@setOnClickListener activity.toggleBar() @@ -155,15 +156,26 @@ class ImagePageFragment : SubsampleImageViewerFragment() { val cr = context.contentResolver decodeBitmap(cr, uri, o) val dm = context.resources.displayMetrics - val targetSize = Math.min(1024, Math.max(dm.widthPixels, dm.heightPixels)) + val targetSize = Math.max(dm.widthPixels, dm.heightPixels).coerceAtMost(1024) val sizeRatio = Math.ceil(Math.max(o.outHeight, o.outWidth) / targetSize.toDouble()) - o.inSampleSize = Math.max(1.0, sizeRatio).toInt().nextPowerOf2 + o.inSampleSize = sizeRatio.coerceAtLeast(1.0).toInt().nextPowerOf2 o.inJustDecodeBounds = false return decodeBitmap(cr, uri, o) ?: throw IOException() } return super.decode(context, uri) } + object Factory : DecoderFactory { + override fun make(): PreviewBitmapDecoder { + return PreviewBitmapDecoder() + } + + } + + } + + object RegionDecoderFactory : DecoderFactory { + override fun make() = SkiaImageRegionDecoder(Bitmap.Config.ARGB_8888) } companion object { 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 9d3fbd216..ff34113aa 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 @@ -55,8 +55,8 @@ import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.* import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.TranslationResult +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.TranslationResult import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/CacheUserSearchLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/CacheUserSearchLoader.kt index 38ee42c6c..db1fd358e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/CacheUserSearchLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/CacheUserSearchLoader.kt @@ -2,7 +2,7 @@ package org.mariotaku.twidere.loader import android.content.Context import org.mariotaku.library.objectcursor.ObjectCursor -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.sqliteqb.library.Columns import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.dagger.component.GeneralComponent 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 d4678b541..5c711f025 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableStatusLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ParcelableStatusLoader.kt @@ -25,7 +25,7 @@ import android.os.Bundle import android.support.v4.content.FixedAsyncTaskLoader import org.mariotaku.ktextension.set import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.ErrorInfo +import org.mariotaku.microblog.library.model.microblog.ErrorInfo import org.mariotaku.restfu.http.RestHttpClient import org.mariotaku.twidere.constant.IntentConstants import org.mariotaku.twidere.constant.IntentConstants.EXTRA_ACCOUNT 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 ecda93a8f..5f8e38824 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/SavedSearchesLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/SavedSearchesLoader.kt @@ -25,8 +25,8 @@ import android.support.v4.content.FixedAsyncTaskLoader import android.util.Log import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.ResponseList -import org.mariotaku.microblog.library.twitter.model.SavedSearch +import org.mariotaku.microblog.library.model.microblog.ResponseList +import org.mariotaku.microblog.library.model.microblog.SavedSearch import org.mariotaku.twidere.Constants import org.mariotaku.twidere.TwidereConstants.LOGTAG import org.mariotaku.twidere.extension.getDetailsOrThrow 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 672b88757..c019bc4f3 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 @@ -24,8 +24,8 @@ import android.content.Context import android.support.v4.content.FixedAsyncTaskLoader import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.statusnet.model.Group -import org.mariotaku.microblog.library.twitter.model.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.statusnet.Group import org.mariotaku.twidere.TwidereConstants.LOGTAG import org.mariotaku.twidere.extension.getDetailsOrThrow import org.mariotaku.twidere.extension.model.api.gnusocial.toParcelable diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/UserGroupsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/UserGroupsLoader.kt index 13197b147..4c998195f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/UserGroupsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/group/UserGroupsLoader.kt @@ -20,11 +20,10 @@ package org.mariotaku.twidere.loader.group import android.content.Context - import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.statusnet.model.Group -import org.mariotaku.microblog.library.twitter.model.ResponseList +import org.mariotaku.microblog.library.model.microblog.ResponseList +import org.mariotaku.microblog.library.model.statusnet.Group import org.mariotaku.twidere.model.ParcelableGroup import org.mariotaku.twidere.model.UserKey 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 0e9966b14..6ed9e3b88 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 @@ -25,8 +25,8 @@ import android.content.SharedPreferences import android.support.annotation.WorkerThread import org.mariotaku.kpreferences.get import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.loadItemLimitKey import org.mariotaku.twidere.dagger.component.GeneralComponent 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 2f132cce4..f7ab3fbe2 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 @@ -24,13 +24,13 @@ import android.support.annotation.WorkerThread import org.attoparser.config.ParseConfiguration import org.attoparser.dom.DOMMarkupParser import org.mariotaku.commons.parcel.ParcelUtils +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.SearchQuery +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.microblog.library.twitter.TwitterWeb -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.SearchQuery -import org.mariotaku.microblog.library.twitter.model.Status import org.mariotaku.twidere.alias.MastodonStatus import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.exception.APINotSupportedException 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 210b0bf7e..d7d42ab92 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 @@ -27,9 +27,9 @@ import android.util.Log import org.mariotaku.kpreferences.get import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.PageableResponseList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.UserList +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.UserList import org.mariotaku.twidere.R import org.mariotaku.twidere.TwidereConstants.LOGTAG import org.mariotaku.twidere.constant.loadItemLimitKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListMembershipsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListMembershipsLoader.kt index c78b9d036..20a7460b7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListMembershipsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListMembershipsLoader.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.loader.userlists import android.content.Context import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.PageableResponseList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.UserList +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.UserList import org.mariotaku.twidere.model.ParcelableUserList import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListOwnershipsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListOwnershipsLoader.kt index affc97102..9ab1a89b4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListOwnershipsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListOwnershipsLoader.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.loader.userlists import android.content.Context import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.UserList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.UserList import org.mariotaku.twidere.model.ParcelableUserList import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListSubscriptionsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListSubscriptionsLoader.kt index b93fbe015..e340f34d4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListSubscriptionsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/userlists/UserListSubscriptionsLoader.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.loader.userlists import android.content.Context import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.PageableResponseList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.UserList +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.UserList import org.mariotaku.twidere.model.ParcelableUserList import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/AbsRequestUsersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/AbsRequestUsersLoader.kt index d8b79f669..0fdf0f0c5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/AbsRequestUsersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/AbsRequestUsersLoader.kt @@ -23,7 +23,7 @@ import android.accounts.AccountManager import android.content.Context import org.mariotaku.kpreferences.get import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.loadItemLimitKey import org.mariotaku.twidere.dagger.DependencyHolder diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/GroupMembersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/GroupMembersLoader.kt index 13243933d..e8b29d3f6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/GroupMembersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/GroupMembersLoader.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.loader.users import android.content.Context import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.ResponseList -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.ResponseList +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.extension.model.api.microblog.mapToPaginated import org.mariotaku.twidere.extension.model.api.toParcelable import org.mariotaku.twidere.extension.model.newMicroBlogInstance diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/IncomingFriendshipsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/IncomingFriendshipsLoader.kt index fc61b780a..0d6bfd77e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/IncomingFriendshipsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/IncomingFriendshipsLoader.kt @@ -20,10 +20,10 @@ package org.mariotaku.twidere.loader.users import android.content.Context +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.extension.api.lookupUsersMapPaginated import org.mariotaku.twidere.extension.model.api.mastodon.mapToPaginated diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/MutesUsersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/MutesUsersLoader.kt index 47bdbe5cf..e60c7fcaa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/MutesUsersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/MutesUsersLoader.kt @@ -20,10 +20,10 @@ package org.mariotaku.twidere.loader.users import android.content.Context +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.annotation.FilterScope import org.mariotaku.twidere.extension.model.api.mastodon.mapToPaginated diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusFavoritersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusFavoritersLoader.kt index 1759704ed..2f4bb0427 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusFavoritersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusFavoritersLoader.kt @@ -23,13 +23,13 @@ import android.content.Context import org.attoparser.config.ParseConfiguration import org.attoparser.simple.AbstractSimpleMarkupHandler import org.attoparser.simple.SimpleMarkupParser +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon +import org.mariotaku.microblog.library.model.microblog.IDs +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.setIds import org.mariotaku.microblog.library.twitter.TwitterWeb -import org.mariotaku.microblog.library.twitter.model.IDs -import org.mariotaku.microblog.library.twitter.model.IDsAccessor -import org.mariotaku.microblog.library.twitter.model.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.extension.api.lookupUsersMapPaginated @@ -71,7 +71,7 @@ class StatusFavoritersLoader( } else { val web = details.newMicroBlogInstance(context, TwitterWeb::class.java) val htmlUsers = web.getFavoritedPopup(statusId).htmlUsers - val ids = IDsAccessor.setIds(IDs(), parseUserIds(htmlUsers)) + val ids = IDs().setIds(parseUserIds(htmlUsers)) microBlog.lookupUsersMapPaginated(ids) { it.toParcelable(details, profileImageSize = profileImageSize) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusRetweetersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusRetweetersLoader.kt index 102420e55..3d50e02af 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusRetweetersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/StatusRetweetersLoader.kt @@ -20,10 +20,10 @@ package org.mariotaku.twidere.loader.users import android.content.Context +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.extension.model.api.mastodon.toParcelable 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 1bd6d48bf..625092bf3 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 @@ -20,10 +20,10 @@ package org.mariotaku.twidere.loader.users import android.content.Context +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.annotation.FilterScope import org.mariotaku.twidere.extension.model.api.mastodon.mapToPaginated diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFollowersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFollowersLoader.kt index 0cc4cd914..a0a2397e9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFollowersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFollowersLoader.kt @@ -20,10 +20,10 @@ package org.mariotaku.twidere.loader.users import android.content.Context +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.extension.model.api.mastodon.mapToPaginated import org.mariotaku.twidere.extension.model.api.mastodon.toParcelable diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFriendsLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFriendsLoader.kt index fb07295a8..35960f7e5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFriendsLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserFriendsLoader.kt @@ -20,12 +20,8 @@ package org.mariotaku.twidere.loader.users import android.content.Context -import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Fanfou -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.StatusNet -import org.mariotaku.microblog.library.Twitter -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.* +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.extension.model.api.mastodon.mapToPaginated diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListMembersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListMembersLoader.kt index 4e2a216c5..560156057 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListMembersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListMembersLoader.kt @@ -21,9 +21,9 @@ package org.mariotaku.twidere.loader.users import android.content.Context import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.twitter.model.PageableResponseList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.model.ParcelableUser import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListRelatedUsersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListRelatedUsersLoader.kt index 9d3c9b623..f3df3bef8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListRelatedUsersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListRelatedUsersLoader.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.loader.users import android.content.Context import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.PageableResponseList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.exception.APINotSupportedException import org.mariotaku.twidere.extension.model.api.microblog.mapToPaginated diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListSubscribersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListSubscribersLoader.kt index b3477b6fc..72bad99b9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListSubscribersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserListSubscribersLoader.kt @@ -21,9 +21,9 @@ package org.mariotaku.twidere.loader.users import android.content.Context import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.twitter.model.PageableResponseList -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.PageableResponseList +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.model.ParcelableUser import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserRelatedUsersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserRelatedUsersLoader.kt index 99e785bd0..5fa081b5b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserRelatedUsersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserRelatedUsersLoader.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.loader.users import android.content.Context import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.model.AccountDetails import org.mariotaku.twidere.model.ParcelableUser import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserSearchLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserSearchLoader.kt index 2088ecb33..b3a2216b0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserSearchLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/users/UserSearchLoader.kt @@ -20,9 +20,9 @@ package org.mariotaku.twidere.loader.users import android.content.Context -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.extension.model.api.mastodon.mapToPaginated import org.mariotaku.twidere.extension.model.api.mastodon.toParcelable 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 b580cdcd8..b6360b6f9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/ActivityTitleSummaryMessage.kt @@ -8,7 +8,7 @@ import android.text.SpannableString import android.text.SpannableStringBuilder import android.text.Spanned import android.text.style.StyleSpan -import org.mariotaku.microblog.library.twitter.model.Activity +import org.mariotaku.microblog.library.model.microblog.Activity.* import org.mariotaku.twidere.R import org.mariotaku.twidere.extension.model.activityStatus import org.mariotaku.twidere.text.style.NonBreakEllipseSpan @@ -26,14 +26,14 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: nameFirst: Boolean): ActivityTitleSummaryMessage? { val resources = context.resources when (activity.action) { - Activity.Action.FOLLOW -> { + Action.FOLLOW -> { val typeIcon = R.drawable.ic_activity_action_follow val color = ContextCompat.getColor(context, R.color.highlight_follow) val title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_follow, R.string.activity_about_me_follow_multi, sources, nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, null) } - Activity.Action.FAVORITE -> { + Action.FAVORITE -> { val typeIcon: Int val color: Int val title: CharSequence @@ -52,7 +52,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: val summary = generateTextOnlySummary(activity.summary_line) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.RETWEET -> { + Action.RETWEET -> { val typeIcon = R.drawable.ic_activity_action_retweet val color = ContextCompat.getColor(context, R.color.highlight_retweet) val title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_retweet, @@ -60,7 +60,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: val summary = generateTextOnlySummary(activity.summary_line) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.FAVORITED_RETWEET -> { + Action.FAVORITED_RETWEET -> { val typeIcon: Int val color: Int val title: CharSequence @@ -79,7 +79,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.RETWEETED_RETWEET -> { + Action.RETWEETED_RETWEET -> { val typeIcon = R.drawable.ic_activity_action_retweet val color = ContextCompat.getColor(context, R.color.highlight_retweet) val title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_retweeted_retweet, @@ -88,7 +88,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.RETWEETED_MENTION -> { + Action.RETWEETED_MENTION -> { val typeIcon = R.drawable.ic_activity_action_retweet val color = ContextCompat.getColor(context, R.color.highlight_retweet) val title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_retweeted_mention, @@ -97,7 +97,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.FAVORITED_MENTION -> { + Action.FAVORITED_MENTION -> { val typeIcon: Int val color: Int val title: CharSequence @@ -116,7 +116,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.LIST_MEMBER_ADDED -> { + Action.LIST_MEMBER_ADDED -> { val title: CharSequence val icon = R.drawable.ic_activity_action_list_added if (sources.size == 1 && activity.summary_line?.size == 1) { @@ -133,14 +133,14 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: } return ActivityTitleSummaryMessage(icon, defaultColor, title, null) } - Activity.Action.MENTION, Activity.Action.REPLY, Activity.Action.QUOTE -> { + Action.MENTION, Action.REPLY, Action.QUOTE -> { val status = activity.activityStatus ?: return null val title = SpannableString(manager.getDisplayName(status)) title.setSpan(StyleSpan(Typeface.BOLD), 0, title.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) return ActivityTitleSummaryMessage(0, 0, title, status.text_unescaped) } - Activity.Action.JOINED_TWITTER -> { + Action.JOINED_TWITTER -> { val typeIcon = R.drawable.ic_activity_action_follow val color = ContextCompat.getColor(context, R.color.highlight_follow) val title = getTitleStringAboutMe(resources, manager, @@ -148,7 +148,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: sources, nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, null) } - Activity.Action.MEDIA_TAGGED -> { + Action.MEDIA_TAGGED -> { val typeIcon = R.drawable.ic_activity_action_media_tagged val color = ContextCompat.getColor(context, R.color.highlight_tagged) val title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_media_tagged, @@ -157,7 +157,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.FAVORITED_MEDIA_TAGGED -> { + Action.FAVORITED_MEDIA_TAGGED -> { val typeIcon: Int val color: Int val title: CharSequence @@ -176,7 +176,7 @@ class ActivityTitleSummaryMessage private constructor(val icon: Int, val color: nameFirst) return ActivityTitleSummaryMessage(typeIcon, color, title, summary) } - Activity.Action.RETWEETED_MEDIA_TAGGED -> { + Action.RETWEETED_MEDIA_TAGGED -> { val typeIcon = R.drawable.ic_activity_action_retweet val color = ContextCompat.getColor(context, R.color.highlight_retweet) val title = getTitleStringAboutMe(resources, manager, R.string.activity_about_me_retweeted_media_tagged, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt index a2ca60f8b..d5c4d048b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt @@ -7,7 +7,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import org.mariotaku.microblog.library.twitter.model.Location +import org.mariotaku.microblog.library.model.microblog.Location import org.mariotaku.twidere.R import org.mariotaku.twidere.activity.TrendsLocationSelectorActivity import org.mariotaku.twidere.annotation.AccountType diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableCardEntityUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableCardEntityUtils.kt index 59604fdb9..24d7cdff6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableCardEntityUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableCardEntityUtils.kt @@ -1,13 +1,9 @@ package org.mariotaku.twidere.model.util - import org.mariotaku.microblog.library.twitter.util.ThreadLocalSimpleDateFormat import java.text.DateFormat import java.util.* -/** - * Created by mariotaku on 16/2/24. - */ object ParcelableCardEntityUtils { internal val sISOFormat: DateFormat = ThreadLocalSimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMediaUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMediaUtils.kt index 319657cf5..cf1897791 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMediaUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableMediaUtils.kt @@ -3,10 +3,10 @@ package org.mariotaku.twidere.model.util import org.mariotaku.ktextension.addAllTo import org.mariotaku.ktextension.isNullOrEmpty import org.mariotaku.ktextension.toIntOr -import org.mariotaku.microblog.library.twitter.model.CardEntity -import org.mariotaku.microblog.library.twitter.model.MediaEntity -import org.mariotaku.microblog.library.twitter.model.Status -import org.mariotaku.microblog.library.twitter.model.UrlEntity +import org.mariotaku.microblog.library.model.microblog.CardEntity +import org.mariotaku.microblog.library.model.microblog.MediaEntity +import org.mariotaku.microblog.library.model.microblog.Status +import org.mariotaku.microblog.library.model.microblog.UrlEntity import org.mariotaku.twidere.extension.model.api.getEntityMedia import org.mariotaku.twidere.extension.model.api.gnusocial.toParcelable import org.mariotaku.twidere.extension.model.toParcelable 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 e86acde98..0789cdb43 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,11 +1,11 @@ package org.mariotaku.twidere.model.util import android.support.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 -import org.mariotaku.microblog.library.twitter.model.DirectMessage -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.DMResponse +import org.mariotaku.microblog.library.model.microblog.DMResponse.Entry.Message +import org.mariotaku.microblog.library.model.microblog.DMResponse.Entry.Message.Data +import org.mariotaku.microblog.library.model.microblog.DirectMessage +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.extension.model.api.addEntities import org.mariotaku.twidere.extension.model.api.getEntityMedia import org.mariotaku.twidere.extension.model.api.key 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 7c0408a88..55938b256 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 @@ -21,7 +21,7 @@ package org.mariotaku.twidere.model.util import android.content.ContentResolver import android.support.v4.util.ArraySet -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.extension.bulkInsert import org.mariotaku.twidere.extension.update 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 9a98c67ca..b6cbaef0c 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 @@ -1,5 +1,6 @@ package org.mariotaku.twidere.preference.sync +import android.annotation.SuppressLint import android.content.Context import android.content.SharedPreferences import android.support.v7.preference.SwitchPreferenceCompat @@ -36,6 +37,7 @@ class SyncItemPreference( a.recycle() } + @SuppressLint("RestrictedApi") override fun syncSummaryView(view: View?) { if (view !is TextView) return if (summary != null || summaryOn != null || summaryOff != null) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt index 2347cdd86..3f670249d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt @@ -26,10 +26,10 @@ import nl.komponents.kovenant.Promise import nl.komponents.kovenant.then import nl.komponents.kovenant.ui.successUi import org.mariotaku.kpreferences.get +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.FriendshipUpdate +import org.mariotaku.microblog.library.model.microblog.FriendshipUpdate import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R import org.mariotaku.twidere.annotation.AccountType diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/SavedSearchPromises.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/SavedSearchPromises.kt index 5b101de96..b6bb268e7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/SavedSearchPromises.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/SavedSearchPromises.kt @@ -25,7 +25,7 @@ import nl.komponents.kovenant.Promise import nl.komponents.kovenant.all import nl.komponents.kovenant.toSuccessVoid import nl.komponents.kovenant.ui.successUi -import org.mariotaku.microblog.library.twitter.model.SavedSearch +import org.mariotaku.microblog.library.model.microblog.SavedSearch import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R import org.mariotaku.twidere.dagger.component.GeneralComponent diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/StatusPromises.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/StatusPromises.kt index 8fd60b743..38de5aa03 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/StatusPromises.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/StatusPromises.kt @@ -27,10 +27,10 @@ import nl.komponents.kovenant.then import nl.komponents.kovenant.ui.alwaysUi import nl.komponents.kovenant.ui.promiseOnUi import nl.komponents.kovenant.ui.successUi +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.ErrorInfo +import org.mariotaku.microblog.library.model.microblog.ErrorInfo import org.mariotaku.twidere.R import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.dagger.component.GeneralComponent diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UpdateStatusPromise.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UpdateStatusPromise.kt index 70f1069ae..0453c058c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UpdateStatusPromise.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UpdateStatusPromise.kt @@ -41,13 +41,14 @@ import nl.komponents.kovenant.then import nl.komponents.kovenant.ui.promiseOnUi import nl.komponents.kovenant.ui.successUi import org.mariotaku.ktextension.* +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.fanfou.model.PhotoStatusUpdate -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.Attachment import org.mariotaku.microblog.library.TwitterUpload -import org.mariotaku.microblog.library.twitter.model.* +import org.mariotaku.microblog.library.model.fanfou.PhotoStatusUpdate +import org.mariotaku.microblog.library.model.mastodon.Attachment +import org.mariotaku.microblog.library.model.microblog.* +import org.mariotaku.microblog.library.model.microblog.MediaUploadResponse.ProcessingInfo import org.mariotaku.restfu.http.ContentType import org.mariotaku.restfu.http.mime.Body import org.mariotaku.restfu.http.mime.FileBody @@ -870,7 +871,7 @@ class UpdateStatusPromise( upload.appendUploadMedia(response.id, segmentIndex, bulk) } response = upload.finalizeUploadMedia(response.id) - var info: MediaUploadResponse.ProcessingInfo? = response.processingInfo + var info = response.processingInfo while (info != null && shouldWaitForProcess(info)) { val checkAfterSecs = info.checkAfterSecs if (checkAfterSecs <= 0) { @@ -885,7 +886,7 @@ class UpdateStatusPromise( response = upload.getUploadMediaStatus(response.id) info = response.processingInfo } - if (info != null && MediaUploadResponse.ProcessingInfo.State.FAILED == info.state) { + if (info != null && ProcessingInfo.State.FAILED == info.state) { val exception = MicroBlogException() val errorInfo = info.error if (errorInfo != null) { @@ -898,7 +899,7 @@ class UpdateStatusPromise( private fun shouldWaitForProcess(info: MediaUploadResponse.ProcessingInfo): Boolean { when (info.state) { - MediaUploadResponse.ProcessingInfo.State.PENDING, MediaUploadResponse.ProcessingInfo.State.IN_PROGRESS -> return true + ProcessingInfo.State.PENDING, ProcessingInfo.State.IN_PROGRESS -> return true else -> return false } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserListPromises.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserListPromises.kt index c24e67757..45fd3b0a4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserListPromises.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserListPromises.kt @@ -26,7 +26,7 @@ import nl.komponents.kovenant.Promise import nl.komponents.kovenant.ui.successUi import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.mapToArray -import org.mariotaku.microblog.library.twitter.model.UserListUpdate +import org.mariotaku.microblog.library.model.microblog.UserListUpdate import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.nameFirstKey import org.mariotaku.twidere.dagger.component.GeneralComponent diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserProfilePromises.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserProfilePromises.kt index cdc421dd7..bf428cbf9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserProfilePromises.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/UserProfilePromises.kt @@ -22,10 +22,10 @@ package org.mariotaku.twidere.promise import android.app.Application import android.net.Uri import nl.komponents.kovenant.Promise -import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.AccountUpdate -import org.mariotaku.microblog.library.twitter.model.ProfileUpdate +import org.mariotaku.microblog.library.MicroBlog +import org.mariotaku.microblog.library.model.mastodon.AccountUpdate +import org.mariotaku.microblog.library.model.microblog.ProfileUpdate import org.mariotaku.twidere.R import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.exception.APINotSupportedException 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 14968bf7c..cd52d79d0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/service/LengthyOperationsService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/service/LengthyOperationsService.kt @@ -41,8 +41,8 @@ import org.mariotaku.ktextension.getNullableTypedArrayExtra import org.mariotaku.ktextension.toLongOr import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.TwitterUpload -import org.mariotaku.microblog.library.twitter.model.MediaUploadResponse -import org.mariotaku.microblog.library.twitter.model.MediaUploadResponse.ProcessingInfo +import org.mariotaku.microblog.library.model.microblog.MediaUploadResponse +import org.mariotaku.microblog.library.model.microblog.MediaUploadResponse.ProcessingInfo import org.mariotaku.restfu.http.ContentType import org.mariotaku.restfu.http.mime.Body import org.mariotaku.restfu.http.mime.SimpleBody 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 b81373feb..1e0601570 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt @@ -17,8 +17,8 @@ import org.mariotaku.ktextension.toNulls import org.mariotaku.library.objectcursor.ObjectCursor import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.TwitterUserStream -import org.mariotaku.microblog.library.twitter.annotation.StreamWith -import org.mariotaku.microblog.library.twitter.model.* +import org.mariotaku.microblog.library.annotation.twitter.StreamWith +import org.mariotaku.microblog.library.model.microblog.* import org.mariotaku.sqliteqb.library.Columns import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/PinStatusTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/PinStatusTask.kt index 5080b6835..42def2c2d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/PinStatusTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/PinStatusTask.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.task.status import android.content.Context import android.widget.Toast import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.twitter.model.PinTweetResult +import org.mariotaku.microblog.library.model.microblog.PinTweetResult import org.mariotaku.twidere.R import org.mariotaku.twidere.extension.model.newMicroBlogInstance import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/UnpinStatusTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/UnpinStatusTask.kt index 0bcc94aa7..aabe95d40 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/UnpinStatusTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/status/UnpinStatusTask.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.task.status import android.content.Context import android.widget.Toast import org.mariotaku.microblog.library.MicroBlog -import org.mariotaku.microblog.library.twitter.model.PinTweetResult +import org.mariotaku.microblog.library.model.microblog.PinTweetResult import org.mariotaku.twidere.R import org.mariotaku.twidere.extension.model.newMicroBlogInstance import org.mariotaku.twidere.model.AccountDetails diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/statuses/GetStatusesTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/statuses/GetStatusesTask.kt index 359a3e31e..b2c6942f2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/statuses/GetStatusesTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/statuses/GetStatusesTask.kt @@ -28,11 +28,11 @@ import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.addTo import org.mariotaku.ktextension.toLongOr import org.mariotaku.library.objectcursor.ObjectCursor +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Paging -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.microblog.Paging +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.sqliteqb.library.Columns import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R 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 214c3df2d..e057631ae 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 @@ -7,12 +7,12 @@ import android.net.Uri import android.support.annotation.UiThread import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.addTo +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Activity -import org.mariotaku.microblog.library.twitter.model.InternalActivityCreator -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.Activity.Action +import org.mariotaku.microblog.library.model.microblog.InternalActivityCreator +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R import org.mariotaku.twidere.TwidereConstants.LOGTAG @@ -139,7 +139,7 @@ abstract class GetActivitiesTask( val relationships = mastodon.batchGetRelationships(userIds) val activities = notifications.mapNotNull { val activity = it.toParcelable(account, relationships) - if (activity.action == Activity.Action.INVALID) return@mapNotNull null + if (activity.action == Action.INVALID) return@mapNotNull null return@mapNotNull activity } return GetTimelineResult(account, activities, activities.flatMap { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt index f05d93ca2..4a917e7d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt @@ -29,9 +29,10 @@ import org.mariotaku.ktextension.toLongOr import org.mariotaku.library.objectcursor.ObjectCursor import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.DMResponse -import org.mariotaku.microblog.library.twitter.model.DirectMessage -import org.mariotaku.microblog.library.twitter.model.Paging +import org.mariotaku.microblog.library.model.microblog.DMResponse +import org.mariotaku.microblog.library.model.microblog.DMResponse.Conversation +import org.mariotaku.microblog.library.model.microblog.DirectMessage +import org.mariotaku.microblog.library.model.microblog.Paging import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R import org.mariotaku.twidere.TwidereConstants.QUERY_PARAM_SHOW_NOTIFICATION @@ -414,8 +415,8 @@ class GetMessagesTask( it.toParcelable(account, profileImageSize = profileImageSize) } val conversationType = when (v.type?.toUpperCase(Locale.US)) { - DMResponse.Conversation.Type.ONE_TO_ONE -> ConversationType.ONE_TO_ONE - DMResponse.Conversation.Type.GROUP_DM -> ConversationType.GROUP + Conversation.Type.ONE_TO_ONE -> ConversationType.ONE_TO_ONE + Conversation.Type.GROUP_DM -> ConversationType.GROUP else -> ConversationType.ONE_TO_ONE } val conversation = conversations.addConversation(k, account, recentMessage, participants, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/SendMessageTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/SendMessageTask.kt index 9d9edcdb4..aeb551e82 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/SendMessageTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/SendMessageTask.kt @@ -24,9 +24,9 @@ import org.mariotaku.ktextension.isNotNullOrEmpty import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.TwitterUpload -import org.mariotaku.microblog.library.twitter.annotation.MediaCategory -import org.mariotaku.microblog.library.twitter.model.DirectMessage -import org.mariotaku.microblog.library.twitter.model.NewDm +import org.mariotaku.microblog.library.annotation.twitter.MediaCategory +import org.mariotaku.microblog.library.model.microblog.DirectMessage +import org.mariotaku.microblog.library.model.microblog.NewDm import org.mariotaku.sqliteqb.library.Expression import org.mariotaku.twidere.R import org.mariotaku.twidere.annotation.AccountType diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentValuesCreator.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentValuesCreator.kt index feceef2b9..e32f1452e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentValuesCreator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ContentValuesCreator.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import android.content.ContentValues -import org.mariotaku.microblog.library.twitter.model.SavedSearch +import org.mariotaku.microblog.library.model.microblog.SavedSearch import org.mariotaku.twidere.model.ParcelableStatus import org.mariotaku.twidere.model.ParcelableUser import org.mariotaku.twidere.model.ParcelableUserMention 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 80310dd70..29943384e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt @@ -34,10 +34,10 @@ import android.text.TextUtils import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.mapToArray import org.mariotaku.library.objectcursor.ObjectCursor +import org.mariotaku.microblog.library.Mastodon import org.mariotaku.microblog.library.MicroBlog import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.twitter.model.Activity +import org.mariotaku.microblog.library.model.microblog.Activity.Action import org.mariotaku.sqliteqb.library.* import org.mariotaku.sqliteqb.library.Columns.Column import org.mariotaku.sqliteqb.library.query.SQLSelectQuery @@ -762,7 +762,7 @@ object DataStoreUtils { if (extras is InteractionsTabExtras) { if (extras.isMentionsOnly) { extraWhere = Expression.inArgs(Activities.ACTION, 3) - extraWhereArgs = arrayOf(Activity.Action.MENTION, Activity.Action.REPLY, Activity.Action.QUOTE) + extraWhereArgs = arrayOf(Action.MENTION, Action.REPLY, Action.QUOTE) } if (extras.isMyFollowingOnly) { followingOnly = true @@ -876,8 +876,7 @@ object DataStoreUtils { private fun getIdsWhere(official: Boolean): Pair?> { if (official) return Pair(null, null) - return Pair(Expression.inArgs(Activities.ACTION, Activity.Action.MENTION_ACTIONS.size) - , Activity.Action.MENTION_ACTIONS) + return Pair(Expression.inArgs(Activities.ACTION, Action.MENTION_ACTIONS.size), Action.MENTION_ACTIONS) } private fun getOfficialSeparatedIds(context: Context, getFromDatabase: (Array, Boolean) -> T, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MastodonApplicationRegistry.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MastodonApplicationRegistry.kt index e856eaee7..ee3f17275 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MastodonApplicationRegistry.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MastodonApplicationRegistry.kt @@ -22,8 +22,8 @@ package org.mariotaku.twidere.util import android.content.Context import org.mariotaku.microblog.library.MicroBlogException import org.mariotaku.microblog.library.Mastodon -import org.mariotaku.microblog.library.mastodon.model.RegisteredApplication -import org.mariotaku.microblog.library.twitter.auth.EmptyAuthorization +import org.mariotaku.microblog.library.model.mastodon.RegisteredApplication +import org.mariotaku.microblog.library.auth.EmptyAuthorization import org.mariotaku.restfu.http.Endpoint import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.annotation.AccountType 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 df7537b70..1735e5d57 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt @@ -44,7 +44,7 @@ import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.set import org.mariotaku.ktextension.setItemAvailability -import org.mariotaku.microblog.library.mastodon.annotation.StatusVisibility +import org.mariotaku.microblog.library.annotation.mastodon.StatusVisibility import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.R import org.mariotaku.twidere.activity.AccountSelectorActivity diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusCodeMessageUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusCodeMessageUtils.kt index 7f5afc6aa..5fa74d4ea 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusCodeMessageUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/StatusCodeMessageUtils.kt @@ -22,9 +22,9 @@ package org.mariotaku.twidere.util import android.content.Context import android.text.TextUtils import android.util.SparseIntArray - import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.twitter.model.ErrorInfo +import org.mariotaku.microblog.library.model.microblog.ErrorInfo +import org.mariotaku.microblog.library.model.microblog.ErrorInfo.* import org.mariotaku.twidere.R import org.mariotaku.twidere.util.ErrorInfoStore.DisplayErrorInfo @@ -38,8 +38,8 @@ object StatusCodeMessageUtils { init { TWITTER_ERROR_CODE_MESSAGES.put(32, R.string.error_twitter_32) - TWITTER_ERROR_CODE_MESSAGES.put(ErrorInfo.PAGE_NOT_FOUND, R.string.error_twitter_34) - TWITTER_ERROR_CODE_MESSAGES.put(ErrorInfo.RATE_LIMIT_EXCEEDED, R.string.error_twitter_88) + TWITTER_ERROR_CODE_MESSAGES.put(PAGE_NOT_FOUND, R.string.error_twitter_34) + TWITTER_ERROR_CODE_MESSAGES.put(RATE_LIMIT_EXCEEDED, R.string.error_twitter_88) TWITTER_ERROR_CODE_MESSAGES.put(89, R.string.error_twitter_89) TWITTER_ERROR_CODE_MESSAGES.put(64, R.string.error_twitter_64) TWITTER_ERROR_CODE_MESSAGES.put(130, R.string.error_twitter_130) @@ -50,9 +50,9 @@ object StatusCodeMessageUtils { TWITTER_ERROR_CODE_MESSAGES.put(144, R.string.error_twitter_144) TWITTER_ERROR_CODE_MESSAGES.put(161, R.string.error_twitter_161) TWITTER_ERROR_CODE_MESSAGES.put(162, R.string.error_twitter_162) - TWITTER_ERROR_CODE_MESSAGES.put(ErrorInfo.SEARCH_ALREADY_SAVED, R.string.error_twitter_172) - TWITTER_ERROR_CODE_MESSAGES.put(ErrorInfo.NOT_AUTHORIZED, R.string.error_twitter_179) - TWITTER_ERROR_CODE_MESSAGES.put(ErrorInfo.STATUS_IS_DUPLICATE, R.string.error_twitter_187) + TWITTER_ERROR_CODE_MESSAGES.put(SEARCH_ALREADY_SAVED, R.string.error_twitter_172) + TWITTER_ERROR_CODE_MESSAGES.put(NOT_AUTHORIZED, R.string.error_twitter_179) + TWITTER_ERROR_CODE_MESSAGES.put(STATUS_IS_DUPLICATE, R.string.error_twitter_187) TWITTER_ERROR_CODE_MESSAGES.put(193, R.string.error_twitter_193) TWITTER_ERROR_CODE_MESSAGES.put(215, R.string.error_twitter_215) TWITTER_ERROR_CODE_MESSAGES.put(326, R.string.error_twitter_326) @@ -104,8 +104,7 @@ object StatusCodeMessageUtils { } - private fun getErrorInfo(context: Context, statusCode: Int, - errors: Array?): DisplayErrorInfo? { + private fun getErrorInfo(context: Context, statusCode: Int, errors: Array?): DisplayErrorInfo? { var errorCode = -1 if (errors != null) for (error in errors) { 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 a676e633b..60f53e1cf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/UserColorNameManager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/UserColorNameManager.kt @@ -25,7 +25,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.graphics.Color import android.support.v4.util.ArrayMap import android.support.v4.util.LruCache -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.model.microblog.User import org.mariotaku.twidere.TwidereConstants.USER_COLOR_PREFERENCES_NAME import org.mariotaku.twidere.TwidereConstants.USER_NICKNAME_PREFERENCES_NAME import org.mariotaku.twidere.extension.model.api.key 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..2b62f56ee 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 @@ -23,11 +23,11 @@ import android.support.v4.util.SimpleArrayMap import com.bluelinelabs.logansquare.JsonMapper import com.bluelinelabs.logansquare.ParameterizedType import org.mariotaku.commons.logansquare.LoganSquareMapperFinder - import org.mariotaku.microblog.library.MicroBlogException -import org.mariotaku.microblog.library.mastodon.model.LinkHeaderList -import org.mariotaku.microblog.library.twitter.model.ResponseCode -import org.mariotaku.microblog.library.twitter.model.TwitterResponse +import org.mariotaku.microblog.library.model.mastodon.LinkHeaderList +import org.mariotaku.microblog.library.model.microblog.ResponseCode +import org.mariotaku.microblog.library.model.microblog.ResponseCode.ResponseConverter +import org.mariotaku.microblog.library.model.microblog.TwitterResponse import org.mariotaku.microblog.library.twitter.util.OAuthTokenResponseConverter import org.mariotaku.restfu.RestConverter import org.mariotaku.restfu.http.HttpResponse @@ -35,7 +35,6 @@ import org.mariotaku.restfu.http.mime.Body import org.mariotaku.restfu.http.mime.SimpleBody import org.mariotaku.restfu.logansqaure.LoganSquareConverterFactory import org.mariotaku.restfu.oauth.OAuthToken - import java.lang.reflect.Type /** @@ -49,7 +48,7 @@ object TwitterConverterFactory : LoganSquareConverterFactory private val bodyConverters = SimpleArrayMap>() init { - responseConverters.put(ResponseCode::class.java, ResponseCode.ResponseConverter()) + responseConverters.put(ResponseCode::class.java, ResponseConverter()) responseConverters.put(OAuthToken::class.java, OAuthTokenResponseConverter()) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/emoji/CustomEmojiTranslator.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/emoji/CustomEmojiTranslator.kt index fb4ab86b1..a0297c08d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/emoji/CustomEmojiTranslator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/emoji/CustomEmojiTranslator.kt @@ -17,7 +17,7 @@ package org.mariotaku.twidere.util.emoji import org.apache.commons.text.translate.CharSequenceTranslator -import org.mariotaku.microblog.library.mastodon.model.Emoji +import org.mariotaku.microblog.library.model.mastodon.Emoji import java.io.IOException import java.io.Writer import java.util.* 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 7690d175f..9f07cf18d 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 @@ -32,8 +32,8 @@ import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.forEachRow import org.mariotaku.ktextension.isEmpty import org.mariotaku.library.objectcursor.ObjectCursor -import org.mariotaku.microblog.library.twitter.model.Activity -import org.mariotaku.microblog.library.twitter.model.Status +import org.mariotaku.microblog.library.model.microblog.Activity.Action +import org.mariotaku.microblog.library.model.microblog.Status import org.mariotaku.sqliteqb.library.* import org.mariotaku.sqliteqb.library.Columns.Column import org.mariotaku.twidere.BuildConfig @@ -217,7 +217,7 @@ class ContentNotificationManager( newMaxPositionKey = activity.position_key } - if (pref.isNotificationMentionsOnly && activity.action !in Activity.Action.MENTION_ACTIONS) { + if (pref.isNotificationMentionsOnly && activity.action !in Action.MENTION_ACTIONS) { return@forEachRow false } if (ContentFiltersUtils.isFiltered(cr, activity, true, FilterScope.INTERACTIONS)) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/FanfouTimelineStreamCallback.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/FanfouTimelineStreamCallback.kt index 97ee74e9c..4f2405aae 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/FanfouTimelineStreamCallback.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/streaming/FanfouTimelineStreamCallback.kt @@ -19,11 +19,11 @@ package org.mariotaku.twidere.util.streaming -import org.mariotaku.microblog.library.fanfou.callback.SimpleFanfouUserStreamCallback -import org.mariotaku.microblog.library.twitter.model.Activity -import org.mariotaku.microblog.library.twitter.model.InternalActivityCreator -import org.mariotaku.microblog.library.twitter.model.Status -import org.mariotaku.microblog.library.twitter.model.User +import org.mariotaku.microblog.library.callback.fanfou.SimpleFanfouUserStreamCallback +import org.mariotaku.microblog.library.model.microblog.Activity +import org.mariotaku.microblog.library.model.microblog.InternalActivityCreator +import org.mariotaku.microblog.library.model.microblog.Status +import org.mariotaku.microblog.library.model.microblog.User import java.util.* /** 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 0b80d5b9d..38935afb5 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 @@ -20,8 +20,8 @@ package org.mariotaku.twidere.util.streaming import android.support.annotation.WorkerThread -import org.mariotaku.microblog.library.twitter.callback.SimpleUserStreamCallback -import org.mariotaku.microblog.library.twitter.model.* +import org.mariotaku.microblog.library.callback.twitter.SimpleUserStreamCallback +import org.mariotaku.microblog.library.model.microblog.* import java.util.* /** 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 72bda12b3..49e42c422 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 @@ -37,7 +37,7 @@ import org.mariotaku.ktextension.spannable import org.mariotaku.ktextension.toLongOr import org.mariotaku.ktextension.weak import org.mariotaku.microblog.library.TwitterCaps -import org.mariotaku.microblog.library.twitter.model.CardDataMap +import org.mariotaku.microblog.library.model.microblog.CardDataMap import org.mariotaku.twidere.R import org.mariotaku.twidere.extension.getDetailsOrThrow import org.mariotaku.twidere.extension.model.* @@ -92,10 +92,11 @@ class CardPollViewController : ContainerView.ViewController() { val vc = weakThis ?: throw IllegalStateException() val details = AccountManager.get(vc.context).getDetailsOrThrow(card.account_key, true) val caps = details.newMicroBlogInstance(vc.context, cls = TwitterCaps::class.java) - val params = CardDataMap() - params.putString("card_uri", card.url) - params.putString("cards_platform", MicroBlogAPIFactory.CARDS_PLATFORM_ANDROID_12) - params.putString("response_card_name", card.name) + val params = CardDataMap().apply { + putString("card_uri", card.url) + putString("cards_platform", MicroBlogAPIFactory.CARDS_PLATFORM_ANDROID_12) + putString("response_card_name", card.name) + } val cardResponse = caps.getPassThrough(params).card if (cardResponse == null || cardResponse.name == null) { throw IllegalStateException() 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 ad658aa71..bffdebcb5 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 @@ -41,7 +41,7 @@ import kotlinx.android.synthetic.main.adapter_item_status_count_label.view.* import kotlinx.android.synthetic.main.header_status.view.* import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.* -import org.mariotaku.microblog.library.twitter.model.TranslationResult +import org.mariotaku.microblog.library.model.microblog.TranslationResult import org.mariotaku.twidere.Constants.MENU_GROUP_STATUS_SHARE import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.BaseRecyclerViewAdapter diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/StatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/StatusViewHolder.kt index 2aad47c80..35efed2fa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/StatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/StatusViewHolder.kt @@ -39,7 +39,7 @@ import android.widget.TextView import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.list_item_status.view.* import org.mariotaku.ktextension.* -import org.mariotaku.microblog.library.mastodon.annotation.StatusVisibility +import org.mariotaku.microblog.library.annotation.mastodon.StatusVisibility import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.R import org.mariotaku.twidere.TwidereConstants.USER_TYPE_FANFOU_COM 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..1516b0537 100644 --- a/twidere/src/main/res/layout-sw600dp/activity_link_handler.xml +++ b/twidere/src/main/res/layout-sw600dp/activity_link_handler.xml @@ -34,6 +34,7 @@ android:layout_alignParentRight="true" android:layout_margin="@dimen/element_spacing_large" android:clickable="true" + android:focusable="true" android:src="@drawable/ic_action_status_compose" app:backgroundTint="?colorToolbar" app:elevation="6dp" diff --git a/twidere/src/main/res/layout/activity_link_handler.xml b/twidere/src/main/res/layout/activity_link_handler.xml index e1414f2fa..e0780dee9 100644 --- a/twidere/src/main/res/layout/activity_link_handler.xml +++ b/twidere/src/main/res/layout/activity_link_handler.xml @@ -22,6 +22,7 @@ android:layout_alignParentRight="true" android:layout_margin="@dimen/element_spacing_large" android:clickable="true" + android:focusable="true" android:src="@drawable/ic_action_status_compose" app:backgroundTint="?colorToolbar" app:elevation="6dp"