From 50c651194a82ec55049b814b088b9708f226a07e Mon Sep 17 00:00:00 2001 From: k0shk0sh Date: Wed, 25 Dec 2019 11:34:40 +0100 Subject: [PATCH] migrate to androidx --- app/build.gradle | 45 ++-- app/src/main/java/com/fastaccess/App.java | 4 +- .../main/java/com/fastaccess/GlideModule.kt | 8 + .../data/dao/CommitFileChanges.java | 4 +- .../fastaccess/data/dao/CommitLinesModel.java | 4 +- .../fastaccess/data/dao/EditRepoFileModel.kt | 35 +-- .../data/dao/FragmentPagerAdapterModel.java | 6 +- .../data/dao/GroupedNotificationModel.java | 2 +- .../data/dao/IssueEventAdapterModel.java | 2 +- .../data/dao/IssueRequestModel.java | 2 +- .../com/fastaccess/data/dao/NameParser.java | 2 +- .../data/dao/PullRequestAdapterModel.java | 2 +- .../data/dao/PullsIssuesParser.java | 2 +- .../fastaccess/data/dao/ReactionsModel.java | 2 +- .../fastaccess/data/dao/RepoPathsManager.java | 4 +- .../fastaccess/data/dao/SettingsModel.java | 2 +- .../data/dao/TabsCountStateModel.java | 2 +- .../fastaccess/data/dao/TimelineModel.java | 2 +- .../data/dao/model/AbstractComment.java | 2 +- .../data/dao/model/AbstractCommit.java | 2 +- .../data/dao/model/AbstractEvent.java | 4 +- .../model/AbstractFastHubNotification.java | 4 +- .../data/dao/model/AbstractGist.java | 2 +- .../data/dao/model/AbstractIssue.java | 2 +- .../data/dao/model/AbstractIssueEvent.java | 2 +- .../data/dao/model/AbstractLogin.java | 2 +- .../data/dao/model/AbstractNotification.java | 4 +- .../dao/model/AbstractNotificationQueue.java | 2 +- .../data/dao/model/AbstractPinnedGists.java | 4 +- .../data/dao/model/AbstractPinnedIssues.java | 4 +- .../dao/model/AbstractPinnedPullRequests.java | 4 +- .../data/dao/model/AbstractPinnedRepos.java | 4 +- .../data/dao/model/AbstractPullRequest.java | 2 +- .../data/dao/model/AbstractRelease.java | 2 +- .../data/dao/model/AbstractRepo.java | 2 +- .../data/dao/model/AbstractRepoFile.java | 2 +- .../data/dao/model/AbstractUser.java | 4 +- .../data/dao/model/AbstractViewerFile.java | 2 +- .../fastaccess/data/dao/types/EventsType.java | 4 +- .../fastaccess/data/dao/types/FilesType.java | 2 +- .../data/dao/types/IssueEventType.java | 4 +- .../fastaccess/data/dao/types/IssueState.java | 2 +- .../data/dao/types/ReactionTypes.java | 4 +- .../data/dao/types/ReviewStateType.java | 8 +- .../data/dao/types/StatusStateType.java | 6 +- .../data/dao/wiki/WikiContentModel.kt | 12 +- .../fastaccess/data/service/GistService.java | 2 +- .../fastaccess/data/service/ImgurService.java | 2 +- .../fastaccess/data/service/IssueService.java | 2 +- .../data/service/LoginRestService.java | 2 +- .../data/service/NotificationService.java | 4 +- .../data/service/OrganizationService.java | 2 +- .../data/service/PullRequestService.java | 2 +- .../data/service/ReactionsService.java | 2 +- .../fastaccess/data/service/RepoService.java | 2 +- .../data/service/ReviewService.java | 2 +- .../data/service/UserRestService.java | 2 +- .../com/fastaccess/helper/ActivityHelper.java | 18 +- .../com/fastaccess/helper/AnimHelper.java | 16 +- .../java/com/fastaccess/helper/AppHelper.java | 8 +- .../com/fastaccess/helper/BundleConstant.java | 2 +- .../java/com/fastaccess/helper/Bundler.java | 2 +- .../com/fastaccess/helper/FileHelper.java | 4 +- .../com/fastaccess/helper/InputHelper.java | 6 +- .../java/com/fastaccess/helper/Logger.java | 4 +- .../com/fastaccess/helper/ObjectsCompat.java | 2 +- .../fastaccess/helper/ParseDateFormat.java | 4 +- .../com/fastaccess/helper/PrefGetter.java | 6 +- .../com/fastaccess/helper/PrefHelper.java | 4 +- .../java/com/fastaccess/helper/RxHelper.java | 2 +- .../com/fastaccess/helper/ViewHelper.java | 8 +- .../provider/colors/ColorsProvider.java | 6 +- .../provider/fabric/FabricProvider.kt | 18 +- .../provider/fcm/PushNotificationService.java | 2 +- .../provider/gson/ToGsonProvider.java | 2 +- .../provider/markdown/MarkDownProvider.java | 4 +- .../provider/rest/ImgurProvider.java | 2 +- .../provider/rest/LoginProvider.java | 4 +- .../provider/rest/RepoQueryProvider.java | 2 +- .../provider/rest/RestProvider.java | 4 +- .../converters/GithubResponseConverter.java | 2 +- .../interceptors/AuthenticationInterceptor.kt | 2 +- .../interceptors/ContentTypeInterceptor.kt | 2 +- .../interceptors/PaginationInterceptor.java | 2 +- .../provider/rest/jsoup/JsoupProvider.java | 2 +- .../provider/rest/loadmore/OnLoadMore.java | 2 +- .../provider/scheme/LinkParserHelper.java | 4 +- .../provider/scheme/SchemeParser.java | 4 +- .../tasks/git/GithubActionService.java | 8 +- .../provider/tasks/git/ReactionService.java | 6 +- .../NotificationSchedulerJobTask.java | 8 +- .../notification/ReadNotificationService.java | 6 +- .../tasks/slack/SlackInvitationService.java | 2 +- .../fastaccess/provider/theme/ThemeEngine.kt | 2 +- .../provider/timeline/CommentsHelper.java | 4 +- .../provider/timeline/HtmlHelper.java | 6 +- .../provider/timeline/ReactionsProvider.java | 8 +- .../provider/timeline/TimelineProvider.java | 4 +- .../provider/timeline/handler/HrSpan.java | 2 +- .../timeline/handler/ListsHandler.java | 2 +- .../timeline/handler/PreTagHandler.java | 2 +- .../timeline/handler/QuoteHandler.java | 2 +- .../timeline/handler/TableHandler.java | 2 +- .../handler/drawable/DrawableGetter.java | 16 +- .../handler/drawable/GlideDrawableTarget.java | 18 +- .../handler/drawable/UrlDrawable.java | 2 +- .../ui/adapter/AssigneesAdapter.java | 4 +- .../ui/adapter/BranchesAdapter.java | 6 +- .../ui/adapter/CommentsAdapter.java | 2 +- .../ui/adapter/CommitFilesAdapter.java | 4 +- .../ui/adapter/CommitLinesAdapter.java | 4 +- .../fastaccess/ui/adapter/CommitsAdapter.java | 2 +- .../fastaccess/ui/adapter/FeedsAdapter.java | 2 +- .../ui/adapter/FragmentsPagerAdapter.java | 6 +- .../ui/adapter/GistFilesAdapter.java | 4 +- .../fastaccess/ui/adapter/GistsAdapter.java | 2 +- .../fastaccess/ui/adapter/IssuesAdapter.java | 2 +- .../ui/adapter/IssuesTimelineAdapter.java | 4 +- .../ui/adapter/LabelColorsAdapter.java | 4 +- .../fastaccess/ui/adapter/LabelsAdapter.java | 4 +- .../ui/adapter/MilestonesAdapter.java | 2 +- .../ui/adapter/NotificationsAdapter.java | 4 +- .../ui/adapter/PinnedReposAdapter.java | 4 +- .../ui/adapter/PullRequestAdapter.java | 2 +- .../ui/adapter/ReleasesAdapter.java | 2 +- .../ui/adapter/RepoFilePathsAdapter.java | 2 +- .../ui/adapter/RepoFilesAdapter.java | 2 +- .../fastaccess/ui/adapter/ReposAdapter.java | 2 +- .../ui/adapter/ReviewCommentsAdapter.java | 4 +- .../ui/adapter/SearchCodeAdapter.java | 2 +- .../ui/adapter/SettingsAdapter.java | 2 +- .../ui/adapter/SimpleListAdapter.java | 4 +- .../fastaccess/ui/adapter/SpinnerAdapter.java | 2 +- .../fastaccess/ui/adapter/TeamsAdapter.java | 2 +- .../fastaccess/ui/adapter/TopicsAdapter.java | 4 +- .../fastaccess/ui/adapter/UsersAdapter.java | 2 +- .../viewholder/AssigneesViewHolder.java | 4 +- .../viewholder/CommentsViewHolder.java | 6 +- .../viewholder/CommitCommentsViewHolder.kt | 4 +- .../viewholder/CommitLinesViewHolder.java | 8 +- .../adapter/viewholder/CommitsViewHolder.java | 4 +- .../adapter/viewholder/FeedsViewHolder.java | 4 +- .../viewholder/GistFilesViewHolder.java | 2 +- .../adapter/viewholder/GistsViewHolder.java | 4 +- .../viewholder/GroupedReviewsViewHolder.java | 4 +- .../viewholder/IssueDetailsViewHolder.java | 8 +- .../viewholder/IssueTimelineViewHolder.java | 4 +- .../adapter/viewholder/IssuesViewHolder.java | 6 +- .../viewholder/LabelColorsViewHolder.java | 4 +- .../adapter/viewholder/LabelsViewHolder.java | 6 +- .../viewholder/MilestonesViewHolder.java | 4 +- .../NotificationsHeaderViewHolder.java | 6 +- .../viewholder/NotificationsViewHolder.java | 8 +- .../viewholder/PinnedReposViewHolder.java | 4 +- .../viewholder/ProfileOrgsViewHolder.java | 2 +- .../PullRequestFilesViewHolder.java | 4 +- .../viewholder/PullRequestViewHolder.java | 4 +- .../viewholder/PullStatusViewHolder.java | 4 +- .../viewholder/ReleasesViewHolder.java | 4 +- .../viewholder/RepoFilePathsViewHolder.java | 2 +- .../viewholder/RepoFilesViewHolder.java | 2 +- .../adapter/viewholder/ReposViewHolder.java | 4 +- .../viewholder/ReviewCommentsViewHolder.java | 10 +- .../viewholder/SearchCodeViewHolder.java | 4 +- .../adapter/viewholder/SimpleViewHolder.java | 4 +- .../adapter/viewholder/TeamsViewHolder.java | 4 +- .../TimelineCommentsViewHolder.java | 8 +- .../adapter/viewholder/UsersViewHolder.java | 4 +- .../com/fastaccess/ui/base/BaseActivity.java | 24 +- .../ui/base/BaseBottomSheetDialog.java | 12 +- .../ui/base/BaseDialogFragment.java | 10 +- .../com/fastaccess/ui/base/BaseFragment.java | 10 +- .../BaseMvpBottomSheetDialogFragment.java | 12 +- .../com/fastaccess/ui/base/MainNavDrawer.kt | 4 +- .../com/fastaccess/ui/base/mvp/BaseMvp.java | 6 +- .../ui/base/mvp/presenter/BasePresenter.java | 7 +- .../modules/about/FastHubAboutActivity.java | 6 +- .../changelog/ChangelogBottomSheetDialog.java | 4 +- .../ui/modules/changelog/ChangelogMvp.java | 2 +- .../ui/modules/code/CodeViewerActivity.java | 4 +- .../ui/modules/editor/EditorActivity.kt | 73 +++--- .../editor/comment/CommentEditorFragment.kt | 6 +- .../popup/EditorLinkImageDialogFragment.java | 6 +- .../editor/popup/EditorLinkImageMvp.java | 4 +- .../popup/EditorLinkImagePresenter.java | 4 +- .../ui/modules/feeds/FeedsFragment.java | 8 +- .../fastaccess/ui/modules/feeds/FeedsMvp.java | 6 +- .../ui/modules/feeds/FeedsPresenter.java | 4 +- .../filter/issues/FilterIssuesActivity.java | 2 +- .../issues/FilterIssuesActivityMvp.java | 2 +- .../issues/FilterIssuesActivityPresenter.java | 2 +- .../issues/fragment/FilterIssueFragment.java | 8 +- .../issues/fragment/FilterIssuePresenter.java | 4 +- .../issues/fragment/FilterIssuesMvp.java | 6 +- .../ui/modules/gists/GistsFragment.java | 8 +- .../ui/modules/gists/GistsListActivity.java | 8 +- .../fastaccess/ui/modules/gists/GistsMvp.java | 6 +- .../ui/modules/gists/GistsPresenter.java | 4 +- .../gists/create/CreateGistActivity.java | 8 +- .../modules/gists/create/CreateGistMvp.java | 2 +- .../gists/create/CreateGistPresenter.java | 2 +- .../create/dialog/AddGistBottomSheetDialog.kt | 6 +- .../ui/modules/gists/gist/GistActivity.java | 14 +- .../ui/modules/gists/gist/GistMvp.java | 4 +- .../ui/modules/gists/gist/GistPresenter.java | 4 +- .../gist/comments/GistCommentsFragment.java | 8 +- .../gists/gist/comments/GistCommentsMvp.java | 6 +- .../gist/comments/GistCommentsPresenter.java | 4 +- .../gist/files/GistFilesListFragment.java | 6 +- .../gists/gist/files/GistFilesListMvp.java | 4 +- .../gist/files/GistFilesListPresenter.java | 4 +- .../gists/starred/StarredGistsFragment.java | 8 +- .../gists/starred/StarredGistsMvp.java | 6 +- .../gists/starred/StarredGistsPresenter.java | 4 +- .../ui/modules/login/LoginActivity.java | 12 +- .../fastaccess/ui/modules/login/LoginMvp.java | 4 +- .../ui/modules/login/LoginPresenter.java | 4 +- .../login/chooser/LoginChooserActivity.kt | 4 +- .../ui/modules/main/MainActivity.java | 10 +- .../fastaccess/ui/modules/main/MainMvp.java | 10 +- .../ui/modules/main/MainPresenter.java | 12 +- .../modules/main/donation/DonateActivity.kt | 79 +++--- .../main/donation/DonationActivity.java | 4 +- .../modules/main/drawer/MainDrawerFragment.kt | 2 +- .../modules/main/issues/MyIssuesFragment.java | 8 +- .../ui/modules/main/issues/MyIssuesMvp.java | 6 +- .../main/issues/MyIssuesPresenter.java | 4 +- .../issues/pager/MyIssuesPagerFragment.java | 8 +- .../FastHubNotificationDialog.kt | 2 +- .../main/orgs/OrgListDialogFragment.java | 10 +- .../modules/main/orgs/OrgListDialogMvp.java | 4 +- .../main/orgs/OrgListDialogPresenter.java | 2 +- .../main/premium/GmsTaskListeners.java | 2 +- .../modules/main/premium/PremiumActivity.kt | 2 +- .../pullrequests/MyPullRequestFragment.java | 8 +- .../main/pullrequests/MyPullRequestsMvp.java | 6 +- .../pullrequests/MyPullRequestsPresenter.java | 4 +- .../pager/MyPullsPagerFragment.java | 8 +- .../notification/NotificationActivity.java | 8 +- .../all/AllNotificationsFragment.java | 6 +- .../notification/all/AllNotificationsMvp.java | 6 +- .../all/AllNotificationsPresenter.java | 2 +- .../OnNotificationChangedListener.java | 2 +- .../unread/UnreadNotificationMvp.java | 6 +- .../unread/UnreadNotificationsFragment.java | 6 +- .../unread/UnreadNotificationsPresenter.java | 2 +- .../modules/parser/LinksParserActivity.java | 4 +- .../modules/pinned/PinnedReposActivity.java | 6 +- .../pinned/gist/PinnedGistFragment.java | 4 +- .../ui/modules/pinned/gist/PinnedGistMvp.java | 4 +- .../pinned/gist/PinnedGistPresenter.java | 2 +- .../pinned/issue/PinnedIssueFragment.java | 4 +- .../modules/pinned/issue/PinnedIssueMvp.java | 4 +- .../pinned/issue/PinnedIssuePresenter.java | 2 +- .../PinnedPullRequestFragment.java | 4 +- .../pullrequest/PinnedPullRequestMvp.java | 4 +- .../PinnedPullRequestPresenter.java | 2 +- .../pinned/repo/PinnedReposFragment.java | 4 +- .../modules/pinned/repo/PinnedReposMvp.java | 4 +- .../pinned/repo/PinnedReposPresenter.java | 2 +- .../modules/profile/ProfilePagerFragment.java | 7 +- .../followers/ProfileFollowersFragment.java | 8 +- .../followers/ProfileFollowersMvp.java | 6 +- .../followers/ProfileFollowersPresenter.java | 4 +- .../following/ProfileFollowingFragment.java | 8 +- .../following/ProfileFollowingMvp.java | 6 +- .../following/ProfileFollowingPresenter.java | 4 +- .../profile/gists/ProfileGistsFragment.java | 8 +- .../profile/gists/ProfileGistsMvp.java | 6 +- .../profile/gists/ProfileGistsPresenter.java | 4 +- .../org/OrgProfileOverviewFragment.java | 8 +- .../profile/org/OrgProfileOverviewMvp.java | 4 +- .../org/OrgProfileOverviewPresenter.java | 4 +- .../org/members/OrgMembersFragment.java | 8 +- .../profile/org/members/OrgMembersMvp.java | 6 +- .../org/members/OrgMembersPresenter.java | 4 +- .../profile/org/project/OrgProjectActivity.kt | 18 +- .../profile/org/repos/OrgReposFragment.java | 8 +- .../profile/org/repos/OrgReposMvp.java | 6 +- .../profile/org/repos/OrgReposPresenter.java | 4 +- .../profile/org/teams/OrgTeamFragment.java | 8 +- .../modules/profile/org/teams/OrgTeamMvp.java | 6 +- .../profile/org/teams/OrgTeamPresenter.java | 4 +- .../org/teams/details/TeamPagerActivity.java | 8 +- .../details/members/TeamMembersFragment.java | 8 +- .../teams/details/members/TeamMembersMvp.java | 6 +- .../details/members/TeamMembersPresenter.java | 4 +- .../details/repos/TeamReposFragment.java | 8 +- .../org/teams/details/repos/TeamReposMvp.java | 6 +- .../details/repos/TeamReposPresenter.java | 4 +- .../overview/ProfileOverviewFragment.java | 16 +- .../profile/overview/ProfileOverviewMvp.java | 4 +- .../overview/ProfileOverviewPresenter.java | 4 +- .../ProfileReposFilterBottomSheetDialog.java | 4 +- .../profile/repos/ProfileReposFragment.java | 8 +- .../profile/repos/ProfileReposMvp.java | 6 +- .../profile/repos/ProfileReposPresenter.java | 4 +- .../starred/ProfileStarredFragment.java | 8 +- .../profile/starred/ProfileStarredMvp.java | 6 +- .../starred/ProfileStarredPresenter.java | 4 +- .../ui/modules/repos/DummyFragment.java | 4 +- .../ui/modules/repos/RepoPagerActivity.java | 12 +- .../ui/modules/repos/RepoPagerMvp.java | 10 +- .../ui/modules/repos/RepoPagerPresenter.java | 10 +- .../repos/code/RepoCodePagerFragment.java | 8 +- .../code/commit/RepoCommitsFragment.java | 8 +- .../repos/code/commit/RepoCommitsMvp.java | 6 +- .../code/commit/RepoCommitsPresenter.java | 4 +- .../commit/details/CommitPagerActivity.java | 12 +- .../code/commit/details/CommitPagerMvp.java | 4 +- .../commit/details/CommitPagerPresenter.java | 4 +- .../comments/CommitCommentsFragment.java | 8 +- .../details/comments/CommitCommentsMvp.java | 6 +- .../comments/CommitCommentsPresenter.java | 4 +- .../details/files/CommitFilesFragment.java | 4 +- .../commit/details/files/CommitFilesMvp.java | 4 +- .../details/files/CommitFilesPresenter.java | 4 +- .../details/files/CommitFilesSingleton.java | 4 +- .../history/FileCommitHistoryActivity.kt | 40 +-- .../commit/viewer/FullCommitFileActivity.java | 2 +- .../RepoContributorsFragment.java | 8 +- .../contributors/RepoContributorsMvp.java | 6 +- .../RepoContributorsPresenter.java | 4 +- .../repos/code/files/RepoFilesFragment.java | 6 +- .../repos/code/files/RepoFilesMvp.java | 6 +- .../repos/code/files/RepoFilesPresenter.java | 6 +- .../files/activity/RepoFilesActivity.java | 4 +- .../files/paths/RepoFilePathFragment.java | 8 +- .../code/files/paths/RepoFilePathMvp.java | 4 +- .../files/paths/RepoFilePathPresenter.java | 4 +- .../repos/code/prettifier/ViewerFragment.java | 8 +- .../repos/code/prettifier/ViewerMvp.java | 6 +- .../code/prettifier/ViewerPresenter.java | 4 +- .../code/releases/ReleasesListActivity.java | 4 +- .../code/releases/RepoReleasesFragment.java | 8 +- .../repos/code/releases/RepoReleasesMvp.java | 6 +- .../code/releases/RepoReleasesPresenter.java | 4 +- .../assignees/AssigneesDialogFragment.java | 8 +- .../repos/extras/assignees/AssigneesMvp.java | 4 +- .../extras/assignees/AssigneesPresenter.java | 2 +- .../repos/extras/branches/BranchesFragment.kt | 2 +- .../branches/pager/BranchesPagerFragment.kt | 21 +- .../extras/labels/LabelsDialogFragment.java | 8 +- .../repos/extras/labels/LabelsMvp.java | 4 +- .../repos/extras/labels/LabelsPresenter.java | 4 +- .../create/CreateLabelDialogFragment.java | 8 +- .../extras/labels/create/CreateLabelMvp.java | 2 +- .../labels/create/CreateLabelPresenter.java | 2 +- .../extras/license/RepoLicenseBottomSheet.kt | 25 +- .../locking/LockIssuePrBottomSheetDialog.kt | 2 +- .../milestone/MilestoneDialogFragment.java | 10 +- .../repos/extras/milestone/MilestoneMvp.java | 4 +- .../extras/milestone/MilestonePresenter.java | 2 +- .../create/CreateMilestoneDialogFragment.java | 10 +- .../milestone/create/CreateMilestoneMvp.java | 4 +- .../create/CreateMilestonePresenter.java | 4 +- .../create/MilestoneDialogFragment.java | 4 +- .../extras/misc/RepoMiscDialogFragment.java | 12 +- .../repos/extras/misc/RepoMiscMVp.java | 6 +- .../repos/extras/misc/RepoMiscPresenter.java | 4 +- .../extras/popup/IssuePopupFragment.java | 12 +- .../repos/extras/popup/IssuePopupMvp.java | 2 +- .../extras/popup/IssuePopupPresenter.java | 2 +- .../modules/repos/git/EditRepoFileActivity.kt | 6 +- .../delete/DeleteFileBottomSheetFragment.kt | 4 +- .../repos/issues/RepoIssuesPagerFragment.java | 8 +- .../repos/issues/RepoIssuesPagerMvp.java | 2 +- .../issues/create/CreateIssueActivity.java | 12 +- .../repos/issues/create/CreateIssueMvp.java | 4 +- .../issues/create/CreateIssuePresenter.java | 4 +- .../issue/RepoClosedIssuesFragment.java | 8 +- .../repos/issues/issue/RepoIssuesMvp.java | 6 +- .../issues/issue/RepoIssuesPresenter.java | 4 +- .../issue/RepoOpenedIssuesFragment.java | 8 +- .../issue/details/IssuePagerActivity.java | 12 +- .../issues/issue/details/IssuePagerMvp.java | 4 +- .../issue/details/IssuePagerPresenter.java | 4 +- .../timeline/IssueTimelineFragment.java | 6 +- .../details/timeline/IssueTimelineMvp.java | 8 +- .../timeline/IssueTimelinePresenter.java | 4 +- .../projects/RepoProjectsFragmentPager.kt | 36 +-- .../projects/columns/ProjectColumnFragment.kt | 81 +++--- .../crud/ProjectCurdDialogFragment.kt | 6 +- .../projects/details/ProjectPagerActivity.kt | 2 +- .../projects/details/ProjectPagerPresenter.kt | 54 ++-- .../projects/list/RepoProjectFragment.kt | 6 +- .../projects/list/RepoProjectPresenter.kt | 240 +++++++++--------- .../RepoPullRequestPagerFragment.java | 8 +- .../RepoPullRequestPagerMvp.java | 2 +- .../pull_request/RepoPullRequestFragment.java | 8 +- .../pull_request/RepoPullRequestMvp.java | 6 +- .../RepoPullRequestPresenter.java | 4 +- .../details/PullRequestPagerActivity.java | 16 +- .../details/PullRequestPagerMvp.java | 4 +- .../details/PullRequestPagerPresenter.java | 4 +- .../commits/PullRequestCommitsFragment.java | 8 +- .../commits/PullRequestCommitsMvp.java | 6 +- .../commits/PullRequestCommitsPresenter.java | 4 +- .../files/PullRequestFilesFragment.java | 8 +- .../details/files/PullRequestFilesMvp.java | 6 +- .../files/PullRequestFilesPresenter.java | 4 +- .../FullScreenFileChangeActivity.kt | 4 +- .../timeline/PullRequestTimelineFragment.java | 6 +- .../timeline/PullRequestTimelineMvp.java | 8 +- .../PullRequestTimelinePresenter.java | 4 +- .../merge/MergePullReqeustMvp.java | 2 +- .../merge/MergePullRequestDialogFragment.java | 8 +- .../reactions/ReactionsDialogFragment.java | 10 +- .../repos/reactions/ReactionsDialogMvp.java | 4 +- .../reactions/ReactionsDialogPresenter.java | 4 +- .../ui/modules/repos/wiki/WikiActivity.kt | 4 +- .../reviews/AddReviewDialogFragment.kt | 78 +++--- .../reviews/changes/ReviewChangesActivity.kt | 6 +- .../ui/modules/search/SearchActivity.java | 10 +- .../ui/modules/search/SearchMvp.java | 8 +- .../ui/modules/search/SearchPresenter.java | 4 +- .../ui/modules/search/SearchUserActivity.kt | 8 +- .../search/code/SearchCodeFragment.java | 8 +- .../ui/modules/search/code/SearchCodeMvp.java | 6 +- .../search/code/SearchCodePresenter.java | 4 +- .../search/issues/SearchIssuesFragment.java | 8 +- .../search/issues/SearchIssuesMvp.java | 6 +- .../search/issues/SearchIssuesPresenter.java | 4 +- .../search/repos/SearchReposFragment.java | 8 +- .../modules/search/repos/SearchReposMvp.java | 6 +- .../search/repos/SearchReposPresenter.java | 4 +- .../repos/files/SearchFileActivity.java | 6 +- .../search/repos/files/SearchFileMvp.java | 2 +- .../repos/files/SearchFilePresenter.java | 2 +- .../search/users/SearchUsersFragment.java | 8 +- .../modules/search/users/SearchUsersMvp.java | 6 +- .../search/users/SearchUsersPresenter.java | 4 +- .../settings/LanguageBottomSheetDialog.java | 4 +- .../ui/modules/settings/SettingsActivity.java | 2 +- .../settings/SlackBottomSheetDialog.java | 4 +- .../category/SettingsCategoryActivity.java | 2 +- .../category/SettingsCategoryFragment.java | 8 +- .../sound/NotificationSoundBottomSheet.kt | 14 +- .../modules/theme/fragment/ThemeFragment.kt | 6 +- .../theme/fragment/ThemeFragmentMvp.kt | 2 +- .../ui/modules/trending/TrendingActivity.kt | 6 +- .../ui/modules/trending/TrendingMvp.kt | 2 +- .../trending/fragment/TrendingFragment.kt | 2 +- .../ui/modules/user/UserPagerActivity.java | 10 +- .../ui/modules/user/UserPagerMvp.java | 2 +- .../ui/modules/user/UserPagerPresenter.java | 2 +- .../ui/widgets/AppbarRefreshLayout.java | 4 +- .../ui/widgets/AutoLinearLayout.java | 2 +- .../fastaccess/ui/widgets/AvatarLayout.java | 18 +- .../ui/widgets/CardsPagerTransformerBasic.kt | 2 +- .../ui/widgets/ColorPickerPreference.java | 4 +- .../fastaccess/ui/widgets/DiffLineSpan.java | 8 +- .../widgets/FloatingActionButtonBehavior.java | 8 +- .../ui/widgets/FontAutoCompleteEditText.java | 4 +- .../com/fastaccess/ui/widgets/FontButton.java | 4 +- .../fastaccess/ui/widgets/FontCheckbox.java | 4 +- .../fastaccess/ui/widgets/FontEditText.java | 4 +- .../ui/widgets/FontRadioButton.java | 4 +- .../fastaccess/ui/widgets/FontSwitchView.java | 4 +- .../fastaccess/ui/widgets/FontTextView.java | 12 +- .../ui/widgets/ForegroundImageView.java | 8 +- .../ui/widgets/ForegroundRelativeLayout.java | 2 +- .../com/fastaccess/ui/widgets/LabelSpan.java | 6 +- .../ui/widgets/NestedCoordinatorLayout.java | 8 +- .../ui/widgets/SpannableBuilder.java | 2 +- .../fastaccess/ui/widgets/StateLayout.java | 6 +- .../fastaccess/ui/widgets/TabletBehavior.java | 6 +- .../fastaccess/ui/widgets/ViewPagerView.java | 8 +- .../ui/widgets/color/ColorGenerator.java | 6 +- .../contributions/ContributionsProvider.java | 4 +- .../ui/widgets/dialog/ListDialogView.java | 4 +- .../ui/widgets/dialog/MessageDialogView.java | 4 +- .../dialog/ProgressDialogFragment.java | 6 +- .../ui/widgets/markdown/MarkDownLayout.kt | 6 +- .../ui/widgets/markdown/MarkdownEditText.kt | 26 +- .../recyclerview/BaseRecyclerAdapter.java | 10 +- .../widgets/recyclerview/BaseViewHolder.java | 8 +- .../recyclerview/BottomPaddingDecoration.java | 10 +- .../recyclerview/DynamicRecyclerView.java | 12 +- .../recyclerview/InsetDividerDecoration.java | 8 +- .../recyclerview/ProgressBarViewHolder.java | 2 +- .../layout_manager/GridManager.java | 4 +- .../layout_manager/LinearManager.java | 4 +- .../layout_manager/StaggeredManager.java | 4 +- .../recyclerview/scroll/InfiniteScroll.java | 8 +- .../scroll/RecyclerViewFastScroller.java | 12 +- .../com/prettifier/pretty/NestedWebView.java | 10 +- .../prettifier/pretty/PrettifyWebView.java | 4 +- .../pretty/helper/CodeThemesHelper.java | 2 +- .../pretty/helper/GithubHelper.java | 4 +- .../pretty/helper/PrettifyHelper.java | 2 +- .../main_layouts/layout-land/bottom_fab.xml | 4 +- .../layout-land/header_title_with_toolbar.xml | 8 +- .../layout-land/repo_file_header_layout.xml | 2 +- .../layout-sw600dp/bottom_fab.xml | 2 +- .../header_title_with_toolbar.xml | 8 +- .../repo_file_header_layout.xml | 2 +- .../layout/accounts_menu_layout.xml | 16 +- .../layout/activity_fragment_layout.xml | 8 +- .../layout/activity_main_view.xml | 8 +- .../layout/activity_search_file.xml | 14 +- .../layout/activity_search_user.xml | 8 +- .../layout/add_gist_file_layout.xml | 10 +- .../layout/add_review_dialog_layout.xml | 2 +- .../main_layouts/layout/bottom_fab.xml | 2 +- .../layout/centered_tabbed_viewpager.xml | 2 +- .../layout/commit_file_full_layout.xml | 8 +- .../layout/commit_pager_activity.xml | 24 +- .../layout/create_gist_layout.xml | 14 +- .../layout/create_issue_layout.xml | 28 +- .../layout/create_label_layout.xml | 16 +- .../layout/create_milestone_layout.xml | 26 +- .../layout/delete_repo_file_layout.xml | 20 +- .../edit_project_column_note_layout.xml | 4 +- .../layout/edit_repo_file_layout.xml | 28 +- .../layout/emoji_popup_layout.xml | 8 +- .../layout/filter_bottom_sheet.xml | 16 +- .../layout/filter_issues_prs_layout.xml | 16 +- .../full_screen_file_changes_layout.xml | 10 +- .../layout/general_viewer_layout.xml | 4 +- .../layout/gists_activity_layout.xml | 18 +- .../layout/gists_pager_layout.xml | 20 +- .../layout/header_title_with_toolbar.xml | 8 +- .../layout/issue_pager_activity.xml | 20 +- .../layout/issue_popup_layout.xml | 22 +- .../layout/login_chooser_layout.xml | 16 +- .../main_layouts/layout/login_form_layout.xml | 38 +-- .../layout/main_nav_fragment_layout.xml | 2 +- .../markdown_link_image_dialog_layout.xml | 12 +- .../layout/merge_dialog_layout.xml | 8 +- .../layout/notification_activity_layout.xml | 16 +- .../notifications_bottom_sheet_layout.xml | 4 +- .../main_layouts/layout/picker_dialog.xml | 4 +- .../layout/pro_features_layout.xml | 8 +- .../layout/project_columns_layout.xml | 12 +- .../layout/projects_activity_layout.xml | 4 +- .../layout/repo_file_header_layout.xml | 2 +- .../layout/repo_pager_activity.xml | 12 +- .../layout/review_changes_bottom_layout.xml | 4 +- .../layout/review_comment_dialog_layout.xml | 4 +- .../main_layouts/layout/search_layout.xml | 14 +- .../layout/support_development_layout.xml | 34 +-- .../layout/tabbed_pager_layout.xml | 10 +- .../main_layouts/layout/tabbed_viewpager.xml | 2 +- .../main_layouts/layout/theme_code_layout.xml | 16 +- .../main_layouts/layout/theme_layout.xml | 40 +-- .../layout/toolbar_activity_layout.xml | 10 +- .../layout/trending_activity_layout.xml | 14 +- .../layout/view_pager_activity_layout.xml | 6 +- .../layout/wiki_activity_layout.xml | 10 +- .../layout-land/appbar_start_margin.xml | 6 +- .../layout-sw600dp/appbar_start_margin.xml | 6 +- .../layout/appbar_elevation_dark.xml | 6 +- .../layout/appbar_start_margin.xml | 6 +- .../layout/appbar_tabbed_elevation.xml | 8 +- .../layout/dialog_guide_layout.xml | 8 +- .../layout/lock_issue_pr_dialog.xml | 6 +- .../other_layouts/layout/message_dialog.xml | 4 +- .../other_layouts/layout/nav_menu_layout.xml | 6 +- .../layout/simple_footer_list_dialog.xml | 8 +- .../row_layouts/layout/branches_row_item.xml | 2 +- .../layout/column_card_row_layout.xml | 4 +- .../layout/commit_file_row_item.xml | 4 +- .../layout/commit_line_row_item.xml | 6 +- .../layout/fasthub_notification_row_item.xml | 4 +- .../layout/gist_files_row_item.xml | 4 +- .../grouped_review_timeline_row_item.xml | 4 +- .../layout/issue_no_image_row_item.xml | 2 +- .../row_layouts/layout/issue_row_item.xml | 2 +- .../row_layouts/layout/label_row_item.xml | 2 +- .../layout/no_emojies_comments_row_item.xml | 2 +- .../layout/notification_header_row_item.xml | 2 +- .../layout/notifications_row_item.xml | 4 +- .../layout/org_profile_overview_layout.xml | 8 +- .../layout/profile_overview_layout.xml | 20 +- .../layout/pullrequest_file_row_item.xml | 4 +- .../row_layouts/layout/trending_row_item.xml | 4 +- build.gradle | 10 +- 578 files changed, 2120 insertions(+), 2039 deletions(-) create mode 100644 app/src/main/java/com/fastaccess/GlideModule.kt diff --git a/app/build.gradle b/app/build.gradle index a86ec646..33098de6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,13 +24,13 @@ android { storePassword((buildProperties.secrets['android_store_password'] | buildProperties.notThere['android_store_password']).string) } } - compileSdkVersion 27 + compileSdkVersion 29 defaultConfig { applicationId "com.fastaccess.github" minSdkVersion 21 - targetSdkVersion 27 - versionCode 467 - versionName "4.6.7" + targetSdkVersion 29 + versionCode 468 + versionName "4.6.8" buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string buildConfigString "IMGUR_CLIENT_ID", (buildProperties.secrets['imgur_client_id'] | buildProperties.notThere['imgur_client_id']).string @@ -38,7 +38,7 @@ android { buildConfigField "String", "REST_URL", '"https://api.github.com/"' buildConfigField "String", "IMGUR_URL", '"https://api.imgur.com/3/"' multiDexEnabled true - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { annotationProcessorOptions { includeCompileClasspath true @@ -89,7 +89,7 @@ android { } configurations { - all*.exclude module: 'annotation' + all*.exclude module: 'javax.annotation' all*.exclude group: 'org.jetbrains', module: 'annotations-java5' } @@ -118,13 +118,15 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation "com.android.support:appcompat-v7:${supportVersion}" - implementation "com.android.support:design:${supportVersion}" - implementation "com.android.support:cardview-v7:${supportVersion}" - implementation "com.android.support:recyclerview-v7:${supportVersion}" - implementation "com.android.support:preference-v14:${supportVersion}" - implementation "com.android.support:customtabs:${supportVersion}" - implementation "com.android.support:palette-v7:${supportVersion}" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.legacy:legacy-preference-v14:1.0.0' + implementation 'androidx.browser:browser:1.2.0' + implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.core:core:1.1.0' implementation "net.grandcentrix.thirtyinch:thirtyinch:${thirtyinchVersion}" implementation "net.grandcentrix.thirtyinch:thirtyinch-rx2:${thirtyinchVersion}" implementation "com.squareup.retrofit2:retrofit:${retrofit}" @@ -135,9 +137,9 @@ dependencies { implementation 'cn.gavinliu:ShapedImageView:0.8.7' implementation "com.jakewharton:butterknife:${butterKnifeVersion}" implementation 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.2' - implementation 'io.reactivex.rxjava2:rxjava:2.1.10' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' - implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' + implementation 'io.reactivex.rxjava2:rxjava:2.2.15' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.2.1' implementation 'com.annimon:stream:1.1.9' implementation 'com.github.GrenderG:Toasty:1.1.3' implementation 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2' @@ -154,10 +156,10 @@ dependencies { implementation "com.atlassian.commonmark:commonmark-ext-gfm-tables:${commonmark}" implementation "com.atlassian.commonmark:commonmark-ext-ins:${commonmark}" implementation "com.atlassian.commonmark:commonmark-ext-yaml-front-matter:${commonmark}" - implementation "com.google.firebase:firebase-core:${gms}" - implementation "com.google.firebase:firebase-messaging:${gms}" - implementation "com.google.firebase:firebase-database:${gms}" - implementation "com.google.android.gms:play-services-base:${gms}" + implementation "com.google.firebase:firebase-core:17.2.1" + implementation "com.google.firebase:firebase-messaging:20.1.0" + implementation "com.google.firebase:firebase-database:19.2.0" + implementation "com.google.android.gms:play-services-base:17.1.0" implementation('com.github.b3er.rxfirebase:firebase-database-kotlin:11.2.0') { transitive = false } implementation('com.github.b3er.rxfirebase:firebase-database:11.2.0') { transitive = false } implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') { transitive = true } @@ -170,7 +172,7 @@ dependencies { implementation("com.apollographql.apollo:apollo-runtime:1.2.2") implementation 'com.jaredrummler:android-device-names:1.1.5' implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.1.0' - implementation 'com.airbnb.android:lottie:2.2.5' + implementation 'com.airbnb.android:lottie:3.0.7' implementation 'com.firebase:firebase-jobdispatcher:0.8.2' compileOnly "org.projectlombok:lombok:${lombokVersion}" @@ -180,6 +182,7 @@ dependencies { kapt "com.jakewharton:butterknife-compiler:${butterKnifeVersion}" kapt 'com.github.matthiasrobbers:shortbread-compiler:1.0.1' kapt "io.requery:requery-processor:${requery}" + kapt "com.github.bumptech.glide:compiler:$glideVersion" } diff --git a/app/src/main/java/com/fastaccess/App.java b/app/src/main/java/com/fastaccess/App.java index e5e6006f..d770b1e9 100644 --- a/app/src/main/java/com/fastaccess/App.java +++ b/app/src/main/java/com/fastaccess/App.java @@ -1,8 +1,8 @@ package com.fastaccess; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.v7.preference.PreferenceManager; +import androidx.annotation.NonNull; +import androidx.preference.PreferenceManager; import com.fastaccess.data.dao.model.Models; import com.fastaccess.helper.DeviceNameGetter; diff --git a/app/src/main/java/com/fastaccess/GlideModule.kt b/app/src/main/java/com/fastaccess/GlideModule.kt new file mode 100644 index 00000000..bcb42df2 --- /dev/null +++ b/app/src/main/java/com/fastaccess/GlideModule.kt @@ -0,0 +1,8 @@ +package com.fastaccess + +import com.bumptech.glide.annotation.GlideModule +import com.bumptech.glide.module.AppGlideModule + + +@GlideModule +class GlideModule : AppGlideModule() \ No newline at end of file diff --git a/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java b/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java index 66311685..074f72f8 100644 --- a/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java +++ b/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java @@ -2,8 +2,8 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java b/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java index 89e9df3a..9e8c9b68 100644 --- a/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java @@ -2,8 +2,8 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.helper.InputHelper; diff --git a/app/src/main/java/com/fastaccess/data/dao/EditRepoFileModel.kt b/app/src/main/java/com/fastaccess/data/dao/EditRepoFileModel.kt index 3489fbee..966520ac 100644 --- a/app/src/main/java/com/fastaccess/data/dao/EditRepoFileModel.kt +++ b/app/src/main/java/com/fastaccess/data/dao/EditRepoFileModel.kt @@ -9,23 +9,26 @@ import com.fastaccess.helper.writeBoolean /** * Created by Hashemsergani on 01/09/2017. */ -data class EditRepoFileModel(val login: String, - val repoId: String, - val path: String?, - val ref: String, - val sha: String?, - val contentUrl: String?, - val fileName: String?, - val isEdit: Boolean) : KotlinParcelable { +data class EditRepoFileModel( + val login: String, + val repoId: String, + val path: String?, + val ref: String, + val sha: String?, + val contentUrl: String?, + val fileName: String?, + val isEdit: Boolean +) : KotlinParcelable { constructor(parcel: Parcel) : this( - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readBoolean()) + parcel.readString() ?: "", + parcel.readString() ?: "", + parcel.readString() ?: "", + parcel.readString() ?: "", + parcel.readString() ?: "", + parcel.readString() ?: "", + parcel.readString() ?: "", + parcel.readBoolean() + ) override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) { writeString(login) diff --git a/app/src/main/java/com/fastaccess/data/dao/FragmentPagerAdapterModel.java b/app/src/main/java/com/fastaccess/data/dao/FragmentPagerAdapterModel.java index e15b1326..c945600f 100644 --- a/app/src/main/java/com/fastaccess/data/dao/FragmentPagerAdapterModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/FragmentPagerAdapterModel.java @@ -1,9 +1,9 @@ package com.fastaccess.data.dao; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java b/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java index d52b86c0..7517823a 100644 --- a/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java @@ -1,6 +1,6 @@ package com.fastaccess.data.dao; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java b/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java index 915df44b..37e81286 100644 --- a/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; import com.fastaccess.data.dao.model.Issue; diff --git a/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java b/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java index 73a7a805..7ed7449f 100644 --- a/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/fastaccess/data/dao/NameParser.java b/app/src/main/java/com/fastaccess/data/dao/NameParser.java index 11f0ffd5..4c25b006 100644 --- a/app/src/main/java/com/fastaccess/data/dao/NameParser.java +++ b/app/src/main/java/com/fastaccess/data/dao/NameParser.java @@ -1,7 +1,7 @@ package com.fastaccess.data.dao; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.helper.InputHelper; import com.fastaccess.provider.scheme.LinkParserHelper; diff --git a/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java b/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java index 92d2451f..bd1d5586 100644 --- a/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; import com.fastaccess.data.dao.model.IssueEvent; diff --git a/app/src/main/java/com/fastaccess/data/dao/PullsIssuesParser.java b/app/src/main/java/com/fastaccess/data/dao/PullsIssuesParser.java index 59333a99..6904db6e 100644 --- a/app/src/main/java/com/fastaccess/data/dao/PullsIssuesParser.java +++ b/app/src/main/java/com/fastaccess/data/dao/PullsIssuesParser.java @@ -3,7 +3,7 @@ package com.fastaccess.data.dao; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.helper.InputHelper; diff --git a/app/src/main/java/com/fastaccess/data/dao/ReactionsModel.java b/app/src/main/java/com/fastaccess/data/dao/ReactionsModel.java index ee84a907..16edfeca 100644 --- a/app/src/main/java/com/fastaccess/data/dao/ReactionsModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/ReactionsModel.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.User; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/com/fastaccess/data/dao/RepoPathsManager.java b/app/src/main/java/com/fastaccess/data/dao/RepoPathsManager.java index 2e1bbd0a..5f112186 100644 --- a/app/src/main/java/com/fastaccess/data/dao/RepoPathsManager.java +++ b/app/src/main/java/com/fastaccess/data/dao/RepoPathsManager.java @@ -1,7 +1,7 @@ package com.fastaccess.data.dao; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.RepoFile; diff --git a/app/src/main/java/com/fastaccess/data/dao/SettingsModel.java b/app/src/main/java/com/fastaccess/data/dao/SettingsModel.java index f95ea515..a844c85f 100644 --- a/app/src/main/java/com/fastaccess/data/dao/SettingsModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/SettingsModel.java @@ -1,6 +1,6 @@ package com.fastaccess.data.dao; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/app/src/main/java/com/fastaccess/data/dao/TabsCountStateModel.java b/app/src/main/java/com/fastaccess/data/dao/TabsCountStateModel.java index dcb45ede..ca65a36e 100644 --- a/app/src/main/java/com/fastaccess/data/dao/TabsCountStateModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/TabsCountStateModel.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import java.io.Serializable; diff --git a/app/src/main/java/com/fastaccess/data/dao/TimelineModel.java b/app/src/main/java/com/fastaccess/data/dao/TimelineModel.java index 9fe29ba7..1e4e15a9 100644 --- a/app/src/main/java/com/fastaccess/data/dao/TimelineModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/TimelineModel.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.Comment; import com.fastaccess.data.dao.model.Issue; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractComment.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractComment.java index ffcb0991..806f83d1 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractComment.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractComment.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.data.dao.ReactionsModel; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractCommit.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractCommit.java index 0bdea8dd..32fe38a9 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractCommit.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractCommit.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.data.dao.CommitFileListModel; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractEvent.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractEvent.java index 32f97459..ee9a0a62 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractEvent.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractEvent.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.fastaccess.App; @@ -42,7 +42,7 @@ import lombok.NoArgsConstructor; @Nullable String login; @NonNull - public static Disposable save(@android.support.annotation.Nullable List events, @android.support.annotation.Nullable String user) { + public static Disposable save(@androidx.annotation.Nullable List events, @androidx.annotation.Nullable String user) { return RxHelper.getSingle(Single.fromPublisher(s -> { try { Login login = Login.getUser(); diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractFastHubNotification.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractFastHubNotification.java index 29547a0f..b8721fd5 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractFastHubNotification.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractFastHubNotification.java @@ -2,8 +2,8 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java index 6177812a..c9e8542e 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractGist.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Collectors; import com.annimon.stream.LongStream; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssue.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssue.java index 86c886f3..744fce42 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssue.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssue.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.data.dao.LabelListModel; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssueEvent.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssueEvent.java index 74f1176c..1621e0d3 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssueEvent.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractIssueEvent.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.data.dao.LabelModel; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractLogin.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractLogin.java index 86a6c09c..27b2f1c6 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractLogin.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractLogin.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.helper.PrefGetter; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotification.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotification.java index 573f44dd..41bb6965 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotification.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotification.java @@ -72,7 +72,7 @@ import lombok.NoArgsConstructor; })).subscribe(o -> {/*do nothing*/}, Throwable::printStackTrace); } - public static Disposable save(@android.support.annotation.Nullable List models) { + public static Disposable save(@androidx.annotation.Nullable List models) { if (models == null || models.isEmpty()) { return Observable.empty().subscribe(); } @@ -92,7 +92,7 @@ import lombok.NoArgsConstructor; })).subscribe(o -> {/*do nothing*/}, Throwable::printStackTrace); } - public static Single saveAsSingle(@android.support.annotation.Nullable List models) { + public static Single saveAsSingle(@androidx.annotation.Nullable List models) { if (models == null || models.isEmpty()) { return Single.just(true); } diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotificationQueue.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotificationQueue.java index 664e1f92..350bc73b 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotificationQueue.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractNotificationQueue.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.helper.RxHelper; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java index 66ce439d..8cd2282e 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java @@ -1,7 +1,7 @@ package com.fastaccess.data.dao.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.data.dao.converters.GistConverter; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedIssues.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedIssues.java index 22cdc9ad..7617675e 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedIssues.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedIssues.java @@ -1,7 +1,7 @@ package com.fastaccess.data.dao.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.data.dao.converters.IssueConverter; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedPullRequests.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedPullRequests.java index 869d78f6..3df8d59d 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedPullRequests.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedPullRequests.java @@ -1,7 +1,7 @@ package com.fastaccess.data.dao.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.data.dao.converters.PullRequestConverter; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedRepos.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedRepos.java index e9bfde70..877202e5 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedRepos.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedRepos.java @@ -1,8 +1,8 @@ package com.fastaccess.data.dao.model; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.data.dao.converters.RepoConverter; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPullRequest.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPullRequest.java index 42925d45..8d4b8c07 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPullRequest.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPullRequest.java @@ -3,7 +3,7 @@ package com.fastaccess.data.dao.model; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRelease.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRelease.java index b7c7ac7e..321796fc 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRelease.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRelease.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.data.dao.ReleasesAssetsListModel; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepo.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepo.java index 8a8c6306..24bb911b 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepo.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepo.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.data.dao.LicenseModel; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepoFile.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepoFile.java index 474af92c..47088317 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepoFile.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractRepoFile.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.data.dao.types.FilesType; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractUser.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractUser.java index 06c44fd7..200c36fd 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractUser.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractUser.java @@ -2,8 +2,8 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.helper.RxHelper; diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractViewerFile.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractViewerFile.java index cc0bd4ac..9e0f3ac6 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractViewerFile.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractViewerFile.java @@ -2,7 +2,7 @@ package com.fastaccess.data.dao.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.App; import com.fastaccess.helper.RxHelper; diff --git a/app/src/main/java/com/fastaccess/data/dao/types/EventsType.java b/app/src/main/java/com/fastaccess/data/dao/types/EventsType.java index fdcf64df..85b96d18 100644 --- a/app/src/main/java/com/fastaccess/data/dao/types/EventsType.java +++ b/app/src/main/java/com/fastaccess/data/dao/types/EventsType.java @@ -1,8 +1,8 @@ package com.fastaccess.data.dao.types; -import android.support.annotation.DrawableRes; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.StringRes; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/types/FilesType.java b/app/src/main/java/com/fastaccess/data/dao/types/FilesType.java index 00431f1b..4c44606a 100644 --- a/app/src/main/java/com/fastaccess/data/dao/types/FilesType.java +++ b/app/src/main/java/com/fastaccess/data/dao/types/FilesType.java @@ -1,6 +1,6 @@ package com.fastaccess.data.dao.types; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/types/IssueEventType.java b/app/src/main/java/com/fastaccess/data/dao/types/IssueEventType.java index d29060b4..c8ef9f5c 100644 --- a/app/src/main/java/com/fastaccess/data/dao/types/IssueEventType.java +++ b/app/src/main/java/com/fastaccess/data/dao/types/IssueEventType.java @@ -1,7 +1,7 @@ package com.fastaccess.data.dao.types; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/types/IssueState.java b/app/src/main/java/com/fastaccess/data/dao/types/IssueState.java index 6155871e..039f45c3 100644 --- a/app/src/main/java/com/fastaccess/data/dao/types/IssueState.java +++ b/app/src/main/java/com/fastaccess/data/dao/types/IssueState.java @@ -1,6 +1,6 @@ package com.fastaccess.data.dao.types; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/types/ReactionTypes.java b/app/src/main/java/com/fastaccess/data/dao/types/ReactionTypes.java index a8a13270..7b075c26 100644 --- a/app/src/main/java/com/fastaccess/data/dao/types/ReactionTypes.java +++ b/app/src/main/java/com/fastaccess/data/dao/types/ReactionTypes.java @@ -1,7 +1,7 @@ package com.fastaccess.data.dao.types; -import android.support.annotation.IdRes; -import android.support.annotation.Nullable; +import androidx.annotation.IdRes; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/types/ReviewStateType.java b/app/src/main/java/com/fastaccess/data/dao/types/ReviewStateType.java index da91a590..58b1a451 100644 --- a/app/src/main/java/com/fastaccess/data/dao/types/ReviewStateType.java +++ b/app/src/main/java/com/fastaccess/data/dao/types/ReviewStateType.java @@ -1,9 +1,9 @@ package com.fastaccess.data.dao.types; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import com.annimon.stream.Stream; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/types/StatusStateType.java b/app/src/main/java/com/fastaccess/data/dao/types/StatusStateType.java index ae02006b..0d104c1d 100644 --- a/app/src/main/java/com/fastaccess/data/dao/types/StatusStateType.java +++ b/app/src/main/java/com/fastaccess/data/dao/types/StatusStateType.java @@ -1,8 +1,8 @@ package com.fastaccess.data.dao.types; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt b/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt index cafe8d30..a8162e86 100644 --- a/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt +++ b/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt @@ -7,16 +7,18 @@ import com.fastaccess.helper.parcelableCreator /** * Created by Kosh on 13 Jun 2017, 8:06 PM */ -data class WikiContentModel(val content: String? = null, private val footer: String? = null, - val sidebar: List) : KotlinParcelable { +data class WikiContentModel( + val content: String? = null, private val footer: String? = null, + val sidebar: List +) : KotlinParcelable { companion object { @JvmField val CREATOR = parcelableCreator(::WikiContentModel) } constructor(source: Parcel) : this( - source.readString(), - source.readString(), - source.createTypedArrayList(WikiSideBarModel.CREATOR) + source.readString(), + source.readString(), + source.createTypedArrayList(WikiSideBarModel.CREATOR) ?: arrayListOf() ) override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) { diff --git a/app/src/main/java/com/fastaccess/data/service/GistService.java b/app/src/main/java/com/fastaccess/data/service/GistService.java index a0e70ecd..10a19ff8 100644 --- a/app/src/main/java/com/fastaccess/data/service/GistService.java +++ b/app/src/main/java/com/fastaccess/data/service/GistService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.CommentRequestModel; import com.fastaccess.data.dao.CreateGistModel; diff --git a/app/src/main/java/com/fastaccess/data/service/ImgurService.java b/app/src/main/java/com/fastaccess/data/service/ImgurService.java index 74687698..834f7109 100644 --- a/app/src/main/java/com/fastaccess/data/service/ImgurService.java +++ b/app/src/main/java/com/fastaccess/data/service/ImgurService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.ImgurReponseModel; diff --git a/app/src/main/java/com/fastaccess/data/service/IssueService.java b/app/src/main/java/com/fastaccess/data/service/IssueService.java index d63d7c4b..63496cbb 100644 --- a/app/src/main/java/com/fastaccess/data/service/IssueService.java +++ b/app/src/main/java/com/fastaccess/data/service/IssueService.java @@ -1,7 +1,7 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.AssigneesRequestModel; import com.fastaccess.data.dao.CommentRequestModel; diff --git a/app/src/main/java/com/fastaccess/data/service/LoginRestService.java b/app/src/main/java/com/fastaccess/data/service/LoginRestService.java index e9049bdd..ffbaee3b 100644 --- a/app/src/main/java/com/fastaccess/data/service/LoginRestService.java +++ b/app/src/main/java/com/fastaccess/data/service/LoginRestService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.AccessTokenModel; import com.fastaccess.data.dao.AuthModel; diff --git a/app/src/main/java/com/fastaccess/data/service/NotificationService.java b/app/src/main/java/com/fastaccess/data/service/NotificationService.java index f32ed1a0..04ad2502 100644 --- a/app/src/main/java/com/fastaccess/data/service/NotificationService.java +++ b/app/src/main/java/com/fastaccess/data/service/NotificationService.java @@ -1,8 +1,8 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; -import android.support.annotation.StringDef; +import androidx.annotation.NonNull; +import androidx.annotation.StringDef; import com.fastaccess.data.dao.NotificationSubscriptionBodyModel; import com.fastaccess.data.dao.Pageable; diff --git a/app/src/main/java/com/fastaccess/data/service/OrganizationService.java b/app/src/main/java/com/fastaccess/data/service/OrganizationService.java index f4b64f10..b5e2d2b9 100644 --- a/app/src/main/java/com/fastaccess/data/service/OrganizationService.java +++ b/app/src/main/java/com/fastaccess/data/service/OrganizationService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.Pageable; import com.fastaccess.data.dao.TeamsModel; diff --git a/app/src/main/java/com/fastaccess/data/service/PullRequestService.java b/app/src/main/java/com/fastaccess/data/service/PullRequestService.java index 999c82b8..91963af6 100644 --- a/app/src/main/java/com/fastaccess/data/service/PullRequestService.java +++ b/app/src/main/java/com/fastaccess/data/service/PullRequestService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.AssigneesRequestModel; import com.fastaccess.data.dao.CommitFileModel; diff --git a/app/src/main/java/com/fastaccess/data/service/ReactionsService.java b/app/src/main/java/com/fastaccess/data/service/ReactionsService.java index 06a4a6ea..0ee4e8ce 100644 --- a/app/src/main/java/com/fastaccess/data/service/ReactionsService.java +++ b/app/src/main/java/com/fastaccess/data/service/ReactionsService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.Pageable; import com.fastaccess.data.dao.PostReactionModel; diff --git a/app/src/main/java/com/fastaccess/data/service/RepoService.java b/app/src/main/java/com/fastaccess/data/service/RepoService.java index 92c0054b..76daeefd 100644 --- a/app/src/main/java/com/fastaccess/data/service/RepoService.java +++ b/app/src/main/java/com/fastaccess/data/service/RepoService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.BranchesModel; import com.fastaccess.data.dao.CommentRequestModel; diff --git a/app/src/main/java/com/fastaccess/data/service/ReviewService.java b/app/src/main/java/com/fastaccess/data/service/ReviewService.java index 8d947c36..875dc42a 100644 --- a/app/src/main/java/com/fastaccess/data/service/ReviewService.java +++ b/app/src/main/java/com/fastaccess/data/service/ReviewService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.CommentRequestModel; import com.fastaccess.data.dao.Pageable; diff --git a/app/src/main/java/com/fastaccess/data/service/UserRestService.java b/app/src/main/java/com/fastaccess/data/service/UserRestService.java index a3d2289d..b0c70988 100644 --- a/app/src/main/java/com/fastaccess/data/service/UserRestService.java +++ b/app/src/main/java/com/fastaccess/data/service/UserRestService.java @@ -1,6 +1,6 @@ package com.fastaccess.data.service; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.Pageable; import com.fastaccess.data.dao.model.Event; diff --git a/app/src/main/java/com/fastaccess/helper/ActivityHelper.java b/app/src/main/java/com/fastaccess/helper/ActivityHelper.java index 777c64ec..dbea0d11 100644 --- a/app/src/main/java/com/fastaccess/helper/ActivityHelper.java +++ b/app/src/main/java/com/fastaccess/helper/ActivityHelper.java @@ -12,15 +12,15 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.customtabs.CustomTabsIntent; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.ActivityOptionsCompat; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.ShareCompat; -import android.support.v4.util.Pair; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.browser.customtabs.CustomTabsIntent; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.core.app.ShareCompat; +import androidx.core.util.Pair; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/fastaccess/helper/AnimHelper.java b/app/src/main/java/com/fastaccess/helper/AnimHelper.java index 2faa8d41..631b381b 100644 --- a/app/src/main/java/com/fastaccess/helper/AnimHelper.java +++ b/app/src/main/java/com/fastaccess/helper/AnimHelper.java @@ -5,14 +5,14 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.app.Dialog; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.DialogFragment; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.animation.FastOutLinearInInterpolator; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.fragment.app.DialogFragment; +import androidx.core.view.ViewCompat; +import androidx.interpolator.view.animation.FastOutLinearInInterpolator; +import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; import android.view.View; import android.view.ViewAnimationUtils; import android.view.ViewPropertyAnimator; diff --git a/app/src/main/java/com/fastaccess/helper/AppHelper.java b/app/src/main/java/com/fastaccess/helper/AppHelper.java index 3cffe09c..5c593a7e 100644 --- a/app/src/main/java/com/fastaccess/helper/AppHelper.java +++ b/app/src/main/java/com/fastaccess/helper/AppHelper.java @@ -11,10 +11,10 @@ import android.content.res.Resources; import android.net.ConnectivityManager; import android.os.Build; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import android.view.View; import android.view.inputmethod.InputMethodManager; diff --git a/app/src/main/java/com/fastaccess/helper/BundleConstant.java b/app/src/main/java/com/fastaccess/helper/BundleConstant.java index 2360472e..bd2ddc3d 100644 --- a/app/src/main/java/com/fastaccess/helper/BundleConstant.java +++ b/app/src/main/java/com/fastaccess/helper/BundleConstant.java @@ -1,6 +1,6 @@ package com.fastaccess.helper; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/app/src/main/java/com/fastaccess/helper/Bundler.java b/app/src/main/java/com/fastaccess/helper/Bundler.java index 0ceb5bb4..216352fc 100644 --- a/app/src/main/java/com/fastaccess/helper/Bundler.java +++ b/app/src/main/java/com/fastaccess/helper/Bundler.java @@ -4,7 +4,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.SparseArray; import java.io.Serializable; diff --git a/app/src/main/java/com/fastaccess/helper/FileHelper.java b/app/src/main/java/com/fastaccess/helper/FileHelper.java index 2b281396..d59b9a6c 100644 --- a/app/src/main/java/com/fastaccess/helper/FileHelper.java +++ b/app/src/main/java/com/fastaccess/helper/FileHelper.java @@ -8,8 +8,8 @@ import android.net.Uri; import android.os.Environment; import android.provider.DocumentsContract; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.R; import com.fastaccess.data.dao.NotificationSoundModel; diff --git a/app/src/main/java/com/fastaccess/helper/InputHelper.java b/app/src/main/java/com/fastaccess/helper/InputHelper.java index f838e045..51f9171a 100644 --- a/app/src/main/java/com/fastaccess/helper/InputHelper.java +++ b/app/src/main/java/com/fastaccess/helper/InputHelper.java @@ -1,8 +1,8 @@ package com.fastaccess.helper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputLayout; import android.text.TextUtils; import android.widget.EditText; import android.widget.TextView; diff --git a/app/src/main/java/com/fastaccess/helper/Logger.java b/app/src/main/java/com/fastaccess/helper/Logger.java index f00ea119..64953a7c 100644 --- a/app/src/main/java/com/fastaccess/helper/Logger.java +++ b/app/src/main/java/com/fastaccess/helper/Logger.java @@ -1,7 +1,7 @@ package com.fastaccess.helper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import com.fastaccess.BuildConfig; diff --git a/app/src/main/java/com/fastaccess/helper/ObjectsCompat.java b/app/src/main/java/com/fastaccess/helper/ObjectsCompat.java index 34f709f2..f5c56b6c 100644 --- a/app/src/main/java/com/fastaccess/helper/ObjectsCompat.java +++ b/app/src/main/java/com/fastaccess/helper/ObjectsCompat.java @@ -1,6 +1,6 @@ package com.fastaccess.helper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Created by Kosh on 18 Apr 2017, 10:57 PM diff --git a/app/src/main/java/com/fastaccess/helper/ParseDateFormat.java b/app/src/main/java/com/fastaccess/helper/ParseDateFormat.java index eba702cc..c3587cf2 100644 --- a/app/src/main/java/com/fastaccess/helper/ParseDateFormat.java +++ b/app/src/main/java/com/fastaccess/helper/ParseDateFormat.java @@ -1,7 +1,7 @@ package com.fastaccess.helper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.format.DateUtils; import java.text.DateFormat; diff --git a/app/src/main/java/com/fastaccess/helper/PrefGetter.java b/app/src/main/java/com/fastaccess/helper/PrefGetter.java index 5e72b8d3..af09693d 100644 --- a/app/src/main/java/com/fastaccess/helper/PrefGetter.java +++ b/app/src/main/java/com/fastaccess/helper/PrefGetter.java @@ -4,9 +4,9 @@ import android.content.Context; import android.content.res.Resources; import android.media.RingtoneManager; import android.net.Uri; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.BuildConfig; diff --git a/app/src/main/java/com/fastaccess/helper/PrefHelper.java b/app/src/main/java/com/fastaccess/helper/PrefHelper.java index 74eadf20..10fee73d 100644 --- a/app/src/main/java/com/fastaccess/helper/PrefHelper.java +++ b/app/src/main/java/com/fastaccess/helper/PrefHelper.java @@ -3,8 +3,8 @@ package com.fastaccess.helper; import android.annotation.SuppressLint; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.App; diff --git a/app/src/main/java/com/fastaccess/helper/RxHelper.java b/app/src/main/java/com/fastaccess/helper/RxHelper.java index 1cd29bea..698c1883 100644 --- a/app/src/main/java/com/fastaccess/helper/RxHelper.java +++ b/app/src/main/java/com/fastaccess/helper/RxHelper.java @@ -1,6 +1,6 @@ package com.fastaccess.helper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import io.reactivex.Observable; import io.reactivex.Single; diff --git a/app/src/main/java/com/fastaccess/helper/ViewHelper.java b/app/src/main/java/com/fastaccess/helper/ViewHelper.java index eabedf76..2861d625 100644 --- a/app/src/main/java/com/fastaccess/helper/ViewHelper.java +++ b/app/src/main/java/com/fastaccess/helper/ViewHelper.java @@ -14,10 +14,10 @@ import android.graphics.drawable.RippleDrawable; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.StateListDrawable; import android.graphics.drawable.shapes.RoundRectShape; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; import android.text.Layout; import android.util.TypedValue; import android.view.View; diff --git a/app/src/main/java/com/fastaccess/provider/colors/ColorsProvider.java b/app/src/main/java/com/fastaccess/provider/colors/ColorsProvider.java index fc760f27..b11e0c19 100644 --- a/app/src/main/java/com/fastaccess/provider/colors/ColorsProvider.java +++ b/app/src/main/java/com/fastaccess/provider/colors/ColorsProvider.java @@ -3,9 +3,9 @@ package com.fastaccess.provider.colors; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Color; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/fastaccess/provider/fabric/FabricProvider.kt b/app/src/main/java/com/fastaccess/provider/fabric/FabricProvider.kt index fc57ba4b..5e5faa94 100644 --- a/app/src/main/java/com/fastaccess/provider/fabric/FabricProvider.kt +++ b/app/src/main/java/com/fastaccess/provider/fabric/FabricProvider.kt @@ -18,18 +18,20 @@ object FabricProvider { fun initFabric(context: Context) { val fabric = Fabric.Builder(context) - .kits(Crashlytics.Builder() - .core(CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()) - .build()) - .debuggable(BuildConfig.DEBUG) - .build() + .kits( + Crashlytics.Builder() + .core(CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()) + .build() + ) + .debuggable(BuildConfig.DEBUG) + .build() Fabric.with(fabric) } - fun logPurchase(productKey: String, price: Long? = null, priceText: String? = null) { + fun logPurchase(productKey: String?, price: Long? = null, priceText: String? = null) { val purchaseEvent = PurchaseEvent() - .putItemName(productKey) - .putSuccess(true) + .putItemName(productKey) + .putSuccess(true) priceText?.let { purchaseEvent.putItemType(priceText) diff --git a/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java b/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java index 64a3d8d8..b6dcfd93 100644 --- a/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java +++ b/app/src/main/java/com/fastaccess/provider/fcm/PushNotificationService.java @@ -4,7 +4,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import com.fastaccess.R; import com.fastaccess.data.dao.model.FastHubNotification; diff --git a/app/src/main/java/com/fastaccess/provider/gson/ToGsonProvider.java b/app/src/main/java/com/fastaccess/provider/gson/ToGsonProvider.java index 5f88e3e5..e3cafe28 100644 --- a/app/src/main/java/com/fastaccess/provider/gson/ToGsonProvider.java +++ b/app/src/main/java/com/fastaccess/provider/gson/ToGsonProvider.java @@ -1,7 +1,7 @@ package com.fastaccess.provider.gson; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java b/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java index 70056f03..b98e6e44 100644 --- a/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java +++ b/app/src/main/java/com/fastaccess/provider/markdown/MarkDownProvider.java @@ -1,7 +1,7 @@ package com.fastaccess.provider.markdown; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Html; import android.view.ViewTreeObserver; import android.webkit.MimeTypeMap; diff --git a/app/src/main/java/com/fastaccess/provider/rest/ImgurProvider.java b/app/src/main/java/com/fastaccess/provider/rest/ImgurProvider.java index cfabe111..ce68f47b 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/ImgurProvider.java +++ b/app/src/main/java/com/fastaccess/provider/rest/ImgurProvider.java @@ -1,6 +1,6 @@ package com.fastaccess.provider.rest; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.BuildConfig; import com.fastaccess.data.service.ImgurService; diff --git a/app/src/main/java/com/fastaccess/provider/rest/LoginProvider.java b/app/src/main/java/com/fastaccess/provider/rest/LoginProvider.java index 383825f1..af315679 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/LoginProvider.java +++ b/app/src/main/java/com/fastaccess/provider/rest/LoginProvider.java @@ -1,7 +1,7 @@ package com.fastaccess.provider.rest; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.BuildConfig; import com.fastaccess.data.service.LoginRestService; diff --git a/app/src/main/java/com/fastaccess/provider/rest/RepoQueryProvider.java b/app/src/main/java/com/fastaccess/provider/rest/RepoQueryProvider.java index 65adb2ae..95566852 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/RepoQueryProvider.java +++ b/app/src/main/java/com/fastaccess/provider/rest/RepoQueryProvider.java @@ -1,6 +1,6 @@ package com.fastaccess.provider.rest; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.types.IssueState; diff --git a/app/src/main/java/com/fastaccess/provider/rest/RestProvider.java b/app/src/main/java/com/fastaccess/provider/rest/RestProvider.java index 6fb75871..31278ed9 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/RestProvider.java +++ b/app/src/main/java/com/fastaccess/provider/rest/RestProvider.java @@ -4,8 +4,8 @@ import android.app.DownloadManager; import android.content.Context; import android.net.Uri; import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.widget.Toast; diff --git a/app/src/main/java/com/fastaccess/provider/rest/converters/GithubResponseConverter.java b/app/src/main/java/com/fastaccess/provider/rest/converters/GithubResponseConverter.java index d8bca871..ab79636c 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/converters/GithubResponseConverter.java +++ b/app/src/main/java/com/fastaccess/provider/rest/converters/GithubResponseConverter.java @@ -1,6 +1,6 @@ package com.fastaccess.provider.rest.converters; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.gson.Gson; diff --git a/app/src/main/java/com/fastaccess/provider/rest/interceptors/AuthenticationInterceptor.kt b/app/src/main/java/com/fastaccess/provider/rest/interceptors/AuthenticationInterceptor.kt index be5eae49..9f15342e 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/interceptors/AuthenticationInterceptor.kt +++ b/app/src/main/java/com/fastaccess/provider/rest/interceptors/AuthenticationInterceptor.kt @@ -24,7 +24,7 @@ class AuthenticationInterceptor : Interceptor { @Throws(IOException::class) override fun intercept(chain: Interceptor.Chain): Response { val original = chain.request() val builder = original.newBuilder() - val isEnterprise = LinkParserHelper.isEnterprise(original.url().host()) + val isEnterprise = LinkParserHelper.isEnterprise(original.url.host) val authToken = if (token.isNullOrBlank()) if (isEnterprise) PrefGetter.getEnterpriseToken() else PrefGetter.getToken() else token val otpCode = if (otp.isNullOrBlank()) if (isEnterprise) PrefGetter.getEnterpriseOtpCode() else PrefGetter.getOtpCode() else otp if (!authToken.isNullOrBlank()) { diff --git a/app/src/main/java/com/fastaccess/provider/rest/interceptors/ContentTypeInterceptor.kt b/app/src/main/java/com/fastaccess/provider/rest/interceptors/ContentTypeInterceptor.kt index 263c378b..83b3d755 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/interceptors/ContentTypeInterceptor.kt +++ b/app/src/main/java/com/fastaccess/provider/rest/interceptors/ContentTypeInterceptor.kt @@ -13,7 +13,7 @@ class ContentTypeInterceptor : Interceptor { return chain.proceed(request.newBuilder() .addHeader("Accept", "application/vnd.github.v3+json") .addHeader("Content-type", "application/vnd.github.v3+json") - .method(request.method(), request.body()) + .method(request.method, request.body) .build()) } } \ No newline at end of file diff --git a/app/src/main/java/com/fastaccess/provider/rest/interceptors/PaginationInterceptor.java b/app/src/main/java/com/fastaccess/provider/rest/interceptors/PaginationInterceptor.java index 4875f0c8..5f5cf54f 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/interceptors/PaginationInterceptor.java +++ b/app/src/main/java/com/fastaccess/provider/rest/interceptors/PaginationInterceptor.java @@ -1,7 +1,7 @@ package com.fastaccess.provider.rest.interceptors; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.helper.InputHelper; diff --git a/app/src/main/java/com/fastaccess/provider/rest/jsoup/JsoupProvider.java b/app/src/main/java/com/fastaccess/provider/rest/jsoup/JsoupProvider.java index 479a9c25..b2bfa4e8 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/jsoup/JsoupProvider.java +++ b/app/src/main/java/com/fastaccess/provider/rest/jsoup/JsoupProvider.java @@ -1,6 +1,6 @@ package com.fastaccess.provider.rest.jsoup; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.BuildConfig; import com.fastaccess.data.service.ScrapService; diff --git a/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java b/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java index f0d77da7..654880ec 100644 --- a/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java +++ b/app/src/main/java/com/fastaccess/provider/rest/loadmore/OnLoadMore.java @@ -1,6 +1,6 @@ package com.fastaccess.provider.rest.loadmore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.ui.base.mvp.BaseMvp; import com.fastaccess.ui.widgets.recyclerview.scroll.InfiniteScroll; diff --git a/app/src/main/java/com/fastaccess/provider/scheme/LinkParserHelper.java b/app/src/main/java/com/fastaccess/provider/scheme/LinkParserHelper.java index 5a0bfab6..b02bd103 100644 --- a/app/src/main/java/com/fastaccess/provider/scheme/LinkParserHelper.java +++ b/app/src/main/java/com/fastaccess/provider/scheme/LinkParserHelper.java @@ -1,8 +1,8 @@ package com.fastaccess.provider.scheme; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.webkit.MimeTypeMap; diff --git a/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java b/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java index 250131a0..5f1a60a3 100644 --- a/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java +++ b/app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java @@ -7,8 +7,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.webkit.MimeTypeMap; diff --git a/app/src/main/java/com/fastaccess/provider/tasks/git/GithubActionService.java b/app/src/main/java/com/fastaccess/provider/tasks/git/GithubActionService.java index 57fe9ed6..66120d2c 100644 --- a/app/src/main/java/com/fastaccess/provider/tasks/git/GithubActionService.java +++ b/app/src/main/java/com/fastaccess/provider/tasks/git/GithubActionService.java @@ -5,10 +5,10 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import com.fastaccess.R; import com.fastaccess.helper.BundleConstant; diff --git a/app/src/main/java/com/fastaccess/provider/tasks/git/ReactionService.java b/app/src/main/java/com/fastaccess/provider/tasks/git/ReactionService.java index 63d9a3bc..618e6fe0 100644 --- a/app/src/main/java/com/fastaccess/provider/tasks/git/ReactionService.java +++ b/app/src/main/java/com/fastaccess/provider/tasks/git/ReactionService.java @@ -5,9 +5,9 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import com.fastaccess.R; import com.fastaccess.data.dao.PostReactionModel; diff --git a/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java b/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java index 3f6f4d57..d587d10e 100644 --- a/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java +++ b/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java @@ -9,10 +9,10 @@ import android.content.Intent; import android.graphics.BitmapFactory; import android.media.AudioManager; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.core.content.ContextCompat; import com.annimon.stream.Stream; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/provider/tasks/notification/ReadNotificationService.java b/app/src/main/java/com/fastaccess/provider/tasks/notification/ReadNotificationService.java index 76435993..07c751bc 100644 --- a/app/src/main/java/com/fastaccess/provider/tasks/notification/ReadNotificationService.java +++ b/app/src/main/java/com/fastaccess/provider/tasks/notification/ReadNotificationService.java @@ -7,9 +7,9 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import com.annimon.stream.LongStream; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/provider/tasks/slack/SlackInvitationService.java b/app/src/main/java/com/fastaccess/provider/tasks/slack/SlackInvitationService.java index d8c0ed14..1c00ba23 100644 --- a/app/src/main/java/com/fastaccess/provider/tasks/slack/SlackInvitationService.java +++ b/app/src/main/java/com/fastaccess/provider/tasks/slack/SlackInvitationService.java @@ -2,7 +2,7 @@ package com.fastaccess.provider.tasks.slack; import android.app.IntentService; import android.content.Intent; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.App; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt b/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt index 74d30329..7dab67f5 100644 --- a/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt +++ b/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt @@ -3,7 +3,7 @@ package com.fastaccess.provider.theme import android.app.Activity import android.app.ActivityManager import android.graphics.BitmapFactory -import android.support.annotation.StyleRes +import androidx.annotation.StyleRes import com.danielstone.materialaboutlibrary.MaterialAboutActivity import com.fastaccess.R import com.fastaccess.helper.Logger diff --git a/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java b/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java index 8114ae47..3be60d73 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java @@ -1,8 +1,8 @@ package com.fastaccess.provider.timeline; import android.content.Context; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/HtmlHelper.java b/app/src/main/java/com/fastaccess/provider/timeline/HtmlHelper.java index 68b8e9bb..828e7643 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/HtmlHelper.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/HtmlHelper.java @@ -4,9 +4,9 @@ package com.fastaccess.provider.timeline; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import android.view.HapticFeedbackConstants; import android.widget.PopupMenu; import android.widget.TextView; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java b/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java index cd64cb37..e185c5cc 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/ReactionsProvider.java @@ -1,9 +1,9 @@ package com.fastaccess.provider.timeline; -import android.support.annotation.IdRes; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IdRes; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.PostReactionModel; import com.fastaccess.data.dao.ReactionsModel; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java index 54f04a3b..114357e1 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java @@ -2,8 +2,8 @@ package com.fastaccess.provider.timeline; import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.style.BackgroundColorSpan; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/HrSpan.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/HrSpan.java index 176612d2..3bd13a09 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/HrSpan.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/HrSpan.java @@ -5,7 +5,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.style.LineHeightSpan; import android.text.style.ReplacementSpan; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/ListsHandler.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/ListsHandler.java index 6e5d01de..2d830c96 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/ListsHandler.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/ListsHandler.java @@ -1,7 +1,7 @@ package com.fastaccess.provider.timeline.handler; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.SpannableStringBuilder; import com.fastaccess.helper.Logger; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/PreTagHandler.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/PreTagHandler.java index e1f40a74..0e7be88b 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/PreTagHandler.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/PreTagHandler.java @@ -1,7 +1,7 @@ package com.fastaccess.provider.timeline.handler; import android.graphics.Color; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.text.SpannableStringBuilder; import android.text.style.BackgroundColorSpan; import android.text.style.ForegroundColorSpan; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/QuoteHandler.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/QuoteHandler.java index d44a49f9..1ead0e21 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/QuoteHandler.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/QuoteHandler.java @@ -1,6 +1,6 @@ package com.fastaccess.provider.timeline.handler; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.text.SpannableStringBuilder; import com.zzhoujay.markdown.style.MarkDownQuoteSpan; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/TableHandler.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/TableHandler.java index 141946f4..4f432648 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/TableHandler.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/TableHandler.java @@ -8,7 +8,7 @@ import android.graphics.Paint.Style; import android.graphics.PixelFormat; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Layout.Alignment; import android.text.Spannable; import android.text.SpannableStringBuilder; diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/DrawableGetter.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/DrawableGetter.java index 12c78e0e..93b1989b 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/DrawableGetter.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/DrawableGetter.java @@ -2,13 +2,15 @@ package com.fastaccess.provider.timeline.handler.drawable; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import android.text.Html; import android.widget.TextView; -import com.bumptech.glide.GenericRequestBuilder; import com.bumptech.glide.Glide; +import com.bumptech.glide.RequestBuilder; +import com.fastaccess.App; +import com.fastaccess.GlideApp; import com.fastaccess.R; import java.lang.ref.WeakReference; @@ -35,12 +37,12 @@ public class DrawableGetter implements Html.ImageGetter, Drawable.Callback { final UrlDrawable urlDrawable = new UrlDrawable(); if (container != null && container.get() != null) { Context context = container.get().getContext(); - final GenericRequestBuilder load = Glide.with(context) + final RequestBuilder load = Glide.with(context) .load(url) .placeholder(ContextCompat.getDrawable(context, R.drawable.ic_image)) - .dontAnimate(); + .dontAnimate() + .override(width, width / 2); final GlideDrawableTarget target = new GlideDrawableTarget(urlDrawable, container, width); - load.override(width, width / 2); load.into(target); cachedTargets.add(target); } @@ -60,7 +62,7 @@ public class DrawableGetter implements Html.ImageGetter, Drawable.Callback { public void clear(@NonNull DrawableGetter drawableGetter) { if (drawableGetter.cachedTargets != null) { for (GlideDrawableTarget target : drawableGetter.cachedTargets) { - Glide.clear(target); + GlideApp.with(App.getInstance()).clear(target); } } } diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/GlideDrawableTarget.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/GlideDrawableTarget.java index f9ffaf05..30f6b687 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/GlideDrawableTarget.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/GlideDrawableTarget.java @@ -1,17 +1,21 @@ package com.fastaccess.provider.timeline.handler.drawable; import android.graphics.Rect; +import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.widget.TextView; -import com.bumptech.glide.load.resource.drawable.GlideDrawable; -import com.bumptech.glide.request.animation.GlideAnimation; +import com.bumptech.glide.load.resource.gif.GifDrawable; import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.transition.Transition; import com.fastaccess.R; import java.lang.ref.WeakReference; -class GlideDrawableTarget extends SimpleTarget { +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +class GlideDrawableTarget extends SimpleTarget { private final UrlDrawable urlDrawable; private final WeakReference container; private final int width; @@ -22,7 +26,7 @@ class GlideDrawableTarget extends SimpleTarget { this.width = width; } - @Override public void onResourceReady(GlideDrawable resource, GlideAnimation glideAnimation) { + @Override public void onResourceReady(final @NonNull Drawable resource, @Nullable Transition transition) { if (container != null && container.get() != null) { TextView textView = container.get(); textView.post(() -> { @@ -41,10 +45,10 @@ class GlideDrawableTarget extends SimpleTarget { resource.setBounds(rect); urlDrawable.setBounds(rect); urlDrawable.setDrawable(resource); - if (resource.isAnimated()) { + if (resource instanceof GifDrawable) { urlDrawable.setCallback((Drawable.Callback) textView.getTag(R.id.drawable_callback)); - resource.setLoopCount(GlideDrawable.LOOP_FOREVER); - resource.start(); + ((GifDrawable) resource).setLoopCount(GifDrawable.LOOP_FOREVER); + ((GifDrawable) resource).start(); } textView.setText(textView.getText()); textView.invalidate(); diff --git a/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/UrlDrawable.java b/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/UrlDrawable.java index 3478859e..938dc033 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/UrlDrawable.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/handler/drawable/UrlDrawable.java @@ -3,7 +3,7 @@ package com.fastaccess.provider.timeline.handler.drawable; import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.load.resource.gif.GifDrawable; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/AssigneesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/AssigneesAdapter.java index 6398da33..6079b6a2 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/AssigneesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/AssigneesAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.data.dao.model.User; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/BranchesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/BranchesAdapter.java index d9dd9a91..5c893c11 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/BranchesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/BranchesAdapter.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/CommentsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/CommentsAdapter.java index c51c0645..802352b2 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/CommentsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/CommentsAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.Comment; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/CommitFilesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/CommitFilesAdapter.java index 15d40b9c..1deea53d 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/CommitFilesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/CommitFilesAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.data.dao.CommitFileChanges; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/CommitLinesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/CommitLinesAdapter.java index a2348d09..808326c3 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/CommitLinesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/CommitLinesAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.data.dao.CommitLinesModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/CommitsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/CommitsAdapter.java index 2a7ec721..dcc64565 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/CommitsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/CommitsAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.Commit; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/FeedsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/FeedsAdapter.java index 43cf047e..07e42cdc 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/FeedsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/FeedsAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.Event; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/FragmentsPagerAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/FragmentsPagerAdapter.java index 18595d22..160e0ee4 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/FragmentsPagerAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/FragmentsPagerAdapter.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import com.fastaccess.data.dao.FragmentPagerAdapterModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/GistFilesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/GistFilesAdapter.java index e7899d7d..a27e3fe5 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/GistFilesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/GistFilesAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.data.dao.FilesListModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/GistsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/GistsAdapter.java index 4d5ab031..fb9acb65 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/GistsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/GistsAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.Gist; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/IssuesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/IssuesAdapter.java index 12655b48..9d1faed7 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/IssuesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/IssuesAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.Issue; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java index 6e507bf0..fdcde66d 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.ViewGroup; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/LabelColorsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/LabelColorsAdapter.java index 325fd051..03340443 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/LabelColorsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/LabelColorsAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.ui.adapter.viewholder.LabelColorsViewHolder; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/LabelsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/LabelsAdapter.java index 1463f91f..9ac84a53 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/LabelsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/LabelsAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.data.dao.LabelModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/MilestonesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/MilestonesAdapter.java index 142be747..07098506 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/MilestonesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/MilestonesAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.MilestoneModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java index dc06bd8b..820b2a19 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/PinnedReposAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/PinnedReposAdapter.java index dd1157aa..b715a44b 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/PinnedReposAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/PinnedReposAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.data.dao.model.PinnedRepos; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/PullRequestAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/PullRequestAdapter.java index 962271b4..61b5af45 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/PullRequestAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/PullRequestAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.PullRequest; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/ReleasesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/ReleasesAdapter.java index 288219a8..322b60b9 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/ReleasesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/ReleasesAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.Release; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/RepoFilePathsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/RepoFilePathsAdapter.java index 58d3f94c..51b78297 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/RepoFilePathsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/RepoFilePathsAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.RepoFile; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/RepoFilesAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/RepoFilesAdapter.java index c60a328f..e5f5a686 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/RepoFilesAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/RepoFilesAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.RepoFile; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/ReposAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/ReposAdapter.java index 16976307..f3bf3b77 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/ReposAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/ReposAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.Repo; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/ReviewCommentsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/ReviewCommentsAdapter.java index 9b42ca6b..38c499a8 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/ReviewCommentsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/ReviewCommentsAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.data.dao.ReviewCommentModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/SearchCodeAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/SearchCodeAdapter.java index 07091d36..114db6e5 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/SearchCodeAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/SearchCodeAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.SearchCodeModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/SettingsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/SettingsAdapter.java index 0d2fb6e4..4a4296bd 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/SettingsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/SettingsAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/SimpleListAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/SimpleListAdapter.java index 066f39ae..39425e96 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/SimpleListAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/SimpleListAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/SpinnerAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/SpinnerAdapter.java index 46b727ba..7fe7b87e 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/SpinnerAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/SpinnerAdapter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/TeamsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/TeamsAdapter.java index 54706d8f..6c55294c 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/TeamsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/TeamsAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.TeamsModel; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/TopicsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/TopicsAdapter.java index 3936a171..ff5f2499 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/TopicsAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/TopicsAdapter.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter; import android.content.Intent; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.App; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/UsersAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/UsersAdapter.java index 42d9ac08..6c36f6c0 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/UsersAdapter.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/UsersAdapter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import com.fastaccess.data.dao.model.User; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java index 7027707b..8c5d9e16 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java index de2545be..409643d5 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt index c80bbd9d..f6e526cc 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitCommentsViewHolder.kt @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder -import android.support.transition.ChangeBounds -import android.support.transition.TransitionManager +import androidx.transition.ChangeBounds +import androidx.transition.TransitionManager import android.view.View import android.view.ViewGroup import android.view.ViewTreeObserver diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitLinesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitLinesViewHolder.java index 8492d901..27bbe957 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitLinesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitLinesViewHolder.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.adapter.viewholder; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.AppCompatTextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.AppCompatTextView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitsViewHolder.java index d66e5a94..6052fdc8 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitsViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java index 67eb3ffd..81c19bab 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter.viewholder; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.Gravity; import android.view.View; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistFilesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistFilesViewHolder.java index 34494296..dadf0c1b 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistFilesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistFilesViewHolder.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.format.Formatter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistsViewHolder.java index 2fc2e36f..5d5fed8e 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GistsViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java index cc4f3b26..9bc7fa2b 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java index 8bd68e0d..18251cc1 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueDetailsViewHolder.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.adapter.viewholder; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.transition.ChangeBounds; -import android.support.transition.TransitionManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.transition.ChangeBounds; +import androidx.transition.TransitionManager; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java index 01e94d5e..fe595d0f 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssueTimelineViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java index 024a8027..dd71535e 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/IssuesViewHolder.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelColorsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelColorsViewHolder.java index a4e986da..117b5b60 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelColorsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelColorsViewHolder.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter.viewholder; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java index 6f17803b..cd57af4a 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.adapter.viewholder; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/MilestonesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/MilestonesViewHolder.java index c38475a8..f86bfdb7 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/MilestonesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/MilestonesViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsHeaderViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsHeaderViewHolder.java index d92b40c6..694b3ffd 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsHeaderViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsHeaderViewHolder.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageButton; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageButton; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsViewHolder.java index f4db564b..48308d94 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/NotificationsViewHolder.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.CardView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.cardview.widget.CardView; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java index 35adb8b5..b0d6b5cb 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PinnedReposViewHolder.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter.viewholder; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ProfileOrgsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ProfileOrgsViewHolder.java index ab58f073..49426e83 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ProfileOrgsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ProfileOrgsViewHolder.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestFilesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestFilesViewHolder.java index fbf8b7cc..9f0eedc7 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestFilesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestFilesViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestViewHolder.java index 7898539a..3675ee0c 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullStatusViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullStatusViewHolder.java index 480dfa3d..4051cdf0 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullStatusViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullStatusViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import android.text.method.LinkMovementMethod; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReleasesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReleasesViewHolder.java index 7dbf3e88..aa1db2df 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReleasesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReleasesViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilePathsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilePathsViewHolder.java index 258c6d3b..ef8d7221 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilePathsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilePathsViewHolder.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilesViewHolder.java index 22268678..d88509de 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/RepoFilesViewHolder.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.format.Formatter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java index f849b29f..380cfb26 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReposViewHolder.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.adapter.viewholder; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.format.Formatter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReviewCommentsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReviewCommentsViewHolder.java index 72700d9e..a4859ed5 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReviewCommentsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/ReviewCommentsViewHolder.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.transition.ChangeBounds; -import android.support.transition.TransitionManager; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.transition.ChangeBounds; +import androidx.transition.TransitionManager; +import androidx.appcompat.widget.AppCompatImageView; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SearchCodeViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SearchCodeViewHolder.java index b1ba2cdf..a96a2caa 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SearchCodeViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SearchCodeViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SimpleViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SimpleViewHolder.java index d91b25e2..f964a7b1 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SimpleViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/SimpleViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TeamsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TeamsViewHolder.java index 6183fd34..314a270c 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TeamsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TeamsViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java index f34e5772..5ee5a0a4 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.transition.ChangeBounds; -import android.support.transition.TransitionManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.transition.ChangeBounds; +import androidx.transition.TransitionManager; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UsersViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UsersViewHolder.java index 2788e64c..10ae83e6 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UsersViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UsersViewHolder.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.adapter.viewholder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java index a51d2aac..e388278f 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java @@ -4,18 +4,18 @@ import android.app.ActivityManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.widget.Toolbar; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.navigation.NavigationView; +import androidx.core.view.GravityCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java b/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java index def0cc07..0bcfb974 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java @@ -3,12 +3,12 @@ package com.fastaccess.ui.base; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.BottomSheetDialogFragment; -import android.support.v7.view.ContextThemeWrapper; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.google.android.material.bottomsheet.BottomSheetDialogFragment; +import androidx.appcompat.view.ContextThemeWrapper; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java b/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java index 75af217b..6ef8f3b0 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java @@ -6,11 +6,11 @@ import android.annotation.SuppressLint; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.view.ContextThemeWrapper; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java b/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java index c79a305c..b721b593 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java @@ -3,11 +3,11 @@ package com.fastaccess.ui.base; import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.view.ContextThemeWrapper; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseMvpBottomSheetDialogFragment.java b/app/src/main/java/com/fastaccess/ui/base/BaseMvpBottomSheetDialogFragment.java index 852e7121..48ba5024 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseMvpBottomSheetDialogFragment.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseMvpBottomSheetDialogFragment.java @@ -6,12 +6,12 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.design.widget.BottomSheetDialog; -import android.support.v7.view.ContextThemeWrapper; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import androidx.appcompat.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt index 4e481a17..7957363d 100644 --- a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt +++ b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt @@ -1,7 +1,7 @@ package com.fastaccess.ui.base -import android.support.design.widget.NavigationView -import android.support.design.widget.TabLayout +import com.google.android.material.navigation.NavigationView +import com.google.android.material.tabs.TabLayout import android.view.View import android.widget.TextView import com.fastaccess.R diff --git a/app/src/main/java/com/fastaccess/ui/base/mvp/BaseMvp.java b/app/src/main/java/com/fastaccess/ui/base/mvp/BaseMvp.java index 18c769b8..fec3eb79 100644 --- a/app/src/main/java/com/fastaccess/ui/base/mvp/BaseMvp.java +++ b/app/src/main/java/com/fastaccess/ui/base/mvp/BaseMvp.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.base.mvp; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import com.fastaccess.ui.widgets.dialog.MessageDialogView; diff --git a/app/src/main/java/com/fastaccess/ui/base/mvp/presenter/BasePresenter.java b/app/src/main/java/com/fastaccess/ui/base/mvp/presenter/BasePresenter.java index bc209f93..41edf14a 100644 --- a/app/src/main/java/com/fastaccess/ui/base/mvp/presenter/BasePresenter.java +++ b/app/src/main/java/com/fastaccess/ui/base/mvp/presenter/BasePresenter.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.base.mvp.presenter; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import com.evernote.android.state.StateSaver; import com.fastaccess.R; @@ -21,7 +21,6 @@ import java.util.concurrent.TimeoutException; import io.reactivex.Observable; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Consumer; -import retrofit2.HttpException; /** diff --git a/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java b/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java index b70ca835..0f55f9b9 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/about/FastHubAboutActivity.java @@ -3,9 +3,9 @@ package com.fastaccess.ui.modules.about; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.view.MenuItem; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogBottomSheetDialog.java b/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogBottomSheetDialog.java index c3f8acae..6d972dce 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogBottomSheetDialog.java +++ b/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogBottomSheetDialog.java @@ -2,8 +2,8 @@ package com.fastaccess.ui.modules.changelog; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.ProgressBar; diff --git a/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogMvp.java b/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogMvp.java index 0245fc2f..b1f09f38 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/changelog/ChangelogMvp.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.changelog; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.fastaccess.ui.base.mvp.BaseMvp; diff --git a/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerActivity.java index 218a1741..35b8f128 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/code/CodeViewerActivity.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.Menu; import android.view.MenuItem; import android.webkit.MimeTypeMap; diff --git a/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.kt index e8ef9ac8..88929744 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.kt @@ -4,9 +4,9 @@ import android.annotation.SuppressLint import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.annotation.StringRes -import android.support.transition.TransitionManager -import android.support.v4.app.FragmentManager +import androidx.annotation.StringRes +import androidx.transition.TransitionManager +import androidx.fragment.app.FragmentManager import android.view.Menu import android.view.MenuItem import android.view.View @@ -39,8 +39,10 @@ class EditorActivity : BaseActivity(), EditorMv private var participants: ArrayList? = null private val sentFromFastHub: String by lazy { - "\n\n_" + getString(R.string.sent_from_fasthub, AppHelper.getDeviceName(), "", - "[" + getString(R.string.app_name) + "](https://play.google.com/store/apps/details?id=com.fastaccess.github)") + "_" + "\n\n_" + getString( + R.string.sent_from_fasthub, AppHelper.getDeviceName(), "", + "[" + getString(R.string.app_name) + "](https://play.google.com/store/apps/details?id=com.fastaccess.github)" + ) + "_" } @BindView(R.id.replyQuote) lateinit var replyQuote: LinearLayout @@ -76,9 +78,11 @@ class EditorActivity : BaseActivity(), EditorMv } else { quote.maxLines = 3 } - quote.setCompoundDrawablesWithIntrinsicBounds(0, 0, - if (quote.maxLines == 3) R.drawable.ic_arrow_drop_down - else R.drawable.ic_arrow_drop_up, 0) + quote.setCompoundDrawablesWithIntrinsicBounds( + 0, 0, + if (quote.maxLines == 3) R.drawable.ic_arrow_drop_down + else R.drawable.ic_arrow_drop_up, 0 + ) } override fun onCreate(savedInstanceState: Bundle?) { @@ -96,10 +100,12 @@ class EditorActivity : BaseActivity(), EditorMv override fun onSendResultAndFinish(commentModel: Comment, isNew: Boolean) { hideProgress() val intent = Intent() - intent.putExtras(Bundler.start() + intent.putExtras( + Bundler.start() .put(BundleConstant.ITEM, commentModel) .put(BundleConstant.EXTRA, isNew) - .end()) + .end() + ) setResult(Activity.RESULT_OK, intent) finish() } @@ -114,10 +120,12 @@ class EditorActivity : BaseActivity(), EditorMv override fun onSendReviewResultAndFinish(comment: EditReviewCommentModel, isNew: Boolean) { hideProgress() val intent = Intent() - intent.putExtras(Bundler.start() + intent.putExtras( + Bundler.start() .put(BundleConstant.ITEM, comment) .put(BundleConstant.EXTRA, isNew) - .end()) + .end() + ) setResult(Activity.RESULT_OK, intent) finish() } @@ -164,13 +172,15 @@ class EditorActivity : BaseActivity(), EditorMv override fun onBackPressed() { if (!InputHelper.isEmpty(editText)) { ViewHelper.hideKeyboard(editText) - MessageDialogView.newInstance(getString(R.string.close), getString(R.string.unsaved_data_warning), - Bundler.start() - .put("primary_extra", getString(R.string.discard)) - .put("secondary_extra", getString(R.string.cancel)) - .put(BundleConstant.EXTRA, true) - .end()) - .show(supportFragmentManager, MessageDialogView.TAG) + MessageDialogView.newInstance( + getString(R.string.close), getString(R.string.unsaved_data_warning), + Bundler.start() + .put("primary_extra", getString(R.string.discard)) + .put("secondary_extra", getString(R.string.cancel)) + .put(BundleConstant.EXTRA, true) + .end() + ) + .show(supportFragmentManager, MessageDialogView.TAG) return } @@ -203,28 +213,29 @@ class EditorActivity : BaseActivity(), EditorMv val intent = intent if (intent != null && intent.extras != null) { val bundle = intent.extras - extraType = bundle.getString(BundleConstant.EXTRA_TYPE) - reviewComment = bundle.getParcelable(BundleConstant.REVIEW_EXTRA) - itemId = bundle.getString(BundleConstant.ID) - login = bundle.getString(BundleConstant.EXTRA_TWO) + extraType = bundle?.getString(BundleConstant.EXTRA_TYPE) + reviewComment = bundle?.getParcelable(BundleConstant.REVIEW_EXTRA) + itemId = bundle?.getString(BundleConstant.ID) + login = bundle?.getString(BundleConstant.EXTRA_TWO) if (extraType.equals(BundleConstant.ExtraType.EDIT_COMMIT_COMMENT_EXTRA, ignoreCase = true) - || extraType.equals(BundleConstant.ExtraType.NEW_COMMIT_COMMENT_EXTRA, ignoreCase = true)) { - sha = bundle.getString(BundleConstant.EXTRA_THREE) + || extraType.equals(BundleConstant.ExtraType.NEW_COMMIT_COMMENT_EXTRA, ignoreCase = true) + ) { + sha = bundle?.getString(BundleConstant.EXTRA_THREE) } else { - issueNumber = bundle.getInt(BundleConstant.EXTRA_THREE) + issueNumber = bundle?.getInt(BundleConstant.EXTRA_THREE) ?: -1 } - commentId = bundle.getLong(BundleConstant.EXTRA_FOUR) - val textToUpdate = bundle.getString(BundleConstant.EXTRA) + commentId = bundle?.getLong(BundleConstant.EXTRA_FOUR) ?: -1 + val textToUpdate = bundle?.getString(BundleConstant.EXTRA) if (!InputHelper.isEmpty(textToUpdate)) { editText.setText(String.format("%s ", textToUpdate)) editText.setSelection(InputHelper.toString(editText).length) } - if (bundle.getString("message", "").isBlank()) { + if (bundle?.getString("message", "").isNullOrEmpty()) { replyQuote.visibility = GONE } else { - MarkDownProvider.setMdText(quote, bundle.getString("message", "")) + MarkDownProvider.setMdText(quote, bundle?.getString("message", "")) } - participants = bundle.getStringArrayList("participants") + participants = bundle?.getStringArrayList("participants") } } } \ No newline at end of file diff --git a/app/src/main/java/com/fastaccess/ui/modules/editor/comment/CommentEditorFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/editor/comment/CommentEditorFragment.kt index bfb552b8..42fe49e4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/editor/comment/CommentEditorFragment.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/editor/comment/CommentEditorFragment.kt @@ -5,8 +5,8 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.transition.TransitionManager -import android.support.v4.app.FragmentManager +import androidx.transition.TransitionManager +import androidx.fragment.app.FragmentManager import android.view.View import android.view.ViewGroup import android.widget.EditText @@ -68,7 +68,7 @@ class CommentEditorFragment : BaseFragment(RxBillingService.getInstance(this, BuildConfig.DEBUG) - .purchase(ProductType.IN_APP, productKey, "inapp:com.fastaccess.github:" + productKey)) - .subscribe({ _: Purchase?, throwable: Throwable? -> - if (throwable == null) { - FabricProvider.logPurchase(productKey, price, priceText) - showMessage(R.string.success, R.string.success_purchase_message) - enableProduct(productKey, applicationContext) - val intent = Intent() - intent.putExtra(BundleConstant.ITEM, productKey) - setResult(Activity.RESULT_OK, intent) - } else { - if (throwable is RxBillingServiceException) { - val code = throwable.code - if (code == RxBillingServiceError.ITEM_ALREADY_OWNED) { - enableProduct(productKey, applicationContext) - val intent = Intent() - intent.putExtra(BundleConstant.ITEM, productKey) - setResult(Activity.RESULT_OK, intent) - } else { - showErrorMessage(throwable.message!!) - Logger.e(code) - setResult(Activity.RESULT_CANCELED) - } + val bundle: Bundle? = intent?.extras + + val productKey = bundle?.getString(BundleConstant.EXTRA) + val price = bundle?.getLong(BundleConstant.EXTRA_FOUR, 0) + val priceText = bundle?.getString(BundleConstant.EXTRA_FIVE) + subscription = RxHelper.getSingle( + RxBillingService.getInstance(this, BuildConfig.DEBUG) + .purchase(ProductType.IN_APP, productKey, "inapp:com.fastaccess.github:$productKey") + ) + .subscribe { _: Purchase?, throwable: Throwable? -> + if (throwable == null) { + FabricProvider.logPurchase(productKey, price, priceText) + showMessage(R.string.success, R.string.success_purchase_message) + enableProduct(productKey, applicationContext) + val intent = Intent() + intent.putExtra(BundleConstant.ITEM, productKey) + setResult(Activity.RESULT_OK, intent) + } else { + if (throwable is RxBillingServiceException) { + val code = throwable.code + if (code == RxBillingServiceError.ITEM_ALREADY_OWNED) { + enableProduct(productKey, applicationContext) + val intent = Intent() + intent.putExtra(BundleConstant.ITEM, productKey) + setResult(Activity.RESULT_OK, intent) + } else { + showErrorMessage(throwable.message!!) + Logger.e(code) + setResult(Activity.RESULT_CANCELED) } - throwable.printStackTrace() } - finish() - }) + throwable.printStackTrace() + } + finish() + } } override fun onDestroy() { @@ -81,25 +84,29 @@ class DonateActivity : BaseActivity { diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java b/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java index 11588940..2bd4256f 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.main.donation; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.AppBarLayout; +import androidx.annotation.NonNull; +import com.google.android.material.appbar.AppBarLayout; import android.view.View; import com.fastaccess.App; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/drawer/MainDrawerFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/main/drawer/MainDrawerFragment.kt index 1976d8f8..1222e91b 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/drawer/MainDrawerFragment.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/main/drawer/MainDrawerFragment.kt @@ -2,7 +2,7 @@ package com.fastaccess.ui.modules.main.drawer import android.content.Intent import android.os.Bundle -import android.support.design.widget.NavigationView +import com.google.android.material.navigation.NavigationView import android.view.MenuItem import android.view.View import com.fastaccess.R diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesFragment.java b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesFragment.java index a46784cb..2a349bda 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesFragment.java @@ -2,10 +2,10 @@ package com.fastaccess.ui.modules.main.issues; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import com.evernote.android.state.State; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesMvp.java b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesMvp.java index 8981af77..57a999f6 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesMvp.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.main.issues; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.model.Issue; import com.fastaccess.data.dao.types.IssueState; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java index 50c4d55e..14f59bbe 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesPresenter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.main.issues; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.data.dao.model.Issue; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/issues/pager/MyIssuesPagerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/main/issues/pager/MyIssuesPagerFragment.java index d7ac22ab..5d3fe750 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/issues/pager/MyIssuesPagerFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/issues/pager/MyIssuesPagerFragment.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.modules.main.issues.pager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.ViewPager; import android.view.MenuInflater; import android.view.View; import android.widget.PopupMenu; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/notifications/FastHubNotificationDialog.kt b/app/src/main/java/com/fastaccess/ui/modules/main/notifications/FastHubNotificationDialog.kt index f53f4314..267b2120 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/notifications/FastHubNotificationDialog.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/main/notifications/FastHubNotificationDialog.kt @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.main.notifications import android.os.Bundle -import android.support.v4.app.FragmentManager +import androidx.fragment.app.FragmentManager import android.text.Html import android.view.View import butterknife.OnClick diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogFragment.java index f96e2e09..3210e4ac 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogFragment.java @@ -1,11 +1,11 @@ package com.fastaccess.ui.modules.main.orgs; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.widget.Toolbar; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogMvp.java b/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogMvp.java index 922b4262..1d1ef665 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogMvp.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.main.orgs; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.User; import com.fastaccess.ui.base.mvp.BaseMvp; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogPresenter.java index 392aae3e..4898dac5 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/orgs/OrgListDialogPresenter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.main.orgs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.model.User; import com.fastaccess.helper.PrefGetter; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/premium/GmsTaskListeners.java b/app/src/main/java/com/fastaccess/ui/modules/main/premium/GmsTaskListeners.java index e15fd70c..3e8664d4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/premium/GmsTaskListeners.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/premium/GmsTaskListeners.java @@ -1,6 +1,6 @@ package com.github.b3er.rxfirebase.common; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import io.reactivex.CompletableEmitter; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt index 36f791bf..d0b50a9e 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt @@ -5,7 +5,7 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.transition.TransitionManager +import androidx.transition.TransitionManager import android.view.View import android.widget.Button import android.widget.EditText diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestFragment.java b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestFragment.java index cadfef8d..99a93ce2 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestFragment.java @@ -2,10 +2,10 @@ package com.fastaccess.ui.modules.main.pullrequests; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import com.evernote.android.state.State; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsMvp.java b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsMvp.java index 3bf2bba1..a5039c96 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsMvp.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.main.pullrequests; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.model.PullRequest; import com.fastaccess.data.dao.types.IssueState; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsPresenter.java index 62ee0e90..2eebd742 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestsPresenter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.main.pullrequests; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.data.dao.model.Login; diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/pager/MyPullsPagerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/pager/MyPullsPagerFragment.java index 08efda43..0cca8ff8 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/pager/MyPullsPagerFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/pager/MyPullsPagerFragment.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.modules.main.pullrequests.pager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.ViewPager; import android.view.MenuInflater; import android.view.View; import android.widget.PopupMenu; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivity.java b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivity.java index 31821191..89b005b1 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivity.java @@ -2,10 +2,10 @@ package com.fastaccess.ui.modules.notification; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; import com.fastaccess.R; import com.fastaccess.data.dao.FragmentPagerAdapterModel; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsFragment.java b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsFragment.java index 5340e6e0..ee212016 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsFragment.java @@ -3,9 +3,9 @@ package com.fastaccess.ui.modules.notification.all; import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsMvp.java b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsMvp.java index 5b8297aa..281a2887 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsMvp.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.notification.all; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.GroupedNotificationModel; import com.fastaccess.data.dao.model.Notification; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java index ddfb9270..128eb8cd 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.notification.all; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/callback/OnNotificationChangedListener.java b/app/src/main/java/com/fastaccess/ui/modules/notification/callback/OnNotificationChangedListener.java index 1df8c5f0..80bd317d 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/callback/OnNotificationChangedListener.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/callback/OnNotificationChangedListener.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.notification.callback; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fastaccess.data.dao.GroupedNotificationModel; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationMvp.java b/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationMvp.java index 40fd70a4..61b38a45 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationMvp.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.notification.unread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.GroupedNotificationModel; import com.fastaccess.data.dao.model.Notification; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsFragment.java b/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsFragment.java index fb5962b6..84095873 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsFragment.java @@ -3,9 +3,9 @@ package com.fastaccess.ui.modules.notification.unread; import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsPresenter.java index 75ea175f..bdef53e7 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/notification/unread/UnreadNotificationsPresenter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.notification.unread; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/parser/LinksParserActivity.java b/app/src/main/java/com/fastaccess/ui/modules/parser/LinksParserActivity.java index f053f3d9..8fc1143c 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/parser/LinksParserActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/parser/LinksParserActivity.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.widget.Toast; import com.fastaccess.App; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposActivity.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposActivity.java index f32dfd4a..f6267c6f 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/PinnedReposActivity.java @@ -3,9 +3,9 @@ package com.fastaccess.ui.modules.pinned; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; import com.fastaccess.R; import com.fastaccess.data.dao.FragmentPagerAdapterModel; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistFragment.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistFragment.java index e599bdfe..6c07ea41 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistFragment.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.pinned.gist; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistMvp.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistMvp.java index a6db4ed5..089a79e0 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistMvp.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.pinned.gist; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.Gist; import com.fastaccess.ui.base.mvp.BaseMvp; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistPresenter.java index b2db040b..1b878524 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/gist/PinnedGistPresenter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.pinned.gist; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.fastaccess.data.dao.model.Gist; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueFragment.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueFragment.java index 2120c35e..550fadf3 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueFragment.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.pinned.issue; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueMvp.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueMvp.java index dd0dadd4..2d478538 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssueMvp.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.pinned.issue; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.Issue; import com.fastaccess.ui.base.mvp.BaseMvp; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssuePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssuePresenter.java index d2f2d1b3..7f423bd5 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssuePresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/issue/PinnedIssuePresenter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.pinned.issue; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.fastaccess.data.dao.model.Issue; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestFragment.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestFragment.java index 6ad0593c..2ddf26eb 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestFragment.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.pinned.pullrequest; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestMvp.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestMvp.java index 380275f1..ccbac215 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestMvp.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.pinned.pullrequest; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.PullRequest; import com.fastaccess.ui.base.mvp.BaseMvp; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestPresenter.java index df8687b9..c7c84942 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/pullrequest/PinnedPullRequestPresenter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.pinned.pullrequest; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.fastaccess.data.dao.model.PinnedPullRequests; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposFragment.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposFragment.java index 7de7aa9f..f64a2cc7 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposFragment.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.pinned.repo; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposMvp.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposMvp.java index b0d1b9ea..08e6bb43 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposMvp.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.pinned.repo; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.PinnedRepos; import com.fastaccess.ui.base.mvp.BaseMvp; diff --git a/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposPresenter.java index a924cb25..5b4e2cf4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/pinned/repo/PinnedReposPresenter.java @@ -1,6 +1,6 @@ package com.fastaccess.ui.modules.pinned.repo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.fastaccess.data.dao.model.AbstractPinnedRepos; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerFragment.java index 435bcae5..d172e7fe 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/ProfilePagerFragment.java @@ -1,16 +1,15 @@ package com.fastaccess.ui.modules.profile; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; import android.view.View; import com.fastaccess.R; import com.fastaccess.data.dao.FragmentPagerAdapterModel; import com.fastaccess.helper.BundleConstant; import com.fastaccess.helper.Bundler; -import com.fastaccess.helper.Logger; import com.fastaccess.ui.adapter.FragmentsPagerAdapter; import com.fastaccess.ui.base.BaseFragment; import com.fastaccess.ui.widgets.ViewPagerView; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersFragment.java index 2080cdc8..82a0c183 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersFragment.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.modules.profile.followers; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersMvp.java index 24625ec8..3b8c59b4 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersMvp.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.modules.profile.followers; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.model.User; import com.fastaccess.provider.rest.loadmore.OnLoadMore; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersPresenter.java index a9dfbd4c..ea45c400 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersPresenter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.profile.followers; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.data.dao.model.User; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingFragment.java index 3da3b821..5fe9654e 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingFragment.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.modules.profile.following; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingMvp.java index c21fa694..1249e8c1 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingMvp.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.modules.profile.following; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.model.User; import com.fastaccess.provider.rest.loadmore.OnLoadMore; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingPresenter.java index 8f75fd1d..443f7aa7 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingPresenter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.profile.following; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.data.dao.model.User; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsFragment.java index ab3e18d6..7f5ae1aa 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsFragment.java @@ -3,10 +3,10 @@ package com.fastaccess.ui.modules.profile.gists; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsMvp.java index b8a958f2..c0c484eb 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsMvp.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.profile.gists; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.model.Gist; import com.fastaccess.provider.rest.loadmore.OnLoadMore; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsPresenter.java index 44fda497..e098ccc7 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsPresenter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.profile.gists; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.annimon.stream.Stream; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewFragment.java index 75b9ce33..e9859f48 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewFragment.java @@ -2,10 +2,10 @@ package com.fastaccess.ui.modules.profile.org; import android.annotation.SuppressLint; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.transition.TransitionManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.transition.TransitionManager; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewMvp.java index fa661a15..1bc7ce54 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewMvp.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.profile.org; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.User; import com.fastaccess.ui.base.mvp.BaseMvp; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewPresenter.java index 6b3fb1cf..5146430b 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/OrgProfileOverviewPresenter.java @@ -1,8 +1,8 @@ package com.fastaccess.ui.modules.profile.org; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fastaccess.data.dao.model.User; import com.fastaccess.helper.BundleConstant; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersFragment.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersFragment.java index 027b040f..3655cec0 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersFragment.java @@ -1,10 +1,10 @@ package com.fastaccess.ui.modules.profile.org.members; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import com.fastaccess.R; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersMvp.java index 74d03018..ab60bfb0 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersMvp.java @@ -1,9 +1,9 @@ package com.fastaccess.ui.modules.profile.org.members; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fastaccess.data.dao.model.User; import com.fastaccess.provider.rest.loadmore.OnLoadMore; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersPresenter.java index c771193c..517386a1 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/members/OrgMembersPresenter.java @@ -1,7 +1,7 @@ package com.fastaccess.ui.modules.profile.org.members; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.fastaccess.data.dao.model.User; diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/org/project/OrgProjectActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/profile/org/project/OrgProjectActivity.kt index cd8e9a96..e81823d9 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/org/project/OrgProjectActivity.kt +++ b/app/src/main/java/com/fastaccess/ui/modules/profile/org/project/OrgProjectActivity.kt @@ -3,7 +3,7 @@ package com.fastaccess.ui.modules.profile.org.project import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.design.widget.AppBarLayout +import com.google.android.material.appbar.AppBarLayout import butterknife.BindView import com.evernote.android.state.State import com.fastaccess.R @@ -39,13 +39,15 @@ class OrgProjectActivity : BaseActivity(), RepoLicenseMvp.View, - PrettifyWebView.OnContentChangedListener { + PrettifyWebView.OnContentChangedListener { @State var content: String? = null @@ -32,10 +32,11 @@ class RepoLicenseBottomSheet : BaseMvpBottomSheetDialogFragment", "
")
+            val licenseText = license.replace(
+                "
", "
"
+            )
             webView.setGithubContent("
$licenseText
", null, false)
         } else {
             hideProgress()
@@ -46,9 +47,9 @@ class RepoLicenseBottomSheet : BaseMvpBottomSheetDialogFragment parentFragment as LockIssuePrCallback
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneDialogFragment.java
index ac723f18..164b9a0e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneDialogFragment.java
@@ -2,11 +2,11 @@ package com.fastaccess.ui.modules.repos.extras.milestone;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneMvp.java
index 62590d8b..e5cd49f9 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneMvp.java
@@ -1,7 +1,7 @@
 package com.fastaccess.ui.modules.repos.extras.milestone;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.MilestoneModel;
 import com.fastaccess.ui.base.mvp.BaseMvp;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestonePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestonePresenter.java
index 6325f9fe..992d9327 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestonePresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestonePresenter.java
@@ -1,6 +1,6 @@
 package com.fastaccess.ui.modules.repos.extras.milestone;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneDialogFragment.java
index 735e21bb..ce6e2343 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneDialogFragment.java
@@ -2,11 +2,11 @@ package com.fastaccess.ui.modules.repos.extras.milestone.create;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputEditText;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MotionEvent;
 import android.view.View;
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneMvp.java
index c7d1f696..33fdc4b6 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneMvp.java
@@ -1,7 +1,7 @@
 package com.fastaccess.ui.modules.repos.extras.milestone.create;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.MilestoneModel;
 import com.fastaccess.ui.base.mvp.BaseMvp;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestonePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestonePresenter.java
index 848e16d8..b83c9129 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestonePresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestonePresenter.java
@@ -1,7 +1,7 @@
 package com.fastaccess.ui.modules.repos.extras.milestone.create;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.R;
 import com.fastaccess.data.dao.CreateMilestoneModel;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/MilestoneDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/MilestoneDialogFragment.java
index 05afccb9..fd945436 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/MilestoneDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/MilestoneDialogFragment.java
@@ -2,8 +2,8 @@ package com.fastaccess.ui.modules.repos.extras.milestone.create;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscDialogFragment.java
index 477cf3e8..2d7096a5 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscDialogFragment.java
@@ -1,12 +1,12 @@
 package com.fastaccess.ui.modules.repos.extras.misc;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscMVp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscMVp.java
index 421823f6..b6d9850d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscMVp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscMVp.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.extras.misc;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.model.User;
 import com.fastaccess.provider.rest.loadmore.OnLoadMore;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscPresenter.java
index 69787266..e1aa6c58 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/misc/RepoMiscPresenter.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.extras.misc;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import com.fastaccess.data.dao.Pageable;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupFragment.java
index 6e5b84da..819401f3 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupFragment.java
@@ -2,12 +2,12 @@ package com.fastaccess.ui.modules.repos.extras.popup;
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupMvp.java
index 48656dac..7fd54ea1 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupMvp.java
@@ -1,6 +1,6 @@
 package com.fastaccess.ui.modules.repos.extras.popup;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fastaccess.ui.base.mvp.BaseMvp;
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java
index 7aa24dab..c726b254 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java
@@ -1,6 +1,6 @@
 package com.fastaccess.ui.modules.repos.extras.popup;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fastaccess.data.dao.CommentRequestModel;
 import com.fastaccess.provider.rest.RestProvider;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/git/EditRepoFileActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/git/EditRepoFileActivity.kt
index 89483a57..397a5a0a 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/git/EditRepoFileActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/git/EditRepoFileActivity.kt
@@ -5,9 +5,9 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
+import com.google.android.material.textfield.TextInputLayout
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/git/delete/DeleteFileBottomSheetFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/git/delete/DeleteFileBottomSheetFragment.kt
index 27f603b1..1a95b3d3 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/git/delete/DeleteFileBottomSheetFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/git/delete/DeleteFileBottomSheetFragment.kt
@@ -2,7 +2,7 @@ package com.fastaccess.ui.modules.repos.git.delete
 
 import android.content.Context
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
+import com.google.android.material.textfield.TextInputLayout
 import android.view.View
 import butterknife.BindView
 import butterknife.OnClick
@@ -37,7 +37,7 @@ class DeleteFileBottomSheetFragment : BaseBottomSheetDialog() {
     @OnClick(R.id.cancel)
     fun onCancel() = dismiss()
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         super.onAttach(context)
         if (parentFragment is DeleteContentFileCallback) {
             deleteCallback = parentFragment as DeleteContentFileCallback
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerFragment.java
index 63a8c197..42d842be 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerFragment.java
@@ -2,10 +2,10 @@ package com.fastaccess.ui.modules.repos.issues;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerMvp.java
index 2fc218cb..f0311015 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/RepoIssuesPagerMvp.java
@@ -1,6 +1,6 @@
 package com.fastaccess.ui.modules.repos.issues;
 
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 
 import com.fastaccess.ui.base.mvp.BaseMvp;
 import com.fastaccess.ui.modules.repos.RepoPagerMvp;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueActivity.java
index 1b121fec..4fc2a5ea 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueActivity.java
@@ -5,12 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.transition.TransitionManager;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.transition.TransitionManager;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueMvp.java
index 7740da18..beef1a0a 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssueMvp.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.issues.create;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.LabelModel;
 import com.fastaccess.data.dao.MilestoneModel;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssuePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssuePresenter.java
index 4452103f..df511abe 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssuePresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/create/CreateIssuePresenter.java
@@ -2,8 +2,8 @@ package com.fastaccess.ui.modules.repos.issues.create;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesFragment.java
index d2efa78d..ea540b19 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesFragment.java
@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesMvp.java
index 5b42cb88..19499249 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesMvp.java
@@ -1,9 +1,9 @@
 package com.fastaccess.ui.modules.repos.issues.issue;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.fastaccess.data.dao.PullsIssuesParser;
 import com.fastaccess.data.dao.model.Issue;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesPresenter.java
index 6159c550..eaa31f40 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoIssuesPresenter.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.issues.issue;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import com.annimon.stream.Stream;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesFragment.java
index 875262c0..24b7a5ff 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesFragment.java
@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java
index ca1081be..7bad8224 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerActivity.java
@@ -3,12 +3,12 @@ package com.fastaccess.ui.modules.repos.issues.issue.details;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java
index 1b75f173..b781cade 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerMvp.java
@@ -2,8 +2,8 @@ package com.fastaccess.ui.modules.repos.issues.issue.details;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.LabelModel;
 import com.fastaccess.data.dao.MilestoneModel;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java
index bd44d5c0..f894621f 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/IssuePagerPresenter.java
@@ -2,8 +2,8 @@ package com.fastaccess.ui.modules.repos.issues.issue.details;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.annimon.stream.Collectors;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineFragment.java
index 3c83d392..3f0103d0 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineFragment.java
@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.view.View;
 
 import com.evernote.android.state.State;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineMvp.java
index 77d70940..ef6029c4 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineMvp.java
@@ -1,10 +1,10 @@
 package com.fastaccess.ui.modules.repos.issues.issue.details.timeline;
 
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.fastaccess.data.dao.TimelineModel;
 import com.fastaccess.data.dao.model.Comment;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java
index 153fbd1f..836b71e5 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java
@@ -3,8 +3,8 @@ package com.fastaccess.ui.modules.repos.issues.issue.details.timeline;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.PopupMenu;
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/projects/RepoProjectsFragmentPager.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/projects/RepoProjectsFragmentPager.kt
index b6b3ccf6..7ab086d8 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/projects/RepoProjectsFragmentPager.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/projects/RepoProjectsFragmentPager.kt
@@ -1,7 +1,7 @@
 package com.fastaccess.ui.modules.repos.projects
 
 import android.os.Bundle
-import android.support.design.widget.TabLayout
+import com.google.android.material.tabs.TabLayout
 import android.view.View
 import butterknife.BindView
 import com.fastaccess.R
@@ -37,15 +37,21 @@ class RepoProjectsFragmentPager : BaseFragment?
-            counts?.let {
-                if (!it.isEmpty()) it.onEach { updateCount(it) }
-            }
+            counts?.let { counts -> if (counts.isNotEmpty()) counts.onEach { updateCount(it) } }
         } else {
             counts = hashSetOf()
         }
@@ -64,11 +70,11 @@ class RepoProjectsFragmentPager : BaseFragment parentFragment as ProjectPagerMvp.DeletePageListener
@@ -62,23 +62,25 @@ class ProjectColumnFragment : BaseFragment(presenter)
         }
-        onLoadMore!!.parameter = getColumn().id
+        onLoadMore?.parameter = getColumn()?.id
         return onLoadMore!!
     }
 
@@ -108,23 +110,24 @@ class ProjectColumnFragment : BaseFragment
+            columnName.text = column.name
+            refresh.setOnRefreshListener { presenter.onCallApi(1, column.id) }
+            stateLayout.setOnReloadListener { presenter.onCallApi(1, column.id) }
+            stateLayout.setEmptyText(R.string.no_cards)
+            recycler.setEmptyView(stateLayout, refresh)
+            getLoadMore().initialize(presenter.currentPage, presenter.previousTotal)
+            adapter.listener = presenter
+            recycler.adapter = adapter
+            recycler.addOnScrollListener(getLoadMore())
+            fastScroller.attachRecyclerView(recycler)
+            if (presenter.getCards().isEmpty() && !presenter.isApiCalled) {
+                presenter.onCallApi(1, column.id)
+            }
+            addCard.visibility = if (isOwner()) View.VISIBLE else View.GONE
+            deleteColumn.visibility = if (isOwner()) View.VISIBLE else View.GONE
+            editColumn.visibility = if (isOwner()) View.VISIBLE else View.GONE
         }
-        addCard.visibility = if(isOwner()) View.VISIBLE else View.GONE
-        deleteColumn.visibility = if(isOwner()) View.VISIBLE else View.GONE
-        editColumn.visibility = if(isOwner()) View.VISIBLE else View.GONE
     }
 
     override fun showProgress(@StringRes resId: Int) {
@@ -161,10 +164,10 @@ class ProjectColumnFragment : BaseFragment(), ProjectPage
         val repoId = repoId
         if (repoId != null && !repoId.isNullOrBlank()) {
             makeRestCall(Observable.zip(RestProvider.getProjectsService(isEnterprise).getProjectColumns(projectId),
-                    RestProvider.getRepoService(isEnterprise).isCollaborator(login, repoId, Login.getUser().login),
-                    BiFunction { items: Pageable, response: Response ->
-                        viewerCanUpdate = response.code() == 204
-                        return@BiFunction items
-                    })
-                    .flatMap {
-                        if (it.items != null) {
-                            return@flatMap Observable.just(it.items)
-                        }
-                        return@flatMap Observable.just(listOf())
-                    },
-                    { t ->
-                        columns.clear()
-                        columns.addAll(t)
-                        sendToView { it.onInitPager(columns) }
-                    })
+                RestProvider.getRepoService(isEnterprise).isCollaborator(login, repoId, Login.getUser().login),
+                BiFunction { items: Pageable, response: Response ->
+                    viewerCanUpdate = response.code() == 204
+                    return@BiFunction items
+                })
+                .flatMap {
+                    if (it.items != null) {
+                        return@flatMap Observable.just(it.items)
+                    }
+                    return@flatMap Observable.just(listOf())
+                }) { t ->
+                columns.clear()
+                columns.addAll(t)
+                sendToView { it.onInitPager(columns) }
+            }
         } else {
             makeRestCall(RestProvider.getProjectsService(isEnterprise).getProjectColumns(projectId)
-                    .flatMap {
-                        if (it.items != null) {
-                            return@flatMap Observable.just(it.items)
-                        }
-                        return@flatMap Observable.just(listOf())
-                    },
-                    { t ->
-                        columns.clear()
-                        columns.addAll(t)
-                        sendToView { it.onInitPager(columns) }
-                    })
+                .flatMap {
+                    if (it.items != null) {
+                        return@flatMap Observable.just(it.items)
+                    }
+                    return@flatMap Observable.just(listOf())
+                }) { t ->
+                columns.clear()
+                columns.addAll(t)
+                sendToView { it.onInitPager(columns) }
+            }
         }
     }
 
@@ -74,7 +72,7 @@ class ProjectPagerPresenter : BasePresenter(), ProjectPage
             it.extras?.let {
                 projectId = it.getLong(BundleConstant.ID)
                 repoId = it.getString(BundleConstant.ITEM)
-                login = it.getString(BundleConstant.EXTRA)
+                login = it.getString(BundleConstant.EXTRA) ?: ""
             }
         }
         if (columns.isEmpty()) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/projects/list/RepoProjectFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/projects/list/RepoProjectFragment.kt
index 3fb414dc..ba936b2f 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/projects/list/RepoProjectFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/projects/list/RepoProjectFragment.kt
@@ -2,8 +2,8 @@ package com.fastaccess.ui.modules.repos.projects.list
 
 import android.content.Context
 import android.os.Bundle
-import android.support.annotation.StringRes
-import android.support.v4.widget.SwipeRefreshLayout
+import androidx.annotation.StringRes
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import android.view.View
 import butterknife.BindView
 import com.fastaccess.R
@@ -33,7 +33,7 @@ class RepoProjectFragment : BaseFragment(), RepoProjectMv
     override fun onFragmentCreate(bundle: Bundle?) {
         bundle?.let {
             repoId = it.getString(BundleConstant.ID)
-            login = it.getString(BundleConstant.EXTRA)
+            login = it.getString(BundleConstant.EXTRA) ?: ""
         }
     }
 
@@ -74,145 +74,151 @@ class RepoProjectPresenter : BasePresenter(), RepoProjectMv
         if (repoId != null && !repoId.isNullOrBlank()) {
             if (parameter == IssueState.open) {
                 val query = RepoProjectsOpenQuery.builder()
-                        .name(repoId)
-                        .owner(login)
-                        .page(getPage())
-                        .build()
+                    .name(repoId)
+                    .owner(login)
+                    .page(getPage())
+                    .build()
                 makeRestCall(Rx2Apollo.from(apollo.query(query))
-                        .flatMap {
-                            val list = arrayListOf()
-                            it.data()?.repository()?.let {
-                                it.projects().let {
-                                    lastPage = if (it.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
-                                    pages.clear()
-                                    count = it.totalCount()
-                                    it.edges()?.let {
-                                        pages.addAll(it.map { it.cursor() })
-                                    }
-                                    it.nodes()?.let {
-                                        list.addAll(it)
-                                    }
+                    .flatMap { response ->
+                        val list = arrayListOf()
+                        response.data()?.repository()?.let { repos ->
+                            repos.projects().let {
+                                lastPage = if (it.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
+                                pages.clear()
+                                count = it.totalCount()
+                                it.edges()?.let {
+                                    pages.addAll(it.map { it.cursor() })
+                                }
+                                it.nodes()?.let {
+                                    list.addAll(it)
                                 }
                             }
-                            return@flatMap Observable.just(list)
-                        },
-                        {
-                            sendToView({ v ->
-                                v.onNotifyAdapter(it, page)
-                                if (page == 1) v.onChangeTotalCount(count)
-                            })
-                        })
+                        }
+                        return@flatMap Observable.just(list)
+                    }
+                ) {
+                    sendToView { v ->
+                        v.onNotifyAdapter(it, page)
+                        if (page == 1) v.onChangeTotalCount(count)
+                    }
+                }
             } else {
                 val query = RepoProjectsClosedQuery.builder()
-                        .name(repoId)
-                        .owner(login)
-                        .page(getPage())
-                        .build()
+                    .name(repoId)
+                    .owner(login)
+                    .page(getPage())
+                    .build()
                 makeRestCall(Rx2Apollo.from(apollo.query(query))
-                        .flatMap {
-                            val list = arrayListOf()
-                            it.data()?.repository()?.let {
-                                it.projects().let {
-                                    lastPage = if (it.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
-                                    pages.clear()
-                                    count = it.totalCount()
-                                    it.edges()?.let {
-                                        pages.addAll(it.map { it.cursor() })
-                                    }
-                                    it.nodes()?.let {
-                                        val toConvert = arrayListOf()
-                                        it.onEach {
-                                            val columns = RepoProjectsOpenQuery.Columns(it.columns().__typename(), it.columns().totalCount())
-                                            val node = RepoProjectsOpenQuery.Node(it.__typename(), it.name(), it.number(), it.body(),
-                                                    it.createdAt(), it.id(), it.viewerCanUpdate(), columns, it.databaseId())
-                                            toConvert.add(node)
-                                        }
-                                        list.addAll(toConvert)
+                    .flatMap { response ->
+                        val list = arrayListOf()
+                        response.data()?.repository()?.let { repository ->
+                            repository.projects().let { projects1 ->
+                                lastPage = if (projects1.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
+                                pages.clear()
+                                count = projects1.totalCount()
+                                projects1.edges()?.let { edges ->
+                                    pages.addAll(edges.map { it.cursor() })
+                                }
+                                projects1.nodes()?.let { nodesList ->
+                                    val toConvert = arrayListOf()
+                                    nodesList.onEach {
+                                        val columns = RepoProjectsOpenQuery.Columns(it.columns().__typename(), it.columns().totalCount())
+                                        val node = RepoProjectsOpenQuery.Node(
+                                            it.__typename(), it.name(), it.number(), it.body(),
+                                            it.createdAt(), it.id(), it.viewerCanUpdate(), columns, it.databaseId()
+                                        )
+                                        toConvert.add(node)
                                     }
+                                    list.addAll(toConvert)
                                 }
                             }
-                            return@flatMap Observable.just(list)
-                        },
-                        {
-                            sendToView({ v ->
-                                v.onNotifyAdapter(it, page)
-                                if (page == 1) v.onChangeTotalCount(count)
-                            })
-                        })
+                        }
+                        return@flatMap Observable.just(list)
+                    }
+                ) {
+                    sendToView { v ->
+                        v.onNotifyAdapter(it, page)
+                        if (page == 1) v.onChangeTotalCount(count)
+                    }
+                }
             }
         } else {
             if (parameter == IssueState.open) {
                 val query = OrgProjectsOpenQuery.builder()
-                        .owner(login)
-                        .page(getPage())
-                        .build()
+                    .owner(login)
+                    .page(getPage())
+                    .build()
                 makeRestCall(Rx2Apollo.from(apollo.query(query))
-                        .flatMap {
-                            val list = arrayListOf()
-                            it.data()?.organization()?.let {
-                                it.projects().let {
-                                    lastPage = if (it.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
-                                    pages.clear()
-                                    count = it.totalCount()
-                                    it.edges()?.let {
-                                        pages.addAll(it.map { it.cursor() })
-                                    }
-                                    it.nodes()?.let {
-                                        val toConvert = arrayListOf()
-                                        it.onEach {
-                                            val columns = RepoProjectsOpenQuery.Columns(it.columns().__typename(), it.columns().totalCount())
-                                            val node = RepoProjectsOpenQuery.Node(it.__typename(), it.name(), it.number(), it.body(),
-                                                    it.createdAt(), it.id(), it.viewerCanUpdate(), columns, it.databaseId())
-                                            toConvert.add(node)
-                                        }
-                                        list.addAll(toConvert)
+                    .flatMap {
+                        val list = arrayListOf()
+                        it.data()?.organization()?.let {
+                            it.projects().let {
+                                lastPage = if (it.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
+                                pages.clear()
+                                count = it.totalCount()
+                                it.edges()?.let {
+                                    pages.addAll(it.map { it.cursor() })
+                                }
+                                it.nodes()?.let {
+                                    val toConvert = arrayListOf()
+                                    it.onEach {
+                                        val columns = RepoProjectsOpenQuery.Columns(it.columns().__typename(), it.columns().totalCount())
+                                        val node = RepoProjectsOpenQuery.Node(
+                                            it.__typename(), it.name(), it.number(), it.body(),
+                                            it.createdAt(), it.id(), it.viewerCanUpdate(), columns, it.databaseId()
+                                        )
+                                        toConvert.add(node)
                                     }
+                                    list.addAll(toConvert)
                                 }
                             }
-                            return@flatMap Observable.just(list)
-                        },
-                        {
-                            sendToView({ v ->
-                                v.onNotifyAdapter(it, page)
-                                if (page == 1) v.onChangeTotalCount(count)
-                            })
-                        })
+                        }
+                        return@flatMap Observable.just(list)
+                    }
+                ) {
+                    sendToView { v ->
+                        v.onNotifyAdapter(it, page)
+                        if (page == 1) v.onChangeTotalCount(count)
+                    }
+                }
             } else {
                 val query = OrgProjectsClosedQuery.builder()
-                        .owner(login)
-                        .page(getPage())
-                        .build()
+                    .owner(login)
+                    .page(getPage())
+                    .build()
                 makeRestCall(Rx2Apollo.from(apollo.query(query))
-                        .flatMap {
-                            val list = arrayListOf()
-                            it.data()?.organization()?.let {
-                                it.projects().let {
-                                    lastPage = if (it.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
-                                    pages.clear()
-                                    count = it.totalCount()
-                                    it.edges()?.let {
-                                        pages.addAll(it.map { it.cursor() })
-                                    }
-                                    it.nodes()?.let {
-                                        val toConvert = arrayListOf()
-                                        it.onEach {
-                                            val columns = RepoProjectsOpenQuery.Columns(it.columns().__typename(), it.columns().totalCount())
-                                            val node = RepoProjectsOpenQuery.Node(it.__typename(), it.name(), it.number(), it.body(),
-                                                    it.createdAt(), it.id(), it.viewerCanUpdate(), columns, it.databaseId())
-                                            toConvert.add(node)
-                                        }
-                                        list.addAll(toConvert)
+                    .flatMap {
+                        val list = arrayListOf()
+                        it.data()?.organization()?.let {
+                            it.projects().let {
+                                lastPage = if (it.pageInfo().hasNextPage()) Int.MAX_VALUE else 0
+                                pages.clear()
+                                count = it.totalCount()
+                                it.edges()?.let {
+                                    pages.addAll(it.map { it.cursor() })
+                                }
+                                it.nodes()?.let {
+                                    val toConvert = arrayListOf()
+                                    it.onEach {
+                                        val columns = RepoProjectsOpenQuery.Columns(it.columns().__typename(), it.columns().totalCount())
+                                        val node = RepoProjectsOpenQuery.Node(
+                                            it.__typename(), it.name(), it.number(), it.body(),
+                                            it.createdAt(), it.id(), it.viewerCanUpdate(), columns, it.databaseId()
+                                        )
+                                        toConvert.add(node)
                                     }
+                                    list.addAll(toConvert)
                                 }
                             }
-                            return@flatMap Observable.just(list)
-                        },
-                        {
-                            sendToView({ v ->
-                                v.onNotifyAdapter(it, page)
-                                if (page == 1) v.onChangeTotalCount(count)
-                            })
-                        })
+                        }
+                        return@flatMap Observable.just(list)
+                    }
+                ) {
+                    sendToView { v ->
+                        v.onNotifyAdapter(it, page)
+                        if (page == 1) v.onChangeTotalCount(count)
+                    }
+                }
             }
         }
         return true
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerFragment.java
index 11bb369f..e96a34f6 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerFragment.java
@@ -2,10 +2,10 @@ package com.fastaccess.ui.modules.repos.pull_requests;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerMvp.java
index 1eee1f77..4699f18b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/RepoPullRequestPagerMvp.java
@@ -1,6 +1,6 @@
 package com.fastaccess.ui.modules.repos.pull_requests;
 
-import android.support.annotation.IntRange;
+import androidx.annotation.IntRange;
 
 import com.fastaccess.ui.base.mvp.BaseMvp;
 import com.fastaccess.ui.modules.repos.RepoPagerMvp;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestFragment.java
index b331035c..8931b18e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestFragment.java
@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestMvp.java
index c835e0e5..bee29465 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestMvp.java
@@ -1,9 +1,9 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.fastaccess.data.dao.PullsIssuesParser;
 import com.fastaccess.data.dao.model.PullRequest;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestPresenter.java
index 42fb9c68..5cc7ac5d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestPresenter.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import com.fastaccess.data.dao.PullsIssuesParser;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java
index 422498e3..63f0918b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerActivity.java
@@ -3,14 +3,14 @@ package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.CardView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.cardview.widget.CardView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java
index 5e8acfc4..84800292 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerMvp.java
@@ -3,8 +3,8 @@ package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.LabelModel;
 import com.fastaccess.data.dao.MilestoneModel;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java
index d53b8801..db383c68 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/PullRequestPagerPresenter.java
@@ -3,8 +3,8 @@ package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.annimon.stream.Collectors;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsFragment.java
index a8dd48f7..1ffd7e19 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsFragment.java
@@ -1,10 +1,10 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.commits;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsMvp.java
index 6c9316b9..f04f6a36 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsMvp.java
@@ -1,9 +1,9 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.commits;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.fastaccess.data.dao.model.Commit;
 import com.fastaccess.provider.rest.loadmore.OnLoadMore;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsPresenter.java
index 28e96c4b..d8765e47 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsPresenter.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.commits;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import com.fastaccess.data.dao.model.Commit;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesFragment.java
index 178e505c..59f02f7b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesFragment.java
@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.View;
 
 import com.evernote.android.state.State;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesMvp.java
index a75bc1d1..633db903 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesMvp.java
@@ -1,9 +1,9 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.files;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.fastaccess.data.dao.CommentRequestModel;
 import com.fastaccess.data.dao.CommitFileChanges;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesPresenter.java
index 4f3d126e..7c00fd68 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/PullRequestFilesPresenter.java
@@ -3,8 +3,8 @@ package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.files
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.MenuInflater;
 import android.view.View;
 import android.widget.PopupMenu;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/fullscreen/FullScreenFileChangeActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/fullscreen/FullScreenFileChangeActivity.kt
index 99f13ce3..7ad7685c 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/fullscreen/FullScreenFileChangeActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/files/fullscreen/FullScreenFileChangeActivity.kt
@@ -4,8 +4,8 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.widget.SwipeRefreshLayout
+import androidx.fragment.app.Fragment
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineFragment.java
index 09cb51ac..b55ecd51 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineFragment.java
@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.view.View;
 
 import com.evernote.android.state.State;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineMvp.java
index b2a4246f..e440250b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelineMvp.java
@@ -1,10 +1,10 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.timeline.timeline;
 
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.fastaccess.data.dao.EditReviewCommentModel;
 import com.fastaccess.data.dao.ReviewCommentModel;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelinePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelinePresenter.java
index aa7e72a5..102d0951 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelinePresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/timeline/timeline/PullRequestTimelinePresenter.java
@@ -3,8 +3,8 @@ package com.fastaccess.ui.modules.repos.pull_requests.pull_request.details.timel
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.SparseArray;
 import android.view.View;
 import android.widget.PopupMenu;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullReqeustMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullReqeustMvp.java
index 9b0e45c5..8daff5d5 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullReqeustMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullReqeustMvp.java
@@ -1,6 +1,6 @@
 package com.fastaccess.ui.modules.repos.pull_requests.pull_request.merge;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fastaccess.ui.base.mvp.BaseMvp;
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullRequestDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullRequestDialogFragment.java
index 9ee81a7b..231113b0 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullRequestDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/merge/MergePullRequestDialogFragment.java
@@ -2,10 +2,10 @@ package com.fastaccess.ui.modules.repos.pull_requests.pull_request.merge;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.AppCompatSpinner;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.appcompat.widget.AppCompatSpinner;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogFragment.java
index 691c7f82..c39d9981 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogFragment.java
@@ -1,11 +1,11 @@
 package com.fastaccess.ui.modules.repos.reactions;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogMvp.java b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogMvp.java
index f840e12b..87ed349e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogMvp.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogMvp.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.reactions;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.model.User;
 import com.fastaccess.provider.rest.loadmore.OnLoadMore;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogPresenter.java
index 8032c665..2bd4bb95 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/reactions/ReactionsDialogPresenter.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.modules.repos.reactions;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
index 48091ebc..ed869ea6 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.support.design.widget.NavigationView
-import android.support.v4.widget.DrawerLayout
+import com.google.android.material.navigation.NavigationView
+import androidx.drawerlayout.widget.DrawerLayout
 import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
diff --git a/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt
index f98a14f3..baa17f83 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt
@@ -3,8 +3,8 @@ package com.fastaccess.ui.modules.reviews
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.Toolbar
+import androidx.core.content.ContextCompat
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.widget.TextView
 import butterknife.BindView
@@ -37,7 +37,7 @@ class AddReviewDialogFragment : BaseDialogFragment(BundleConstant.ITEM)
-        lineNo.text = SpannableBuilder.builder()
+        arguments?.getParcelable(BundleConstant.ITEM)?.let { item ->
+            lineNo.text = SpannableBuilder.builder()
                 .append(if (item.leftLineNo >= 0) String.format("%s.", item.leftLineNo) else "")
                 .append(if (item.rightLineNo >= 0) String.format("%s.", item.rightLineNo) else "")
-        lineNo.visibility = if (InputHelper.isEmpty(lineNo)) View.GONE else View.VISIBLE
+            lineNo.visibility = if (InputHelper.isEmpty(lineNo)) View.GONE else View.VISIBLE
 
-        val context = context ?: return
-        when (item.color) {
-            CommitLinesModel.ADDITION -> textView.setBackgroundColor(ViewHelper.getPatchAdditionColor(context))
-            CommitLinesModel.DELETION -> textView.setBackgroundColor(ViewHelper.getPatchDeletionColor(context))
-            CommitLinesModel.PATCH -> textView.setBackgroundColor(ViewHelper.getPatchRefColor(context))
-            else -> textView.setBackgroundColor(Color.TRANSPARENT)
-        }
-        if (item.noNewLine) {
-            textView.text = SpannableBuilder.builder().append(item.text.replace(spacePattern, " ")).append(" ")
-                    .append(ContextCompat.getDrawable(context, R.drawable.ic_newline))
-        } else {
-            textView.text = item.text.replace(spacePattern, " ")
-        }
-        toolbar.setTitle(R.string.add_comment)
-        toolbar.setNavigationIcon(R.drawable.ic_clear)
-        toolbar.setNavigationOnClickListener { dismiss() }
-        toolbar.inflateMenu(R.menu.add_menu)
-        toolbar.setOnMenuItemClickListener {
-            if (commentEditorFragment?.getEditText()?.text.isNullOrEmpty()) {
-                commentEditorFragment?.getEditText()?.error = getString(R.string.required_field)
-            } else {
-                commentEditorFragment?.getEditText()?.error = null
-                commentCallback?.onCommentAdded(InputHelper.toString(commentEditorFragment?.getEditText()?.text),
-                        item, arguments!!.getBundle(BundleConstant.EXTRA))
-                dismiss()
+            val context = context ?: return
+            when (item.color) {
+                CommitLinesModel.ADDITION -> textView.setBackgroundColor(ViewHelper.getPatchAdditionColor(context))
+                CommitLinesModel.DELETION -> textView.setBackgroundColor(ViewHelper.getPatchDeletionColor(context))
+                CommitLinesModel.PATCH -> textView.setBackgroundColor(ViewHelper.getPatchRefColor(context))
+                else -> textView.setBackgroundColor(Color.TRANSPARENT)
+            }
+            if (item.noNewLine) {
+                textView.text = SpannableBuilder.builder().append(item.text.replace(spacePattern, " ")).append(" ")
+                    .append(ContextCompat.getDrawable(context, R.drawable.ic_newline))
+            } else {
+                textView.text = item.text.replace(spacePattern, " ")
+            }
+            toolbar.setTitle(R.string.add_comment)
+            toolbar.setNavigationIcon(R.drawable.ic_clear)
+            toolbar.setNavigationOnClickListener { dismiss() }
+            toolbar.inflateMenu(R.menu.add_menu)
+            toolbar.setOnMenuItemClickListener {
+                if (commentEditorFragment?.getEditText()?.text.isNullOrEmpty()) {
+                    commentEditorFragment?.getEditText()?.error = getString(R.string.required_field)
+                } else {
+                    commentEditorFragment?.getEditText()?.error = null
+                    commentCallback?.onCommentAdded(
+                        InputHelper.toString(commentEditorFragment?.getEditText()?.text),
+                        item, arguments!!.getBundle(BundleConstant.EXTRA)
+                    )
+                    dismiss()
+                }
+                return@setOnMenuItemClickListener true
             }
-            return@setOnMenuItemClickListener true
         }
+
     }
 
     override fun providePresenter(): BasePresenter = BasePresenter()
@@ -103,9 +107,9 @@ class AddReviewDialogFragment : BaseDialogFragment
             if (!canPlaySound) return@setOnCheckedChangeListener
             val sound = radioGroup.getChildAt(id).tag as NotificationSoundModel
-            if (mediaPlayer.isPlaying) mediaPlayer.stop()
+            if (mediaPlayer.isPlaying) {
+                mediaPlayer.stop()
+            }
             mediaPlayer.reset()
-            mediaPlayer.setDataSource(context, sound.uri)
-            mediaPlayer.prepare()
-            mediaPlayer.start()
+            sound.uri?.let {
+                mediaPlayer.setDataSource(requireContext(), it)
+                mediaPlayer.prepare()
+                mediaPlayer.start()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt
index 0e79bf0b..1a01bd96 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt
@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.support.design.widget.FloatingActionButton
-import android.support.v7.widget.Toolbar
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import androidx.appcompat.widget.Toolbar
 import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
 import android.view.View
@@ -37,7 +37,7 @@ class ThemeFragment : BaseFragment(context, android.R.layout.simple_list_item_1,
-                    android.R.id.text1, mentions.subList(0, Math.min(mentions.size, 3)))
+            val mentions = it.filter {
+                it.toLowerCase(Locale.getDefault())
+                    .startsWith(
+                        mentioning.replace("@", "").toLowerCase(Locale.getDefault())
+                    )
+            }
+            val adapter = ArrayAdapter(
+                context, android.R.layout.simple_list_item_1,
+                android.R.id.text1, mentions.subList(0, Math.min(mentions.size, 3))
+            )
             mention?.setAdapter(adapter)
         }
     }
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java
index a364590e..405d4636 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java
@@ -1,10 +1,10 @@
 package com.fastaccess.ui.widgets.recyclerview;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java
index 6f4b3d9a..80a3e5d4 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java
@@ -1,9 +1,9 @@
 package com.fastaccess.ui.widgets.recyclerview;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BottomPaddingDecoration.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BottomPaddingDecoration.java
index 8a1ab7d2..f64b5560 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BottomPaddingDecoration.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BottomPaddingDecoration.java
@@ -2,11 +2,11 @@ package com.fastaccess.ui.widgets.recyclerview;
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.View;
 
 import com.fastaccess.R;
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java
index b7df17ba..29b31c04 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java
@@ -2,12 +2,12 @@ package com.fastaccess.ui.widgets.recyclerview;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/InsetDividerDecoration.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/InsetDividerDecoration.java
index 991ecfc6..17677ee7 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/InsetDividerDecoration.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/InsetDividerDecoration.java
@@ -3,10 +3,10 @@ package com.fastaccess.ui.widgets.recyclerview;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/ProgressBarViewHolder.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/ProgressBarViewHolder.java
index a34127c0..845cf9b2 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/ProgressBarViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/ProgressBarViewHolder.java
@@ -1,6 +1,6 @@
 package com.fastaccess.ui.widgets.recyclerview;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/GridManager.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/GridManager.java
index 9f3cc68f..5da83d04 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/GridManager.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/GridManager.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.widgets.recyclerview.layout_manager;
 
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 
 /**
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/LinearManager.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/LinearManager.java
index 2d830d36..60806a83 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/LinearManager.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/LinearManager.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.widgets.recyclerview.layout_manager;
 
 import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 
 /**
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/StaggeredManager.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/StaggeredManager.java
index 46a75430..0f866dda 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/StaggeredManager.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/layout_manager/StaggeredManager.java
@@ -1,8 +1,8 @@
 package com.fastaccess.ui.widgets.recyclerview.layout_manager;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.util.AttributeSet;
 
 /**
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java
index 7a55a496..c197ce47 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/InfiniteScroll.java
@@ -1,9 +1,9 @@
 package com.fastaccess.ui.widgets.recyclerview.scroll;
 
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 import com.fastaccess.ui.widgets.recyclerview.BaseRecyclerAdapter;
 
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/RecyclerViewFastScroller.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/RecyclerViewFastScroller.java
index f16a7e69..a5a2842b 100755
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/RecyclerViewFastScroller.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/scroll/RecyclerViewFastScroller.java
@@ -3,12 +3,12 @@ package com.fastaccess.ui.widgets.recyclerview.scroll;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
diff --git a/app/src/main/java/com/prettifier/pretty/NestedWebView.java b/app/src/main/java/com/prettifier/pretty/NestedWebView.java
index 500f3023..2d51d69d 100644
--- a/app/src/main/java/com/prettifier/pretty/NestedWebView.java
+++ b/app/src/main/java/com/prettifier/pretty/NestedWebView.java
@@ -3,11 +3,11 @@ package com.prettifier.pretty;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.NestedScrollingChild;
-import android.support.v4.view.NestedScrollingChildHelper;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.RequiresApi;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.NestedScrollingChild;
+import androidx.core.view.NestedScrollingChildHelper;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.webkit.WebView;
diff --git a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java
index bcfe5c55..d7a8451f 100644
--- a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java
+++ b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java
@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/app/src/main/java/com/prettifier/pretty/helper/CodeThemesHelper.java b/app/src/main/java/com/prettifier/pretty/helper/CodeThemesHelper.java
index f00c3cc6..87974e6f 100644
--- a/app/src/main/java/com/prettifier/pretty/helper/CodeThemesHelper.java
+++ b/app/src/main/java/com/prettifier/pretty/helper/CodeThemesHelper.java
@@ -1,6 +1,6 @@
 package com.prettifier.pretty.helper;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 import com.fastaccess.App;
diff --git a/app/src/main/java/com/prettifier/pretty/helper/GithubHelper.java b/app/src/main/java/com/prettifier/pretty/helper/GithubHelper.java
index 03cc2cb4..73859e42 100644
--- a/app/src/main/java/com/prettifier/pretty/helper/GithubHelper.java
+++ b/app/src/main/java/com/prettifier/pretty/helper/GithubHelper.java
@@ -2,8 +2,8 @@ package com.prettifier.pretty.helper;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fastaccess.data.dao.NameParser;
 import com.fastaccess.helper.PrefGetter;
diff --git a/app/src/main/java/com/prettifier/pretty/helper/PrettifyHelper.java b/app/src/main/java/com/prettifier/pretty/helper/PrettifyHelper.java
index 7f3087f3..3cdf1f4a 100644
--- a/app/src/main/java/com/prettifier/pretty/helper/PrettifyHelper.java
+++ b/app/src/main/java/com/prettifier/pretty/helper/PrettifyHelper.java
@@ -1,6 +1,6 @@
 package com.prettifier.pretty.helper;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Kosh on 25 Dec 2016, 9:12 PM
diff --git a/app/src/main/res/layouts/main_layouts/layout-land/bottom_fab.xml b/app/src/main/res/layouts/main_layouts/layout-land/bottom_fab.xml
index 2a5fb4b0..f543c080 100644
--- a/app/src/main/res/layouts/main_layouts/layout-land/bottom_fab.xml
+++ b/app/src/main/res/layouts/main_layouts/layout-land/bottom_fab.xml
@@ -1,5 +1,5 @@
 
-
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml b/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml
index bb6ef69f..c41fbd76 100644
--- a/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml
+++ b/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
             
-        
+        
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml
index 64e4787b..079958ee 100644
--- a/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml
@@ -66,7 +66,7 @@
             android:layout_gravity="center"
             android:src="@drawable/ic_arrow_right"/>
 
-        
-
-
 
-        
 
-        
+        
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout-sw600dp/repo_file_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout-sw600dp/repo_file_header_layout.xml
index 645aabea..48113abf 100644
--- a/app/src/main/res/layouts/main_layouts/layout-sw600dp/repo_file_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout-sw600dp/repo_file_header_layout.xml
@@ -68,7 +68,7 @@
             android:layout_gravity="center"
             android:src="@drawable/ic_arrow_right"/>
 
-        
-
 
-                
 
-                
 
-                
 
-                
 
-                
 
-                
         
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/activity_fragment_layout.xml b/app/src/main/res/layouts/main_layouts/layout/activity_fragment_layout.xml
index 6af3b366..eca94184 100644
--- a/app/src/main/res/layouts/main_layouts/layout/activity_fragment_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/activity_fragment_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
-        
+        
 
         
 
     
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml b/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml
index c8d09784..b9a218ca 100644
--- a/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/activity_main_view.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
-        
+        
 
         
     
@@ -37,4 +37,4 @@
 
 
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/activity_search_file.xml b/app/src/main/res/layouts/main_layouts/layout/activity_search_file.xml
index 5baebfb0..3362c3e1 100644
--- a/app/src/main/res/layouts/main_layouts/layout/activity_search_file.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/activity_search_file.xml
@@ -1,18 +1,18 @@
 
-
 
-    
 
-        
 
-                
 
 
-        
-    
+        
+    
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/activity_search_user.xml b/app/src/main/res/layouts/main_layouts/layout/activity_search_user.xml
index 3550d2ad..4b7f77bd 100644
--- a/app/src/main/res/layouts/main_layouts/layout/activity_search_user.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/activity_search_user.xml
@@ -8,13 +8,13 @@
     android:orientation="vertical"
     tools:context="com.fastaccess.ui.modules.search.SearchUserActivity">
 
-    
 
-        
 
-        
+        
 
-    
+    
 
     
 
-        
 
-            
 
-        
+        
 
         
 
-        
-        
+        
 
     
 
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/add_review_dialog_layout.xml b/app/src/main/res/layouts/main_layouts/layout/add_review_dialog_layout.xml
index 62cabc42..eab741ad 100644
--- a/app/src/main/res/layouts/main_layouts/layout/add_review_dialog_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/add_review_dialog_layout.xml
@@ -7,7 +7,7 @@
 
     
 
-    
-
 
-    
-
 
-        
@@ -74,8 +74,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
 
-        
+        
 
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/commit_pager_activity.xml b/app/src/main/res/layouts/main_layouts/layout/commit_pager_activity.xml
index a6db0cd7..7fe9294c 100644
--- a/app/src/main/res/layouts/main_layouts/layout/commit_pager_activity.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/commit_pager_activity.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
-            
 
-                
                     
-                
+                
 
-                
-            
+            
 
             
 
-            
 
-            
+            
 
-            
 
-        
+        
 
         
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/create_gist_layout.xml b/app/src/main/res/layouts/main_layouts/layout/create_gist_layout.xml
index 0b94c410..a0377824 100644
--- a/app/src/main/res/layouts/main_layouts/layout/create_gist_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/create_gist_layout.xml
@@ -11,7 +11,7 @@
 
     
 
-    
 
-        
 
-            
 
-        
-    
+        
+    
 
     
 
-            
 
-            
 
-            
 
-                    
 
-                        
 
-                    
+                    
                 
-            
+            
 
-            
                 
-            
+            
 
             
 
-                    
 
-                    
+                    
 
                 
 
@@ -141,7 +141,7 @@
                         android:paddingTop="@dimen/spacing_normal"
                         android:text="@string/labels"/>
 
-                    
-                    
+                    
 
                 
 
@@ -174,7 +174,7 @@
                         android:paddingTop="@dimen/spacing_normal"
                         android:text="@string/milestone"/>
 
-                    
                         
-                    
+                    
 
                 
             
@@ -212,7 +212,7 @@
 
     
 
-    
 
 
-        
 
-                
 
-                    
 
-                
+                
 
-                
 
-                    
 
-                
+                
             
-        
+        
 
         
 
-        
 
-                
 
-                    
 
-                
+                
 
-                
 
-                    
 
-                
+                
             
-        
+        
 
-        
 
-                
 
-                    
 
-                
+                
             
-        
+        
 
     
 
diff --git a/app/src/main/res/layouts/main_layouts/layout/delete_repo_file_layout.xml b/app/src/main/res/layouts/main_layouts/layout/delete_repo_file_layout.xml
index fd278f40..aa523e92 100644
--- a/app/src/main/res/layouts/main_layouts/layout/delete_repo_file_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/delete_repo_file_layout.xml
@@ -8,7 +8,7 @@
     android:background="?android:windowBackground"
     android:orientation="vertical">
 
-    
 
-        
 
-            
 
-        
-    
+        
+    
 
-    
 
-        
 
-            
 
-        
-    
+        
+    
 
     
 
-        
-        
+        
 
     
 
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/edit_repo_file_layout.xml b/app/src/main/res/layouts/main_layouts/layout/edit_repo_file_layout.xml
index 64bb5eb2..4a6af64e 100644
--- a/app/src/main/res/layouts/main_layouts/layout/edit_repo_file_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/edit_repo_file_layout.xml
@@ -13,11 +13,11 @@
     
 
 
-    
 
-        
 
-                
 
-                    
 
-                        
 
-                    
-                
+                    
+                
 
-                
 
-                    
 
-                        
 
-                    
-                
+                    
+                
 
             
-        
+        
 
         
         
-    
+    
 
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/emoji_popup_layout.xml b/app/src/main/res/layouts/main_layouts/layout/emoji_popup_layout.xml
index 417978f3..6eeb9544 100644
--- a/app/src/main/res/layouts/main_layouts/layout/emoji_popup_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/emoji_popup_layout.xml
@@ -31,13 +31,13 @@
 
     
 
-    
 
-        
 
-        
-    
+        
+    
 
 
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/filter_bottom_sheet.xml b/app/src/main/res/layouts/main_layouts/layout/filter_bottom_sheet.xml
index 6f245ba3..835c9350 100644
--- a/app/src/main/res/layouts/main_layouts/layout/filter_bottom_sheet.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/filter_bottom_sheet.xml
@@ -7,19 +7,19 @@
     android:background="?android:windowBackground"
     android:orientation="vertical">
 
-    
 
-        
 
-            
 
-        
-    
+        
+    
 
     
 
-        
 
-        
 
-        
-
 
 
-    
 
-        
 
-            
 
                 
-            
+            
 
             
                 
             
-        
+        
 
         
-    
+    
 
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/full_screen_file_changes_layout.xml b/app/src/main/res/layouts/main_layouts/layout/full_screen_file_changes_layout.xml
index db01da07..779d3d32 100644
--- a/app/src/main/res/layouts/main_layouts/layout/full_screen_file_changes_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/full_screen_file_changes_layout.xml
@@ -1,18 +1,18 @@
 
-
 
-    
 
-        
         
-    
+    
 
     
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/general_viewer_layout.xml b/app/src/main/res/layouts/main_layouts/layout/general_viewer_layout.xml
index 459b2411..d63cf4f8 100644
--- a/app/src/main/res/layouts/main_layouts/layout/general_viewer_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/general_viewer_layout.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    
 
-    
+    
 
     
-
 
-    
 
-        
 
-            
 
-            
-        
+        
 
         
 
-        
 
-    
+    
 
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
index fb96b9ae..38aa53d7 100644
--- a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
-            
 
-                
-                
+                
 
-                
-            
+            
 
             
 
-            
 
-        
+        
 
         
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/header_title_with_toolbar.xml b/app/src/main/res/layouts/main_layouts/layout/header_title_with_toolbar.xml
index 497906b1..8a9a7902 100644
--- a/app/src/main/res/layouts/main_layouts/layout/header_title_with_toolbar.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/header_title_with_toolbar.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
 
-        
+        
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
index dc553a76..9f395901 100644
--- a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
-            
 
-                
-                
+                
 
-                
-            
+            
 
             
 
-            
 
-        
+        
 
         
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml b/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml
index 94eba3c5..753843f3 100644
--- a/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/issue_popup_layout.xml
@@ -12,7 +12,7 @@
     
 
 
-    
 
-            
                 
-            
+            
 
             
 
-                
 
-                
+                
 
             
 
@@ -137,7 +137,7 @@
                     android:paddingStart="@dimen/spacing_xs_large"
                     android:text="@string/labels"/>
 
-                
 
-                
+                
 
             
 
@@ -173,7 +173,7 @@
                     android:paddingStart="@dimen/spacing_xs_large"
                     android:text="@string/milestone"/>
 
-                
                     
 
-                
+                
 
             
         
-    
+    
 
     
 
-            
-
 
-    
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            
 
 
-            
+            
 
-            
                 
 
-            
+            
 
         
-    
+    
 
 
     
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/login_form_layout.xml b/app/src/main/res/layouts/main_layouts/layout/login_form_layout.xml
index 1eb921c5..eee3e3f2 100644
--- a/app/src/main/res/layouts/main_layouts/layout/login_form_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/login_form_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-    
 
-        
 
-                    
 
-                        
-                    
+                    
 
                     
 
-                    
 
-                        
-                    
+                    
 
-                    
 
-                        
-                    
+                    
 
-                    
 
-                        
-                    
+                    
 
                     
 
-                        
             
 
-        
+        
 
 
-    
+    
 
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/main_nav_fragment_layout.xml b/app/src/main/res/layouts/main_layouts/layout/main_nav_fragment_layout.xml
index f837f1f5..76326e19 100644
--- a/app/src/main/res/layouts/main_layouts/layout/main_nav_fragment_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/main_nav_fragment_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-            
 
-                
 
-            
+            
         
 
         
 
-            
 
-                
 
-            
+            
         
     
 
diff --git a/app/src/main/res/layouts/main_layouts/layout/merge_dialog_layout.xml b/app/src/main/res/layouts/main_layouts/layout/merge_dialog_layout.xml
index 50d3c6de..77dfa1ab 100644
--- a/app/src/main/res/layouts/main_layouts/layout/merge_dialog_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/merge_dialog_layout.xml
@@ -10,19 +10,19 @@
     android:padding="@dimen/spacing_xs_large">
 
 
-    
 
-        
 
-    
+    
 
     
 
-        
-
 
-    
 
-        
 
-            
 
-            
-        
+        
 
         
         
 
-    
+    
 
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/notifications_bottom_sheet_layout.xml b/app/src/main/res/layouts/main_layouts/layout/notifications_bottom_sheet_layout.xml
index 2b0ff5a0..386d47c8 100644
--- a/app/src/main/res/layouts/main_layouts/layout/notifications_bottom_sheet_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/notifications_bottom_sheet_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/picker_dialog.xml b/app/src/main/res/layouts/main_layouts/layout/picker_dialog.xml
index 3db32c5a..24a1c943 100644
--- a/app/src/main/res/layouts/main_layouts/layout/picker_dialog.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/picker_dialog.xml
@@ -18,7 +18,7 @@
         android:textStyle="bold"/>
 
 
-    
@@ -38,7 +38,7 @@
 
         
 
-    
+    
 
     
 
-            
 
-                        
 
-                        
 
-                        
-
 
-    
 
 
-        
             
-        
-    
+        
+    
 
 
     
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/projects_activity_layout.xml b/app/src/main/res/layouts/main_layouts/layout/projects_activity_layout.xml
index 5b32d310..7c421f19 100644
--- a/app/src/main/res/layouts/main_layouts/layout/projects_activity_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/projects_activity_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml
index b3cb4ae9..f83a357e 100644
--- a/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml
@@ -65,7 +65,7 @@
             android:layout_gravity="center"
             android:src="@drawable/ic_arrow_right"/>
 
-        
-
 
-        
 
-            
 
                 
-            
+            
 
 
-        
+        
 
         
     
@@ -50,4 +50,4 @@
     
 
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/review_changes_bottom_layout.xml b/app/src/main/res/layouts/main_layouts/layout/review_changes_bottom_layout.xml
index 2441b414..ab19f3ad 100644
--- a/app/src/main/res/layouts/main_layouts/layout/review_changes_bottom_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/review_changes_bottom_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/review_comment_dialog_layout.xml b/app/src/main/res/layouts/main_layouts/layout/review_comment_dialog_layout.xml
index 1805f931..1ba57aa9 100644
--- a/app/src/main/res/layouts/main_layouts/layout/review_comment_dialog_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/review_comment_dialog_layout.xml
@@ -20,7 +20,7 @@
             android:orientation="horizontal"
             android:padding="@dimen/spacing_xs_large">
 
-            
 
-            
 
-    
 
-        
 
-            
 
                 
-            
+            
 
-            
-        
+        
 
         
 
-    
+    
 
     
 
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/support_development_layout.xml b/app/src/main/res/layouts/main_layouts/layout/support_development_layout.xml
index 9cb4207b..6626d224 100644
--- a/app/src/main/res/layouts/main_layouts/layout/support_development_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/support_development_layout.xml
@@ -1,18 +1,18 @@
 
-
 
-    
 
-        
 
-            
-        
-    
+        
+    
 
     
 
-        
 
-                
 
-                
+                
 
-                
 
-                
+                
 
-                
 
-                
+                
 
-                
 
-                
+                
             
 
-        
+        
 
     
 
@@ -175,4 +175,4 @@
             android:text="@string/fasthub_premium_features"/>
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/tabbed_pager_layout.xml b/app/src/main/res/layouts/main_layouts/layout/tabbed_pager_layout.xml
index 24b893f0..5b95249c 100644
--- a/app/src/main/res/layouts/main_layouts/layout/tabbed_pager_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/tabbed_pager_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-        
 
-            
 
-        
+        
 
         
     
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml b/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml
index cdd42087..987b1152 100644
--- a/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml
@@ -8,7 +8,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    
-
 
 
-    
 
-        
 
 
-            
 
-        
-    
+        
+    
 
 
     
     
 
-    
 
-
+
diff --git a/app/src/main/res/layouts/main_layouts/layout/theme_layout.xml b/app/src/main/res/layouts/main_layouts/layout/theme_layout.xml
index 43ffbbf0..8de081fe 100644
--- a/app/src/main/res/layouts/main_layouts/layout/theme_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/theme_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-    
 
-        
 
-    
+    
 
     
 
-        
 
@@ -371,7 +371,7 @@
 
                 
 
-                
                     
 
-                
+                
 
-                
                     
 
-                
+                
 
-                
                     
 
-                
+                
 
-                
                     
 
-                
+                
 
-                
                     
 
-                
+                
 
-                
                     
 
-                
+                
 
             
 
-        
+        
     
 
-    
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml b/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml
index e324ce5c..c3b4f65c 100644
--- a/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/toolbar_activity_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-        
@@ -27,7 +27,7 @@
                 app:layout_behavior="@string/scroll_behavior"/>
 
 
-            
 
-        
+        
 
         
     
 
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/trending_activity_layout.xml b/app/src/main/res/layouts/main_layouts/layout/trending_activity_layout.xml
index 084f905b..4e84bad2 100644
--- a/app/src/main/res/layouts/main_layouts/layout/trending_activity_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/trending_activity_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-        
@@ -27,12 +27,12 @@
                 app:layout_behavior="@string/scroll_behavior"
                 tools:layout="@layout/micro_grid_refresh_list" />
 
-        
+        
 
         
     
 
-    
 
-            
         
 
-    
+    
 
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/view_pager_activity_layout.xml b/app/src/main/res/layouts/main_layouts/layout/view_pager_activity_layout.xml
index b20450d3..5f10c5d8 100644
--- a/app/src/main/res/layouts/main_layouts/layout/view_pager_activity_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/view_pager_activity_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-    
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/main_layouts/layout/wiki_activity_layout.xml b/app/src/main/res/layouts/main_layouts/layout/wiki_activity_layout.xml
index ea30ccb2..6f9628fb 100644
--- a/app/src/main/res/layouts/main_layouts/layout/wiki_activity_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/wiki_activity_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-        
@@ -47,12 +47,12 @@
             
 
 
-        
+        
 
         
     
 
-    
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml b/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml
index cd2f7e30..4bca7cb2 100644
--- a/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml
+++ b/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml
@@ -1,5 +1,5 @@
 
-
 
-    
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml b/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml
index 6f1f12da..13eb25b2 100644
--- a/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml
+++ b/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml
@@ -1,5 +1,5 @@
 
-
 
-    
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml
index 7275e736..b01049db 100644
--- a/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml
@@ -1,5 +1,5 @@
 
-
 
-    
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml
index cb6c6111..3be32137 100644
--- a/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml
@@ -1,5 +1,5 @@
 
-
 
-    
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml
index 412be004..02d7d106 100644
--- a/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml
@@ -1,5 +1,5 @@
 
-
 
-    
 
-    
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout/dialog_guide_layout.xml b/app/src/main/res/layouts/other_layouts/layout/dialog_guide_layout.xml
index 26fe04f7..a7fb75db 100644
--- a/app/src/main/res/layouts/other_layouts/layout/dialog_guide_layout.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/dialog_guide_layout.xml
@@ -8,12 +8,12 @@
     android:background="?android:attr/windowBackground"
     android:orientation="vertical">
 
-    
 
-        
@@ -48,8 +48,8 @@
                     android:textColor="?android:textColorPrimary"
                     tools:text="Remember: shreded ramen tastes best when flattened in a sauté pan enameled with rum."/>
             
-        
-    
+        
+    
 
     
 
-            
 
 
-        
@@ -61,7 +61,7 @@
                     android:textColor="?android:attr/textColorSecondary"/>
             
 
-        
+        
 
         
 
 
-        
@@ -55,7 +55,7 @@
                     tools:text="Hello World"/>
             
 
-        
+        
 
         
-
 
-        
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml b/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
index bba7212d..afc08519 100644
--- a/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
@@ -8,11 +8,11 @@
     android:background="?android:attr/windowBackground"
     android:orientation="vertical">
 
-    
 
-        
 
             
-        
-    
+        
+    
 
     
 
 
-    
-
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
index ad1ff13d..65db8025 100644
--- a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
@@ -1,5 +1,5 @@
 
-
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/commit_line_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/commit_line_row_item.xml
index 6e150791..fa051077 100644
--- a/app/src/main/res/layouts/row_layouts/layout/commit_line_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/commit_line_row_item.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        
 
-        
 
-        
-
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml
index 63c3accc..c023d2c1 100644
--- a/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml
@@ -1,5 +1,5 @@
 
-
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml
index 65166bc1..1cfe41ad 100644
--- a/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml
@@ -1,5 +1,5 @@
 
-
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
index d2b3b62a..71e23622 100644
--- a/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            
 
-            
 
-        
diff --git a/app/src/main/res/layouts/row_layouts/layout/no_emojies_comments_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/no_emojies_comments_row_item.xml
index fda14300..54e5bdb6 100644
--- a/app/src/main/res/layouts/row_layouts/layout/no_emojies_comments_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/no_emojies_comments_row_item.xml
@@ -54,7 +54,7 @@
                 android:textColor="?android:attr/textColorSecondary"
                 tools:text="50 minutes"/>
 
-            
 
-    
-
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/org_profile_overview_layout.xml b/app/src/main/res/layouts/row_layouts/layout/org_profile_overview_layout.xml
index ffc615d4..1f2d3dfb 100644
--- a/app/src/main/res/layouts/row_layouts/layout/org_profile_overview_layout.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/org_profile_overview_layout.xml
@@ -1,4 +1,4 @@
-
 
-        
 
-        
+        
 
         
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml b/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml
index 2c3840a1..dfaa3b8a 100644
--- a/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml
@@ -1,5 +1,5 @@
 
-
 
-            
                 
 
-            
+            
 
             
 
-            
 
-            
+            
 
             
 
-            
 
-            
+            
 
             
 
-            
 
-            
+            
 
         
 
@@ -300,4 +300,4 @@
     
 
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/pullrequest_file_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/pullrequest_file_row_item.xml
index 59be4ff8..54724279 100644
--- a/app/src/main/res/layouts/row_layouts/layout/pullrequest_file_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/pullrequest_file_row_item.xml
@@ -1,5 +1,5 @@
 
-
 
     
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/trending_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/trending_row_item.xml
index ae58c714..66d22014 100644
--- a/app/src/main/res/layouts/row_layouts/layout/trending_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/trending_row_item.xml
@@ -1,5 +1,5 @@
 
-
     
 
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 70b8ac7a..c7749ffd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        butterKnifeVersion = '8.5.1'
-        state_version = '1.2.0'
+        butterKnifeVersion = '10.2.1'
+        state_version = '1.4.1'
         lombokVersion = '1.16.20'
         supportVersion = "27.1.0"
         gms = "12.0.0"
-        thirtyinchVersion = '0.8.0'
+        thirtyinchVersion = '0.9.6'
         retrofit = '2.3.0'
         junitVersion = '4.12'
         mockitoVersion = '1.10.19'
@@ -15,7 +15,7 @@ buildscript {
         requery = '1.3.2'
         kotlin_version = '1.3.61'
         commonmark = '0.10.0'
-        glideVersion = '3.7.0'
+        glideVersion = '4.10.0'
     }
     repositories {
         google()
@@ -25,7 +25,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.novoda:gradle-build-properties-plugin:0.4.1'
         classpath 'io.fabric.tools:gradle:1.31.2'
         classpath 'com.apollographql.apollo:apollo-gradle-plugin:1.2.2'