From 1ce5c54055e6fa55a8c2508669f66ecfa8621d2f Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Thu, 22 Apr 2021 11:47:18 +0200 Subject: [PATCH 1/2] rename app id --- app/build.gradle | 2 +- app/proguard-rules.pro | 4 +- .../pixeldroid/app}/CameraTest.kt | 16 ++++---- .../pixeldroid/app}/DrawerMenuTest.kt | 6 +-- .../pixeldroid/app}/EditPhotoTest.kt | 16 ++++---- .../pixeldroid/app}/HomeFeedTest.kt | 9 ++--- .../pixeldroid/app}/IntentTest.kt | 24 ++++-------- .../app}/LoginActivityOfflineTest.kt | 8 ++-- .../app}/LoginActivityOnlineTest.kt | 21 ++++------ .../pixeldroid/app}/LoginCheckIntent.kt | 11 ++---- .../pixeldroid/app}/MockedServerTest.kt | 6 +-- .../app}/PostCreationActivityTest.kt | 14 +++---- .../app}/PostCreationFragmentTest.kt | 6 +-- .../pixeldroid/app}/PostTest.kt | 20 +++++----- .../pixeldroid/app}/ProfileTest.kt | 15 +++----- .../app}/testUtility/CustomMatchers.kt | 4 +- .../pixeldroid/app}/testUtility/DbHelpers.kt | 4 +- .../pixeldroid/app}/testUtility/Values.kt | 8 ++-- app/src/main/AndroidManifest.xml | 38 +++++++++---------- .../h/pixeldroid/utils/api/objects/Error.kt | 5 --- .../pixeldroid/app}/LoginActivity.kt | 14 +++---- .../pixeldroid/app}/MainActivity.kt | 28 +++++++------- .../app}/postCreation/PostCreationActivity.kt | 24 ++++++------ .../app}/postCreation/ProgressRequestBody.kt | 2 +- .../app}/postCreation/SquareLayout.kt | 2 +- .../postCreation/camera/CameraActivity.kt | 6 +-- .../postCreation/camera/CameraFragment.kt | 6 +-- .../postCreation/carousel/CarouselAdapter.kt | 4 +- .../postCreation/carousel/CarouselItem.kt | 2 +- .../carousel/CarouselLinearLayoutManager.kt | 2 +- .../postCreation/carousel/ImageCarousel.kt | 6 +-- .../app}/postCreation/carousel/Utils.kt | 2 +- .../photoEdit/EditImageFragment.kt | 4 +- .../photoEdit/EditPhotoViewPagerAdapter.kt | 2 +- .../photoEdit/FilterListFragment.kt | 4 +- .../photoEdit/NonSwipeableViewPager.kt | 2 +- .../photoEdit/PhotoEditActivity.kt | 13 +++---- .../photoEdit/SpaceItemDecoration.kt | 2 +- .../photoEdit/ThumbnailAdapter.kt | 6 +-- .../app}/posts/ClickableSpanNoUnderline.kt | 2 +- .../pixeldroid/app}/posts/HtmlUtils.kt | 12 +++--- .../app}/posts/NestedScrollableHost.kt | 2 +- .../pixeldroid/app}/posts/PostActivity.kt | 24 ++++++------ .../pixeldroid/app}/posts/ReportActivity.kt | 10 ++--- .../pixeldroid/app}/posts/StatusViewHolder.kt | 28 +++++++------- .../posts/feeds/CommonFeedFragmentUtils.kt | 12 +++--- .../feeds/cachedFeeds/CachedFeedFragment.kt | 14 +++---- .../cachedFeeds/FeedContentRepository.kt | 8 ++-- .../posts/feeds/cachedFeeds/FeedViewModel.kt | 4 +- .../notifications/NotificationsFragment.kt | 28 +++++++------- .../NotificationsRemoteMediator.kt | 8 ++-- .../postFeeds/HomeFeedRemoteMediator.kt | 8 ++-- .../cachedFeeds/postFeeds/PostFeedFragment.kt | 20 +++++----- .../postFeeds/PublicFeedRemoteMediator.kt | 8 ++-- .../feeds/uncachedFeeds/FeedViewModel.kt | 4 +- .../uncachedFeeds/UncachedFeedFragment.kt | 12 +++--- .../accountLists/AccountListFragment.kt | 18 ++++----- .../FollowersContentRepository.kt | 8 ++-- .../accountLists/FollowersPagingSource.kt | 6 +-- .../profile/ProfileContentRepository.kt | 8 ++-- .../profile/ProfilePagingSource.kt | 6 +-- .../search/SearchAccountFragment.kt | 10 ++--- .../search/SearchContentRepository.kt | 12 +++--- .../search/SearchHashtagFragment.kt | 16 ++++---- .../search/SearchPagingSource.kt | 8 ++-- .../search/SearchPostsFragment.kt | 14 +++---- .../app}/profile/FollowsActivity.kt | 16 ++++---- .../app}/profile/ProfileActivity.kt | 38 +++++++++---------- .../ProfilePostsRecyclerViewAdapter.kt | 12 +++--- .../app}/searchDiscover/SearchActivity.kt | 14 +++---- .../searchDiscover/SearchDiscoverFragment.kt | 20 +++++----- .../pixeldroid/app}/settings/AboutActivity.kt | 10 ++--- .../app}/settings/LicenseActivity.kt | 8 ++-- .../app}/settings/SettingsActivity.kt | 10 ++--- .../pixeldroid/app}/utils/BaseActivity.kt | 6 +-- .../pixeldroid/app}/utils/BaseFragment.kt | 6 +-- .../pixeldroid/app}/utils/BlurHashDecoder.kt | 3 +- .../pixeldroid/app}/utils/ImageConverter.kt | 4 +- .../app}/utils/PixelDroidApplication.kt | 5 +-- .../pixeldroid/app}/utils/Utils.kt | 4 +- .../pixeldroid/app}/utils/api/PixelfedAPI.kt | 4 +- .../app}/utils/api/objects/Account.kt | 6 +-- .../app}/utils/api/objects/Application.kt | 2 +- .../app}/utils/api/objects/Attachment.kt | 2 +- .../pixeldroid/app}/utils/api/objects/Card.kt | 2 +- .../app}/utils/api/objects/Context.kt | 2 +- .../app}/utils/api/objects/DiscoverPosts.kt | 2 +- .../app}/utils/api/objects/Emoji.kt | 2 +- .../pixeldroid/app/utils/api/objects/Error.kt | 5 +++ .../app}/utils/api/objects/FeedContent.kt | 2 +- .../app}/utils/api/objects/Field.kt | 2 +- .../app}/utils/api/objects/History.kt | 2 +- .../app}/utils/api/objects/Instance.kt | 4 +- .../app}/utils/api/objects/Mention.kt | 2 +- .../app}/utils/api/objects/NodeInfo.kt | 4 +- .../app}/utils/api/objects/Notification.kt | 4 +- .../pixeldroid/app}/utils/api/objects/Poll.kt | 2 +- .../app}/utils/api/objects/Relationship.kt | 2 +- .../app}/utils/api/objects/Report.kt | 2 +- .../app}/utils/api/objects/Results.kt | 2 +- .../app}/utils/api/objects/Source.kt | 2 +- .../app}/utils/api/objects/Status.kt | 11 ++---- .../pixeldroid/app}/utils/api/objects/Tag.kt | 2 +- .../app}/utils/api/objects/Token.kt | 2 +- .../pixeldroid/app}/utils/db/AppDatabase.kt | 20 +++++----- .../pixeldroid/app}/utils/db/Converters.kt | 4 +- .../pixeldroid/app}/utils/db/DBUtils.kt | 22 +++++------ .../app}/utils/db/dao/InstanceDao.kt | 4 +- .../pixeldroid/app}/utils/db/dao/UserDao.kt | 4 +- .../db/dao/feedContent/FeedContentDao.kt | 4 +- .../db/dao/feedContent/NotificationDao.kt | 4 +- .../db/dao/feedContent/posts/HomePostDao.kt | 6 +-- .../db/dao/feedContent/posts/PublicPostDao.kt | 6 +-- .../db/entities/HomeStatusDatabaseEntity.kt | 4 +- .../db/entities/InstanceDatabaseEntity.kt | 3 +- .../PublicFeedStatusDatabaseEntity.kt | 4 +- .../utils/db/entities/UserDatabaseEntity.kt | 2 +- .../pixeldroid/app}/utils/di/APIModule.kt | 10 ++--- .../app}/utils/di/ApplicationComponent.kt | 10 ++--- .../app}/utils/di/ApplicationModule.kt | 2 +- .../app}/utils/di/DatabaseModule.kt | 4 +- app/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/activity_photo_edit.xml | 2 +- .../res/layout/activity_post_creation.xml | 2 +- .../res/layout/add_more_album_creation.xml | 4 +- .../main/res/layout/image_album_creation.xml | 4 +- app/src/main/res/layout/post_fragment.xml | 4 +- app/src/main/res/xml/file_paths.xml | 2 +- app/src/main/res/xml/root_preferences.xml | 4 +- .../pixeldroid/app}/APIUnitTest.kt | 8 ++-- .../pixeldroid/app}/PostUnitTest.kt | 4 +- 131 files changed, 509 insertions(+), 546 deletions(-) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/CameraTest.kt (83%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/DrawerMenuTest.kt (98%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/EditPhotoTest.kt (94%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/HomeFeedTest.kt (97%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/IntentTest.kt (83%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/LoginActivityOfflineTest.kt (92%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/LoginActivityOnlineTest.kt (83%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/LoginCheckIntent.kt (88%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/MockedServerTest.kt (98%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/PostCreationActivityTest.kt (93%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/PostCreationFragmentTest.kt (96%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/PostTest.kt (95%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/ProfileTest.kt (88%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/testUtility/CustomMatchers.kt (99%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/testUtility/DbHelpers.kt (79%) rename app/src/androidTest/java/{com/h/pixeldroid => org/pixeldroid/app}/testUtility/Values.kt (75%) delete mode 100644 app/src/main/java/com/h/pixeldroid/utils/api/objects/Error.kt rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/LoginActivity.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/MainActivity.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/PostCreationActivity.kt (96%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/ProgressRequestBody.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/SquareLayout.kt (89%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/camera/CameraActivity.kt (85%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/camera/CameraFragment.kt (99%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/carousel/CarouselAdapter.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/carousel/CarouselItem.kt (78%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/carousel/CarouselLinearLayoutManager.kt (91%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/carousel/ImageCarousel.kt (99%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/carousel/Utils.kt (96%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/photoEdit/EditImageFragment.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/photoEdit/EditPhotoViewPagerAdapter.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/photoEdit/FilterListFragment.kt (98%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/photoEdit/NonSwipeableViewPager.kt (96%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/photoEdit/PhotoEditActivity.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/photoEdit/SpaceItemDecoration.kt (91%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/postCreation/photoEdit/ThumbnailAdapter.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/ClickableSpanNoUnderline.kt (88%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/HtmlUtils.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/NestedScrollableHost.kt (99%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/PostActivity.kt (90%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/ReportActivity.kt (91%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/StatusViewHolder.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/CommonFeedFragmentUtils.kt (94%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/CachedFeedFragment.kt (90%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/FeedContentRepository.kt (88%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/FeedViewModel.kt (92%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt (91%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/postFeeds/HomeFeedRemoteMediator.kt (91%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/postFeeds/PostFeedFragment.kt (83%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/cachedFeeds/postFeeds/PublicFeedRemoteMediator.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/FeedViewModel.kt (89%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/UncachedFeedFragment.kt (90%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/accountLists/AccountListFragment.kt (87%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/accountLists/FollowersContentRepository.kt (78%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/accountLists/FollowersPagingSource.kt (94%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/profile/ProfileContentRepository.kt (78%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/profile/ProfilePagingSource.kt (86%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/search/SearchAccountFragment.kt (81%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/search/SearchContentRepository.kt (73%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt (87%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt (88%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt (88%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/profile/FollowsActivity.kt (76%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/profile/ProfileActivity.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/profile/ProfilePostsRecyclerViewAdapter.kt (86%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/searchDiscover/SearchActivity.kt (88%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/searchDiscover/SearchDiscoverFragment.kt (90%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/settings/AboutActivity.kt (76%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/settings/LicenseActivity.kt (73%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/settings/SettingsActivity.kt (92%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/BaseActivity.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/BaseFragment.kt (80%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/BlurHashDecoder.kt (98%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/ImageConverter.kt (98%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/PixelDroidApplication.kt (87%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/Utils.kt (98%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/PixelfedAPI.kt (98%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Account.kt (94%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Application.kt (87%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Attachment.kt (95%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Card.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Context.kt (65%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/DiscoverPosts.kt (73%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Emoji.kt (85%) create mode 100644 app/src/main/java/org/pixeldroid/app/utils/api/objects/Error.kt rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/FeedContent.kt (77%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Field.kt (55%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/History.kt (72%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Instance.kt (65%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Mention.kt (81%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/NodeInfo.kt (96%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Notification.kt (92%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Poll.kt (55%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Relationship.kt (90%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Report.kt (53%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Results.kt (80%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Source.kt (55%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Status.kt (94%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Tag.kt (88%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/api/objects/Token.kt (77%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/AppDatabase.kt (52%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/Converters.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/DBUtils.kt (72%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/dao/InstanceDao.kt (84%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/dao/UserDao.kt (90%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/dao/feedContent/FeedContentDao.kt (79%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/dao/feedContent/NotificationDao.kt (85%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/dao/feedContent/posts/HomePostDao.kt (77%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/dao/feedContent/posts/PublicPostDao.kt (77%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/entities/HomeStatusDatabaseEntity.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/entities/InstanceDatabaseEntity.kt (91%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/entities/PublicFeedStatusDatabaseEntity.kt (97%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/db/entities/UserDatabaseEntity.kt (94%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/di/APIModule.kt (93%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/di/ApplicationComponent.kt (67%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/di/ApplicationModule.kt (92%) rename app/src/main/java/{com/h/pixeldroid => org/pixeldroid/app}/utils/di/DatabaseModule.kt (83%) rename app/src/test/java/{com/h/pixeldroid => org/pixeldroid/app}/APIUnitTest.kt (99%) rename app/src/test/java/{com/h/pixeldroid => org/pixeldroid/app}/PostUnitTest.kt (97%) diff --git a/app/build.gradle b/app/build.gradle index 7925f6df..331e69bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"] } defaultConfig { - applicationId "com.h.pixeldroid" + applicationId "org.pixeldroid.app" minSdkVersion 23 targetSdkVersion 30 versionCode 10 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 126f20d8..db0002be 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -37,9 +37,9 @@ # APP SPECIFIC OPTIONS # keep members of our model classes, they are used in json de/serialization --keepclassmembers class com.h.pixeldroid.utils.api.objects.* { *; } +-keepclassmembers class org.pixeldroid.app.utils.api.objects.* { *; } --keep public enum com.h.pixeldroid.utils.api.objects.*$** { +-keep public enum org.pixeldroid.app.utils.api.objects.*$** { **[] $VALUES; public *; } diff --git a/app/src/androidTest/java/com/h/pixeldroid/CameraTest.kt b/app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt similarity index 83% rename from app/src/androidTest/java/com/h/pixeldroid/CameraTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt index 144cacd5..04a38746 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/CameraTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.Manifest import android.content.Context @@ -10,11 +10,11 @@ import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.intent.Intents import androidx.test.espresso.intent.matcher.IntentMatchers import androidx.test.rule.GrantPermissionRule -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity -import com.h.pixeldroid.postCreation.camera.CameraFragment -import com.h.pixeldroid.testUtility.clearData -import com.h.pixeldroid.testUtility.initDB +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.postCreation.camera.CameraFragment +import org.pixeldroid.app.testUtility.clearData +import org.pixeldroid.app.testUtility.initDB import org.hamcrest.CoreMatchers import org.hamcrest.Matcher import org.junit.After @@ -88,7 +88,7 @@ class CameraTest { val scenario = launchFragmentInContainer() scenario.onFragment { fragment -> - fragment.view?.findViewById(R.id.photo_view_button)?.performClick() + fragment.view?.findViewById(_root_ide_package_.org.pixeldroid.app.R.id.photo_view_button)?.performClick() } Thread.sleep(1000) @@ -99,7 +99,7 @@ class CameraTest { fun switchButton() { val scenario = launchFragmentInContainer() scenario.onFragment { fragment -> - fragment.view?.findViewById(R.id.camera_switch_button)?.performClick() + fragment.view?.findViewById(_root_ide_package_.org.pixeldroid.app.R.id.camera_switch_button)?.performClick() } Thread.sleep(1000) diff --git a/app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt b/app/src/androidTest/java/org/pixeldroid/app/DrawerMenuTest.kt similarity index 98% rename from app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/DrawerMenuTest.kt index 8f60e387..5d763c04 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/DrawerMenuTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context import androidx.test.core.app.ActivityScenario @@ -12,8 +12,8 @@ import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.uiautomator.UiDevice -import com.h.pixeldroid.testUtility.* -import com.h.pixeldroid.utils.db.AppDatabase +import org.pixeldroid.app.testUtility.* +import org.pixeldroid.app.utils.db.AppDatabase import org.junit.After import org.junit.Before import org.junit.Rule diff --git a/app/src/androidTest/java/com/h/pixeldroid/EditPhotoTest.kt b/app/src/androidTest/java/org/pixeldroid/app/EditPhotoTest.kt similarity index 94% rename from app/src/androidTest/java/com/h/pixeldroid/EditPhotoTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/EditPhotoTest.kt index fe29238e..bb7d627a 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/EditPhotoTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/EditPhotoTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context import android.content.Intent @@ -22,13 +22,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import com.google.android.material.tabs.TabLayout -import com.h.pixeldroid.postCreation.photoEdit.PhotoEditActivity -import com.h.pixeldroid.postCreation.photoEdit.ThumbnailAdapter -import com.h.pixeldroid.settings.AboutActivity -import com.h.pixeldroid.testUtility.clearData -import com.h.pixeldroid.testUtility.clickChildViewWithId -import com.h.pixeldroid.testUtility.slowSwipeLeft -import com.h.pixeldroid.testUtility.waitForView +import org.pixeldroid.app.postCreation.photoEdit.PhotoEditActivity +import org.pixeldroid.app.postCreation.photoEdit.ThumbnailAdapter +import org.pixeldroid.app.settings.AboutActivity +import org.pixeldroid.app.testUtility.clearData +import org.pixeldroid.app.testUtility.clickChildViewWithId +import org.pixeldroid.app.testUtility.slowSwipeLeft +import org.pixeldroid.app.testUtility.waitForView import org.hamcrest.CoreMatchers.allOf import org.junit.* import org.junit.Assert.assertTrue diff --git a/app/src/androidTest/java/com/h/pixeldroid/HomeFeedTest.kt b/app/src/androidTest/java/org/pixeldroid/app/HomeFeedTest.kt similarity index 97% rename from app/src/androidTest/java/com/h/pixeldroid/HomeFeedTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/HomeFeedTest.kt index d97d376d..1b076a1a 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/HomeFeedTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/HomeFeedTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context @@ -11,10 +11,9 @@ import androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.viewpager2.widget.ViewPager2 -import com.google.android.material.tabs.TabLayout -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.posts.StatusViewHolder -import com.h.pixeldroid.testUtility.* +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.posts.StatusViewHolder +import org.pixeldroid.app.testUtility.* import org.hamcrest.CoreMatchers.not import org.junit.After import org.junit.Before diff --git a/app/src/androidTest/java/com/h/pixeldroid/IntentTest.kt b/app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt similarity index 83% rename from app/src/androidTest/java/com/h/pixeldroid/IntentTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt index 55696c3f..7b29e396 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/IntentTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt @@ -1,17 +1,10 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context import android.content.Intent -import android.text.SpannableString -import android.text.style.ClickableSpan -import android.view.View -import android.widget.TextView import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso -import androidx.test.espresso.NoMatchingViewException -import androidx.test.espresso.UiController -import androidx.test.espresso.ViewAction import androidx.test.espresso.action.ViewActions import androidx.test.espresso.assertion.ViewAssertions import androidx.test.espresso.contrib.DrawerActions @@ -23,17 +16,14 @@ import androidx.test.espresso.intent.matcher.IntentMatchers import androidx.test.espresso.matcher.ViewMatchers import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.rule.ActivityTestRule -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity -import com.h.pixeldroid.posts.StatusViewHolder -import com.h.pixeldroid.utils.api.objects.Account -import com.h.pixeldroid.utils.api.objects.Account.Companion.ACCOUNT_TAG -import com.h.pixeldroid.settings.AboutActivity -import com.h.pixeldroid.testUtility.* +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.posts.StatusViewHolder +import org.pixeldroid.app.utils.api.objects.Account +import org.pixeldroid.app.utils.api.objects.Account.Companion.ACCOUNT_TAG +import org.pixeldroid.app.settings.AboutActivity +import org.pixeldroid.app.testUtility.* import org.hamcrest.CoreMatchers import org.hamcrest.Matcher -import org.hamcrest.Matchers import org.junit.After import org.junit.Before import org.junit.Rule diff --git a/app/src/androidTest/java/com/h/pixeldroid/LoginActivityOfflineTest.kt b/app/src/androidTest/java/org/pixeldroid/app/LoginActivityOfflineTest.kt similarity index 92% rename from app/src/androidTest/java/com/h/pixeldroid/LoginActivityOfflineTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/LoginActivityOfflineTest.kt index d1ca17c3..1e054840 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/LoginActivityOfflineTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/LoginActivityOfflineTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app /* import android.content.Context import androidx.test.core.app.ActivityScenario @@ -12,9 +12,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiSelector -import com.h.pixeldroid.testUtility.clearData -import com.h.pixeldroid.testUtility.initDB -import com.h.pixeldroid.utils.db.AppDatabase +import org.pixeldroid.app.testUtility.clearData +import org.pixeldroid.app.testUtility.initDB +import org.pixeldroid.app.utils.db.AppDatabase import org.junit.After import org.junit.Before import org.junit.Rule diff --git a/app/src/androidTest/java/com/h/pixeldroid/LoginActivityOnlineTest.kt b/app/src/androidTest/java/org/pixeldroid/app/LoginActivityOnlineTest.kt similarity index 83% rename from app/src/androidTest/java/com/h/pixeldroid/LoginActivityOnlineTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/LoginActivityOnlineTest.kt index dc0a0c73..ab1b7338 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/LoginActivityOnlineTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/LoginActivityOnlineTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context import android.content.Intent @@ -13,16 +13,11 @@ import androidx.test.espresso.action.ViewActions.closeSoftKeyboard import androidx.test.espresso.action.ViewActions.replaceText import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.hasErrorText -import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity -import com.h.pixeldroid.testUtility.clearData -import com.h.pixeldroid.testUtility.initDB -import com.h.pixeldroid.testUtility.testiTesto -import com.h.pixeldroid.testUtility.testiTestoInstance +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.testUtility.clearData +import org.pixeldroid.app.testUtility.initDB import org.junit.After import org.junit.Before import org.junit.Rule @@ -44,7 +39,7 @@ class LoginActivityOnlineTest { fun setup() { context = ApplicationProvider.getApplicationContext() context = ApplicationProvider.getApplicationContext() - pref = context.getSharedPreferences("com.h.pixeldroid.pref", Context.MODE_PRIVATE) + pref = context.getSharedPreferences("org.pixeldroid.app.pref", Context.MODE_PRIVATE) pref.edit().clear().apply() db = initDB(context) db.clearAllTables() @@ -81,7 +76,7 @@ class LoginActivityOnlineTest { .putString("clientID", "iwndoiuqwnd") .putString("clientSecret", "wlifowed") .apply() - val uri = Uri.parse("oauth2redirect://com.h.pixeldroid?code=sdfdqsf") + val uri = Uri.parse("oauth2redirect://org.pixeldroid.app?code=sdfdqsf") val intent = Intent(ACTION_VIEW, uri, context, LoginActivity::class.java) ActivityScenario.launch(intent) onView(withId(R.id.editText)).check(matches( @@ -91,7 +86,7 @@ class LoginActivityOnlineTest { @Test fun incompleteIntentReturnInfoFailsTest() { - val uri = Uri.parse("oauth2redirect://com.h.pixeldroid?code=") + val uri = Uri.parse("oauth2redirect://org.pixeldroid.app?code=") val intent = Intent(ACTION_VIEW, uri, context, LoginActivity::class.java) ActivityScenario.launch(intent) onView(withId(R.id.editText)).check(matches( @@ -117,7 +112,7 @@ class LoginActivityOnlineTest { .putString("clientID", testiTesto.clientId) .putString("clientSecret", testiTesto.clientSecret) .apply() - val uri = Uri.parse("oauth2redirect://com.h.pixeldroid?code=$testiTesto.") + val uri = Uri.parse("oauth2redirect://org.pixeldroid.app?code=$testiTesto.") val intent = Intent(ACTION_VIEW, uri, context, LoginActivity::class.java) ActivityScenario.launch(intent) Thread.sleep(1000) diff --git a/app/src/androidTest/java/com/h/pixeldroid/LoginCheckIntent.kt b/app/src/androidTest/java/org/pixeldroid/app/LoginCheckIntent.kt similarity index 88% rename from app/src/androidTest/java/com/h/pixeldroid/LoginCheckIntent.kt rename to app/src/androidTest/java/org/pixeldroid/app/LoginCheckIntent.kt index 43a183bf..571b77ac 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/LoginCheckIntent.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/LoginCheckIntent.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Intent import android.content.Intent.ACTION_VIEW @@ -15,12 +15,9 @@ import androidx.test.espresso.intent.matcher.IntentMatchers.hasDataString import androidx.test.espresso.matcher.RootMatchers.isDialog import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation -import androidx.test.rule.ActivityTestRule -import androidx.test.uiautomator.UiDevice -import com.h.pixeldroid.BuildConfig.INSTANCE_URI -import com.h.pixeldroid.testUtility.clearData -import com.h.pixeldroid.testUtility.waitForView +import org.pixeldroid.app.BuildConfig.INSTANCE_URI +import org.pixeldroid.app.testUtility.clearData +import org.pixeldroid.app.testUtility.waitForView import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.containsString import org.hamcrest.Matcher diff --git a/app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt b/app/src/androidTest/java/org/pixeldroid/app/MockedServerTest.kt similarity index 98% rename from app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/MockedServerTest.kt index 68f548da..663e5e9c 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/MockedServerTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context @@ -11,8 +11,8 @@ import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.android.material.tabs.TabLayout -import com.h.pixeldroid.testUtility.* -import com.h.pixeldroid.utils.db.AppDatabase +import org.pixeldroid.app.testUtility.* +import org.pixeldroid.app.utils.db.AppDatabase import org.junit.After import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/com/h/pixeldroid/PostCreationActivityTest.kt b/app/src/androidTest/java/org/pixeldroid/app/PostCreationActivityTest.kt similarity index 93% rename from app/src/androidTest/java/com/h/pixeldroid/PostCreationActivityTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/PostCreationActivityTest.kt index 85f72717..0c11b73d 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/PostCreationActivityTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/PostCreationActivityTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.Manifest import android.content.ClipData @@ -18,10 +18,10 @@ import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule -import com.h.pixeldroid.postCreation.PostCreationActivity -import com.h.pixeldroid.settings.AboutActivity -import com.h.pixeldroid.testUtility.* -import com.h.pixeldroid.utils.db.AppDatabase +import org.pixeldroid.app.postCreation.PostCreationActivity +import org.pixeldroid.app.settings.AboutActivity +import org.pixeldroid.app.testUtility.* +import org.pixeldroid.app.utils.db.AppDatabase import org.junit.* import org.junit.rules.Timeout import org.junit.runner.RunWith @@ -111,7 +111,7 @@ class PostCreationActivityTest { */ /** - * Makes sure the [com.h.pixeldroid.postCreation.photoEdit.PhotoEditActivity] is launched + * Makes sure the [org.pixeldroid.app.postCreation.photoEdit.PhotoEditActivity] is launched * when the edit button is pressed */ @Test @@ -191,7 +191,7 @@ class PostCreationActivityTest { } /** - * Makes sure the [com.h.pixeldroid.postCreation.camera.CameraActivity] is launched + * Makes sure the [org.pixeldroid.app.postCreation.camera.CameraActivity] is launched * when the add image button is pressed */ @Test diff --git a/app/src/androidTest/java/com/h/pixeldroid/PostCreationFragmentTest.kt b/app/src/androidTest/java/org/pixeldroid/app/PostCreationFragmentTest.kt similarity index 96% rename from app/src/androidTest/java/com/h/pixeldroid/PostCreationFragmentTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/PostCreationFragmentTest.kt index f5317e69..71788bbd 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/PostCreationFragmentTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/PostCreationFragmentTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context import android.content.Intent @@ -17,8 +17,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import com.google.android.material.tabs.TabLayout -import com.h.pixeldroid.testUtility.* -import com.h.pixeldroid.utils.db.AppDatabase +import org.pixeldroid.app.testUtility.* +import org.pixeldroid.app.utils.db.AppDatabase import org.hamcrest.Matcher import org.junit.After import org.junit.Before diff --git a/app/src/androidTest/java/com/h/pixeldroid/PostTest.kt b/app/src/androidTest/java/org/pixeldroid/app/PostTest.kt similarity index 95% rename from app/src/androidTest/java/com/h/pixeldroid/PostTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/PostTest.kt index 7426a9c0..5e833694 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/PostTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/PostTest.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context import android.content.Intent @@ -13,16 +13,14 @@ import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation -import com.h.pixeldroid.BuildConfig.INSTANCE_URI -import com.h.pixeldroid.posts.PostActivity -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity -import com.h.pixeldroid.utils.api.objects.* -import com.h.pixeldroid.testUtility.clearData -import com.h.pixeldroid.testUtility.initDB -import com.h.pixeldroid.testUtility.testiTesto -import com.h.pixeldroid.testUtility.testiTestoInstance +import org.pixeldroid.app.BuildConfig.INSTANCE_URI +import org.pixeldroid.app.posts.PostActivity +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.utils.api.objects.* +import org.pixeldroid.app.testUtility.clearData +import org.pixeldroid.app.testUtility.initDB +import org.pixeldroid.app.testUtility.testiTesto +import org.pixeldroid.app.testUtility.testiTestoInstance import org.hamcrest.CoreMatchers.anyOf import org.hamcrest.Matcher import org.junit.* diff --git a/app/src/androidTest/java/com/h/pixeldroid/ProfileTest.kt b/app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt similarity index 88% rename from app/src/androidTest/java/com/h/pixeldroid/ProfileTest.kt rename to app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt index a1acbf45..778a3946 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/ProfileTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt @@ -1,29 +1,24 @@ -package com.h.pixeldroid +package org.pixeldroid.app import android.content.Context import android.content.Intent import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider -import androidx.test.espresso.Espresso import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions import androidx.test.espresso.action.ViewActions.swipeDown import androidx.test.espresso.assertion.ViewAssertions -import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.h.pixeldroid.postCreation.PostCreationActivity -import com.h.pixeldroid.profile.ProfileActivity -import com.h.pixeldroid.testUtility.* -import com.h.pixeldroid.utils.api.objects.Account -import com.h.pixeldroid.utils.db.AppDatabase -import okhttp3.internal.wait +import org.pixeldroid.app.profile.ProfileActivity +import org.pixeldroid.app.testUtility.* +import org.pixeldroid.app.utils.api.objects.Account +import org.pixeldroid.app.utils.db.AppDatabase import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import java.io.Serializable @RunWith(AndroidJUnit4::class) class ProfileTest { diff --git a/app/src/androidTest/java/com/h/pixeldroid/testUtility/CustomMatchers.kt b/app/src/androidTest/java/org/pixeldroid/app/testUtility/CustomMatchers.kt similarity index 99% rename from app/src/androidTest/java/com/h/pixeldroid/testUtility/CustomMatchers.kt rename to app/src/androidTest/java/org/pixeldroid/app/testUtility/CustomMatchers.kt index de1ce3f2..3e5552b4 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/testUtility/CustomMatchers.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/testUtility/CustomMatchers.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.testUtility +package org.pixeldroid.app.testUtility import android.text.SpannableString import android.text.style.ClickableSpan @@ -15,7 +15,7 @@ import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.espresso.util.HumanReadables import androidx.test.espresso.util.TreeIterables -import com.h.pixeldroid.R +import org.pixeldroid.app.R import org.hamcrest.BaseMatcher import org.hamcrest.CoreMatchers.allOf import org.hamcrest.Description diff --git a/app/src/androidTest/java/com/h/pixeldroid/testUtility/DbHelpers.kt b/app/src/androidTest/java/org/pixeldroid/app/testUtility/DbHelpers.kt similarity index 79% rename from app/src/androidTest/java/com/h/pixeldroid/testUtility/DbHelpers.kt rename to app/src/androidTest/java/org/pixeldroid/app/testUtility/DbHelpers.kt index 57d84765..80cee48a 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/testUtility/DbHelpers.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/testUtility/DbHelpers.kt @@ -1,8 +1,8 @@ -package com.h.pixeldroid.testUtility +package org.pixeldroid.app.testUtility import android.content.Context import androidx.room.Room -import com.h.pixeldroid.utils.db.AppDatabase +import org.pixeldroid.app.utils.db.AppDatabase import org.ligi.tracedroid.TraceDroid diff --git a/app/src/androidTest/java/com/h/pixeldroid/testUtility/Values.kt b/app/src/androidTest/java/org/pixeldroid/app/testUtility/Values.kt similarity index 75% rename from app/src/androidTest/java/com/h/pixeldroid/testUtility/Values.kt rename to app/src/androidTest/java/org/pixeldroid/app/testUtility/Values.kt index c048b060..3d40505a 100644 --- a/app/src/androidTest/java/com/h/pixeldroid/testUtility/Values.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/testUtility/Values.kt @@ -1,8 +1,8 @@ -package com.h.pixeldroid.testUtility +package org.pixeldroid.app.testUtility -import com.h.pixeldroid.BuildConfig.* -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.BuildConfig.* +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity val testiTestoInstance = InstanceDatabaseEntity( uri = INSTANCE_URI, diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e02204f9..fc821de9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="org.pixeldroid.app"> @@ -15,7 +15,7 @@ - + - + @@ -104,19 +104,19 @@ android:resource="@xml/searchable" /> @ExperimentalPagingApi diff --git a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt b/app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt similarity index 87% rename from app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt rename to app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt index 67510ef3..146655d3 100644 --- a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.posts.feeds.uncachedFeeds.search +package org.pixeldroid.app.posts.feeds.uncachedFeeds.search import android.annotation.SuppressLint import android.os.Bundle @@ -11,13 +11,13 @@ import androidx.paging.ExperimentalPagingApi import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import com.h.pixeldroid.R -import com.h.pixeldroid.databinding.FragmentTagsBinding -import com.h.pixeldroid.posts.feeds.uncachedFeeds.FeedViewModel -import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedFeedFragment -import com.h.pixeldroid.posts.feeds.uncachedFeeds.ViewModelFactory -import com.h.pixeldroid.utils.api.objects.Results -import com.h.pixeldroid.utils.api.objects.Tag +import org.pixeldroid.app.R +import org.pixeldroid.app.databinding.FragmentTagsBinding +import org.pixeldroid.app.posts.feeds.uncachedFeeds.FeedViewModel +import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedFeedFragment +import org.pixeldroid.app.posts.feeds.uncachedFeeds.ViewModelFactory +import org.pixeldroid.app.utils.api.objects.Results +import org.pixeldroid.app.utils.api.objects.Tag /** * Fragment to show a list of [hashtag][Tag]s, as a result of a search. diff --git a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt b/app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt similarity index 88% rename from app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt rename to app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt index 1993f0f9..aca36be0 100644 --- a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt @@ -1,10 +1,10 @@ -package com.h.pixeldroid.posts.feeds.uncachedFeeds.search +package org.pixeldroid.app.posts.feeds.uncachedFeeds.search import androidx.paging.PagingSource import androidx.paging.PagingState -import com.h.pixeldroid.utils.api.PixelfedAPI -import com.h.pixeldroid.utils.api.objects.FeedContent -import com.h.pixeldroid.utils.api.objects.Results +import org.pixeldroid.app.utils.api.PixelfedAPI +import org.pixeldroid.app.utils.api.objects.FeedContent +import org.pixeldroid.app.utils.api.objects.Results import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt b/app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt similarity index 88% rename from app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt rename to app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt index db20290d..b91b4321 100644 --- a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.posts.feeds.uncachedFeeds.search +package org.pixeldroid.app.posts.feeds.uncachedFeeds.search import android.os.Bundle import android.view.LayoutInflater @@ -10,12 +10,12 @@ import androidx.paging.ExperimentalPagingApi import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import com.h.pixeldroid.R -import com.h.pixeldroid.posts.StatusViewHolder -import com.h.pixeldroid.posts.feeds.uncachedFeeds.* -import com.h.pixeldroid.utils.api.objects.Results -import com.h.pixeldroid.utils.api.objects.Status -import com.h.pixeldroid.utils.displayDimensionsInPx +import org.pixeldroid.app.R +import org.pixeldroid.app.posts.StatusViewHolder +import org.pixeldroid.app.posts.feeds.uncachedFeeds.* +import org.pixeldroid.app.utils.api.objects.Results +import org.pixeldroid.app.utils.api.objects.Status +import org.pixeldroid.app.utils.displayDimensionsInPx /** * Fragment to show a list of [Status]es, as a result of a search. diff --git a/app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt b/app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt similarity index 76% rename from app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt rename to app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt index 52f0017a..99d0c514 100644 --- a/app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt @@ -1,13 +1,13 @@ -package com.h.pixeldroid.profile +package org.pixeldroid.app.profile import android.os.Bundle -import com.h.pixeldroid.R -import com.h.pixeldroid.posts.feeds.uncachedFeeds.accountLists.AccountListFragment -import com.h.pixeldroid.utils.api.objects.Account -import com.h.pixeldroid.utils.api.objects.Account.Companion.ACCOUNT_ID_TAG -import com.h.pixeldroid.utils.api.objects.Account.Companion.ACCOUNT_TAG -import com.h.pixeldroid.utils.api.objects.Account.Companion.FOLLOWERS_TAG -import com.h.pixeldroid.utils.BaseActivity +import org.pixeldroid.app.R +import org.pixeldroid.app.posts.feeds.uncachedFeeds.accountLists.AccountListFragment +import org.pixeldroid.app.utils.api.objects.Account +import org.pixeldroid.app.utils.api.objects.Account.Companion.ACCOUNT_ID_TAG +import org.pixeldroid.app.utils.api.objects.Account.Companion.ACCOUNT_TAG +import org.pixeldroid.app.utils.api.objects.Account.Companion.FOLLOWERS_TAG +import org.pixeldroid.app.utils.BaseActivity class FollowsActivity : BaseActivity() { diff --git a/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt b/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt similarity index 93% rename from app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt rename to app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt index ba2b8e33..57e6e609 100644 --- a/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.profile +package org.pixeldroid.app.profile import android.content.Intent import android.os.Bundle @@ -19,24 +19,24 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.snackbar.Snackbar -import com.h.pixeldroid.R -import com.h.pixeldroid.databinding.ActivityProfileBinding -import com.h.pixeldroid.databinding.FragmentProfilePostsBinding -import com.h.pixeldroid.posts.PostActivity -import com.h.pixeldroid.posts.feeds.initAdapter -import com.h.pixeldroid.posts.feeds.launch -import com.h.pixeldroid.posts.feeds.uncachedFeeds.FeedViewModel -import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedContentRepository -import com.h.pixeldroid.posts.feeds.uncachedFeeds.profile.ProfileContentRepository -import com.h.pixeldroid.posts.parseHTMLText -import com.h.pixeldroid.utils.BaseActivity -import com.h.pixeldroid.utils.ImageConverter -import com.h.pixeldroid.utils.api.PixelfedAPI -import com.h.pixeldroid.utils.api.objects.Account -import com.h.pixeldroid.utils.api.objects.FeedContent -import com.h.pixeldroid.utils.api.objects.Status -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity -import com.h.pixeldroid.utils.openUrl +import org.pixeldroid.app.R +import org.pixeldroid.app.databinding.ActivityProfileBinding +import org.pixeldroid.app.databinding.FragmentProfilePostsBinding +import org.pixeldroid.app.posts.PostActivity +import org.pixeldroid.app.posts.feeds.initAdapter +import org.pixeldroid.app.posts.feeds.launch +import org.pixeldroid.app.posts.feeds.uncachedFeeds.FeedViewModel +import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedContentRepository +import org.pixeldroid.app.posts.feeds.uncachedFeeds.profile.ProfileContentRepository +import org.pixeldroid.app.posts.parseHTMLText +import org.pixeldroid.app.utils.BaseActivity +import org.pixeldroid.app.utils.ImageConverter +import org.pixeldroid.app.utils.api.PixelfedAPI +import org.pixeldroid.app.utils.api.objects.Account +import org.pixeldroid.app.utils.api.objects.FeedContent +import org.pixeldroid.app.utils.api.objects.Status +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.utils.openUrl import kotlinx.coroutines.Job import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/h/pixeldroid/profile/ProfilePostsRecyclerViewAdapter.kt b/app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt similarity index 86% rename from app/src/main/java/com/h/pixeldroid/profile/ProfilePostsRecyclerViewAdapter.kt rename to app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt index ce9a8d6e..bd3b6e51 100644 --- a/app/src/main/java/com/h/pixeldroid/profile/ProfilePostsRecyclerViewAdapter.kt +++ b/app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.profile +package org.pixeldroid.app.profile import android.content.Intent import android.view.LayoutInflater @@ -7,11 +7,11 @@ import android.view.ViewGroup import android.widget.ImageView import androidx.appcompat.content.res.AppCompatResources.getDrawable import androidx.recyclerview.widget.RecyclerView -import com.h.pixeldroid.posts.PostActivity -import com.h.pixeldroid.R -import com.h.pixeldroid.utils.api.objects.Status -import com.h.pixeldroid.utils.ImageConverter.Companion.setSquareImageFromDrawable -import com.h.pixeldroid.utils.ImageConverter.Companion.setSquareImageFromURL +import org.pixeldroid.app.posts.PostActivity +import org.pixeldroid.app.R +import org.pixeldroid.app.utils.api.objects.Status +import org.pixeldroid.app.utils.ImageConverter.Companion.setSquareImageFromDrawable +import org.pixeldroid.app.utils.ImageConverter.Companion.setSquareImageFromURL /** * [RecyclerView.Adapter] that can display a list of [Status]s diff --git a/app/src/main/java/com/h/pixeldroid/searchDiscover/SearchActivity.kt b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchActivity.kt similarity index 88% rename from app/src/main/java/com/h/pixeldroid/searchDiscover/SearchActivity.kt rename to app/src/main/java/org/pixeldroid/app/searchDiscover/SearchActivity.kt index f55c8d6b..0290ada4 100644 --- a/app/src/main/java/com/h/pixeldroid/searchDiscover/SearchActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchActivity.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.searchDiscover +package org.pixeldroid.app.searchDiscover import android.app.SearchManager import android.content.Intent @@ -8,12 +8,12 @@ import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator -import com.h.pixeldroid.R -import com.h.pixeldroid.posts.feeds.uncachedFeeds.search.SearchAccountFragment -import com.h.pixeldroid.posts.feeds.uncachedFeeds.search.SearchHashtagFragment -import com.h.pixeldroid.posts.feeds.uncachedFeeds.search.SearchPostsFragment -import com.h.pixeldroid.utils.api.objects.Results -import com.h.pixeldroid.utils.BaseActivity +import org.pixeldroid.app.R +import org.pixeldroid.app.posts.feeds.uncachedFeeds.search.SearchAccountFragment +import org.pixeldroid.app.posts.feeds.uncachedFeeds.search.SearchHashtagFragment +import org.pixeldroid.app.posts.feeds.uncachedFeeds.search.SearchPostsFragment +import org.pixeldroid.app.utils.api.objects.Results +import org.pixeldroid.app.utils.BaseActivity class SearchActivity : BaseActivity() { diff --git a/app/src/main/java/com/h/pixeldroid/searchDiscover/SearchDiscoverFragment.kt b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt similarity index 90% rename from app/src/main/java/com/h/pixeldroid/searchDiscover/SearchDiscoverFragment.kt rename to app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt index 1031f48f..2052460b 100644 --- a/app/src/main/java/com/h/pixeldroid/searchDiscover/SearchDiscoverFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.searchDiscover +package org.pixeldroid.app.searchDiscover import android.app.SearchManager import android.content.Context @@ -11,15 +11,15 @@ import androidx.annotation.StringRes import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.h.pixeldroid.R -import com.h.pixeldroid.databinding.FragmentSearchBinding -import com.h.pixeldroid.profile.ProfilePostViewHolder -import com.h.pixeldroid.utils.api.PixelfedAPI -import com.h.pixeldroid.utils.api.objects.Status -import com.h.pixeldroid.posts.PostActivity -import com.h.pixeldroid.utils.BaseFragment -import com.h.pixeldroid.utils.ImageConverter -import com.h.pixeldroid.utils.bindingLifecycleAware +import org.pixeldroid.app.R +import org.pixeldroid.app.databinding.FragmentSearchBinding +import org.pixeldroid.app.profile.ProfilePostViewHolder +import org.pixeldroid.app.utils.api.PixelfedAPI +import org.pixeldroid.app.utils.api.objects.Status +import org.pixeldroid.app.posts.PostActivity +import org.pixeldroid.app.utils.BaseFragment +import org.pixeldroid.app.utils.ImageConverter +import org.pixeldroid.app.utils.bindingLifecycleAware import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/h/pixeldroid/settings/AboutActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/AboutActivity.kt similarity index 76% rename from app/src/main/java/com/h/pixeldroid/settings/AboutActivity.kt rename to app/src/main/java/org/pixeldroid/app/settings/AboutActivity.kt index 2532186c..f4353a78 100644 --- a/app/src/main/java/com/h/pixeldroid/settings/AboutActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/settings/AboutActivity.kt @@ -1,11 +1,11 @@ -package com.h.pixeldroid.settings +package org.pixeldroid.app.settings import android.content.Intent import android.os.Bundle -import com.h.pixeldroid.BuildConfig -import com.h.pixeldroid.R -import com.h.pixeldroid.databinding.ActivityAboutBinding -import com.h.pixeldroid.utils.BaseActivity +import org.pixeldroid.app.BuildConfig +import org.pixeldroid.app.R +import org.pixeldroid.app.databinding.ActivityAboutBinding +import org.pixeldroid.app.utils.BaseActivity class AboutActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/h/pixeldroid/settings/LicenseActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt similarity index 73% rename from app/src/main/java/com/h/pixeldroid/settings/LicenseActivity.kt rename to app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt index 5394b267..dc272dad 100644 --- a/app/src/main/java/com/h/pixeldroid/settings/LicenseActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.settings +package org.pixeldroid.app.settings import android.os.Bundle -import com.h.pixeldroid.R -import com.h.pixeldroid.databinding.ActivityLicensesBinding -import com.h.pixeldroid.utils.BaseActivity +import org.pixeldroid.app.R +import org.pixeldroid.app.databinding.ActivityLicensesBinding +import org.pixeldroid.app.utils.BaseActivity class LicenseActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/h/pixeldroid/settings/SettingsActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt similarity index 92% rename from app/src/main/java/com/h/pixeldroid/settings/SettingsActivity.kt rename to app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt index feeed674..bc005412 100644 --- a/app/src/main/java/com/h/pixeldroid/settings/SettingsActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt @@ -1,14 +1,14 @@ -package com.h.pixeldroid.settings +package org.pixeldroid.app.settings import android.content.Intent import android.content.SharedPreferences import android.os.Bundle import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager -import com.h.pixeldroid.MainActivity -import com.h.pixeldroid.R -import com.h.pixeldroid.utils.BaseActivity -import com.h.pixeldroid.utils.setThemeFromPreferences +import org.pixeldroid.app.MainActivity +import org.pixeldroid.app.R +import org.pixeldroid.app.utils.BaseActivity +import org.pixeldroid.app.utils.setThemeFromPreferences class SettingsActivity : BaseActivity(), SharedPreferences.OnSharedPreferenceChangeListener { private var restartMainOnExit = false diff --git a/app/src/main/java/com/h/pixeldroid/utils/BaseActivity.kt b/app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt similarity index 93% rename from app/src/main/java/com/h/pixeldroid/utils/BaseActivity.kt rename to app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt index 61f4b358..987c60db 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/BaseActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils +package org.pixeldroid.app.utils import android.content.Context import android.content.res.Configuration @@ -7,8 +7,8 @@ import android.os.Build import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.preference.PreferenceManager -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.utils.di.PixelfedAPIHolder +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.utils.di.PixelfedAPIHolder import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/com/h/pixeldroid/utils/BaseFragment.kt b/app/src/main/java/org/pixeldroid/app/utils/BaseFragment.kt similarity index 80% rename from app/src/main/java/com/h/pixeldroid/utils/BaseFragment.kt rename to app/src/main/java/org/pixeldroid/app/utils/BaseFragment.kt index bb42777f..edac820a 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/BaseFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/BaseFragment.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils +package org.pixeldroid.app.utils import android.os.Bundle import androidx.fragment.app.Fragment -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.utils.di.PixelfedAPIHolder +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.utils.di.PixelfedAPIHolder import javax.inject.Inject /** diff --git a/app/src/main/java/com/h/pixeldroid/utils/BlurHashDecoder.kt b/app/src/main/java/org/pixeldroid/app/utils/BlurHashDecoder.kt similarity index 98% rename from app/src/main/java/com/h/pixeldroid/utils/BlurHashDecoder.kt rename to app/src/main/java/org/pixeldroid/app/utils/BlurHashDecoder.kt index 847edc45..d45cb367 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/BlurHashDecoder.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/BlurHashDecoder.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils +package org.pixeldroid.app.utils /** * Blurhash implementation from blurhash project: @@ -11,7 +11,6 @@ import android.content.res.Resources import android.graphics.Bitmap import android.graphics.Color import android.graphics.drawable.BitmapDrawable -import com.h.pixeldroid.utils.api.objects.Attachment import kotlin.math.PI import kotlin.math.cos import kotlin.math.pow diff --git a/app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt b/app/src/main/java/org/pixeldroid/app/utils/ImageConverter.kt similarity index 98% rename from app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt rename to app/src/main/java/org/pixeldroid/app/utils/ImageConverter.kt index 305e4196..ce8dca05 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/ImageConverter.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils +package org.pixeldroid.app.utils import android.graphics.drawable.Drawable import android.view.View @@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.h.pixeldroid.R +import org.pixeldroid.app.R class ImageConverter { companion object { diff --git a/app/src/main/java/com/h/pixeldroid/utils/PixelDroidApplication.kt b/app/src/main/java/org/pixeldroid/app/utils/PixelDroidApplication.kt similarity index 87% rename from app/src/main/java/com/h/pixeldroid/utils/PixelDroidApplication.kt rename to app/src/main/java/org/pixeldroid/app/utils/PixelDroidApplication.kt index abedc1fa..f47612b8 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/PixelDroidApplication.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/PixelDroidApplication.kt @@ -1,11 +1,10 @@ -package com.h.pixeldroid.utils +package org.pixeldroid.app.utils import android.app.Application import androidx.preference.PreferenceManager -import com.h.pixeldroid.utils.di.* +import org.pixeldroid.app.utils.di.* import com.mikepenz.iconics.Iconics import org.ligi.tracedroid.TraceDroid -import org.ligi.tracedroid.sending.sendTraceDroidStackTracesIfExist class PixelDroidApplication: Application() { diff --git a/app/src/main/java/com/h/pixeldroid/utils/Utils.kt b/app/src/main/java/org/pixeldroid/app/utils/Utils.kt similarity index 98% rename from app/src/main/java/com/h/pixeldroid/utils/Utils.kt rename to app/src/main/java/org/pixeldroid/app/utils/Utils.kt index 2431574b..4de86c61 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/Utils.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/Utils.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils +package org.pixeldroid.app.utils import android.content.ActivityNotFoundException import android.content.Context @@ -15,7 +15,7 @@ import androidx.browser.customtabs.CustomTabsIntent import androidx.fragment.app.Fragment import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner -import com.h.pixeldroid.R +import org.pixeldroid.app.R import okhttp3.HttpUrl import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt b/app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt similarity index 98% rename from app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt index f2e3f4a3..a45a48d0 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt @@ -1,6 +1,6 @@ -package com.h.pixeldroid.utils.api +package org.pixeldroid.app.utils.api -import com.h.pixeldroid.utils.api.objects.* +import org.pixeldroid.app.utils.api.objects.* import io.reactivex.Observable import okhttp3.MultipartBody import retrofit2.Response diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt similarity index 94% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt index 956aa5d5..c0493f9a 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt @@ -1,11 +1,11 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import android.content.Context import android.content.Intent import android.util.Log import androidx.core.content.ContextCompat.startActivity -import com.h.pixeldroid.profile.ProfileActivity -import com.h.pixeldroid.utils.api.PixelfedAPI +import org.pixeldroid.app.profile.ProfileActivity +import org.pixeldroid.app.utils.api.PixelfedAPI import retrofit2.HttpException import java.io.IOException import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Application.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Application.kt similarity index 87% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Application.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Application.kt index 7ee2aed6..a54374c3 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Application.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Application.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Attachment.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Attachment.kt similarity index 95% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Attachment.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Attachment.kt index 1202f338..610af953 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Attachment.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Attachment.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Card.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Card.kt similarity index 93% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Card.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Card.kt index 32b2cc56..6ddc6ee7 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Card.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Card.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Context.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Context.kt similarity index 65% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Context.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Context.kt index 244564fe..a36200c2 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Context.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Context.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/DiscoverPosts.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/DiscoverPosts.kt similarity index 73% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/DiscoverPosts.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/DiscoverPosts.kt index cf3c27f6..b8c82135 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/DiscoverPosts.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/DiscoverPosts.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Emoji.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Emoji.kt similarity index 85% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Emoji.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Emoji.kt index f1116e55..4a9197dd 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Emoji.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Emoji.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/org/pixeldroid/app/utils/api/objects/Error.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Error.kt new file mode 100644 index 00000000..3eb1de89 --- /dev/null +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Error.kt @@ -0,0 +1,5 @@ +package org.pixeldroid.app.utils.api.objects + +data class Error( + val error: String? +) \ No newline at end of file diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/FeedContent.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/FeedContent.kt similarity index 77% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/FeedContent.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/FeedContent.kt index 80ed4403..e9e188fb 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/FeedContent.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/FeedContent.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects interface FeedContent { val id: String? diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Field.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Field.kt similarity index 55% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Field.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Field.kt index 8c85c2c1..f7ad2d38 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Field.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Field.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/History.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/History.kt similarity index 72% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/History.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/History.kt index c3564411..dd605ed5 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/History.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/History.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects data class History( //Required attributes diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Instance.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Instance.kt similarity index 65% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Instance.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Instance.kt index bfac27d0..406ce082 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Instance.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Instance.kt @@ -1,6 +1,6 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_TOOT_CHARS +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_TOOT_CHARS data class Instance ( val description: String?, diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Mention.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Mention.kt similarity index 81% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Mention.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Mention.kt index ce3812b3..b67a6d7b 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Mention.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Mention.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/NodeInfo.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/NodeInfo.kt similarity index 96% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/NodeInfo.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/NodeInfo.kt index e302c88f..e72b54c1 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/NodeInfo.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/NodeInfo.kt @@ -1,6 +1,6 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects -import com.h.pixeldroid.utils.validDomain +import org.pixeldroid.app.utils.validDomain /* See https://nodeinfo.diaspora.software/schema.html and https://pixelfed.social/api/nodeinfo/2.0.json diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Notification.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt similarity index 92% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Notification.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt index fc5bf9ce..03b3dacc 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Notification.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity import java.io.Serializable import java.util.Date diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Poll.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Poll.kt similarity index 55% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Poll.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Poll.kt index 2ccecacb..264b9c21 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Poll.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Poll.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Relationship.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Relationship.kt similarity index 90% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Relationship.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Relationship.kt index e13d6449..54821d06 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Relationship.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Relationship.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Report.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Report.kt similarity index 53% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Report.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Report.kt index f8e4630d..ca5b5ced 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Report.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Report.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Results.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Results.kt similarity index 80% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Results.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Results.kt index 30674273..68ef182f 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Results.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Results.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Source.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Source.kt similarity index 55% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Source.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Source.kt index 625532da..8430be4e 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Source.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Source.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Status.kt similarity index 94% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Status.kt index 9b88e619..92b2acd7 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Status.kt @@ -1,21 +1,16 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import android.app.DownloadManager import android.content.Context import android.content.Intent import android.database.Cursor -import android.graphics.ColorMatrix -import android.graphics.ColorMatrixColorFilter import android.net.Uri import android.os.Environment import android.view.View -import android.view.View.GONE -import android.view.View.VISIBLE import androidx.core.net.toUri import com.google.android.material.snackbar.Snackbar -import com.h.pixeldroid.R -import com.h.pixeldroid.databinding.PostFragmentBinding -import com.h.pixeldroid.posts.getDomain +import org.pixeldroid.app.R +import org.pixeldroid.app.posts.getDomain import java.io.File import java.io.Serializable import java.util.* diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Tag.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Tag.kt similarity index 88% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Tag.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Tag.kt index 1dcc8c9a..5e4be534 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Tag.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Tag.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects import java.io.Serializable diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Token.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Token.kt similarity index 77% rename from app/src/main/java/com/h/pixeldroid/utils/api/objects/Token.kt rename to app/src/main/java/org/pixeldroid/app/utils/api/objects/Token.kt index 8681d2fc..04946aef 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Token.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Token.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.api.objects +package org.pixeldroid.app.utils.api.objects data class Token( val access_token: String?, diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/AppDatabase.kt b/app/src/main/java/org/pixeldroid/app/utils/db/AppDatabase.kt similarity index 52% rename from app/src/main/java/com/h/pixeldroid/utils/db/AppDatabase.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/AppDatabase.kt index e81e1d1d..c2a52989 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/AppDatabase.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/AppDatabase.kt @@ -1,17 +1,17 @@ -package com.h.pixeldroid.utils.db +package org.pixeldroid.app.utils.db import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters -import com.h.pixeldroid.utils.db.dao.* -import com.h.pixeldroid.utils.db.dao.feedContent.NotificationDao -import com.h.pixeldroid.utils.db.dao.feedContent.posts.HomePostDao -import com.h.pixeldroid.utils.db.dao.feedContent.posts.PublicPostDao -import com.h.pixeldroid.utils.db.entities.HomeStatusDatabaseEntity -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity -import com.h.pixeldroid.utils.db.entities.PublicFeedStatusDatabaseEntity -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity -import com.h.pixeldroid.utils.api.objects.Notification +import org.pixeldroid.app.utils.db.dao.* +import org.pixeldroid.app.utils.db.dao.feedContent.NotificationDao +import org.pixeldroid.app.utils.db.dao.feedContent.posts.HomePostDao +import org.pixeldroid.app.utils.db.dao.feedContent.posts.PublicPostDao +import org.pixeldroid.app.utils.db.entities.HomeStatusDatabaseEntity +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity +import org.pixeldroid.app.utils.db.entities.PublicFeedStatusDatabaseEntity +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.utils.api.objects.Notification @Database(entities = [ InstanceDatabaseEntity::class, diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/Converters.kt b/app/src/main/java/org/pixeldroid/app/utils/db/Converters.kt similarity index 97% rename from app/src/main/java/com/h/pixeldroid/utils/db/Converters.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/Converters.kt index acf5aee0..a3f42bfb 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/Converters.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/Converters.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils.db +package org.pixeldroid.app.utils.db import androidx.room.TypeConverter import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import com.h.pixeldroid.utils.api.objects.* +import org.pixeldroid.app.utils.api.objects.* import java.util.* class Converters { diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/DBUtils.kt b/app/src/main/java/org/pixeldroid/app/utils/db/DBUtils.kt similarity index 72% rename from app/src/main/java/com/h/pixeldroid/utils/db/DBUtils.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/DBUtils.kt index 08d3a490..0b874a3c 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/DBUtils.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/DBUtils.kt @@ -1,15 +1,15 @@ -package com.h.pixeldroid.utils.db +package org.pixeldroid.app.utils.db -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity -import com.h.pixeldroid.utils.api.objects.Account -import com.h.pixeldroid.utils.api.objects.Instance -import com.h.pixeldroid.utils.api.objects.NodeInfo -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_ALBUM_LIMIT -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_PHOTO_SIZE -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_TOOT_CHARS -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_VIDEO_SIZE -import com.h.pixeldroid.utils.normalizeDomain +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.utils.api.objects.Account +import org.pixeldroid.app.utils.api.objects.Instance +import org.pixeldroid.app.utils.api.objects.NodeInfo +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_ALBUM_LIMIT +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_PHOTO_SIZE +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_TOOT_CHARS +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_VIDEO_SIZE +import org.pixeldroid.app.utils.normalizeDomain import java.lang.IllegalArgumentException fun addUser(db: AppDatabase, account: Account, instance_uri: String, activeUser: Boolean = true, diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/dao/InstanceDao.kt b/app/src/main/java/org/pixeldroid/app/utils/db/dao/InstanceDao.kt similarity index 84% rename from app/src/main/java/com/h/pixeldroid/utils/db/dao/InstanceDao.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/dao/InstanceDao.kt index c4887174..59ee3771 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/dao/InstanceDao.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/dao/InstanceDao.kt @@ -1,7 +1,7 @@ -package com.h.pixeldroid.utils.db.dao +package org.pixeldroid.app.utils.db.dao import androidx.room.* -import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity @Dao interface InstanceDao { diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/dao/UserDao.kt b/app/src/main/java/org/pixeldroid/app/utils/db/dao/UserDao.kt similarity index 90% rename from app/src/main/java/com/h/pixeldroid/utils/db/dao/UserDao.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/dao/UserDao.kt index 35c96f49..396f152e 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/dao/UserDao.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/dao/UserDao.kt @@ -1,7 +1,7 @@ -package com.h.pixeldroid.utils.db.dao +package org.pixeldroid.app.utils.db.dao import androidx.room.* -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity @Dao interface UserDao { diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/FeedContentDao.kt b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/FeedContentDao.kt similarity index 79% rename from app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/FeedContentDao.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/FeedContentDao.kt index 22673b29..d4985b07 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/FeedContentDao.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/FeedContentDao.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils.db.dao.feedContent +package org.pixeldroid.app.utils.db.dao.feedContent import androidx.paging.PagingSource import androidx.room.Insert import androidx.room.OnConflictStrategy -import com.h.pixeldroid.utils.api.objects.FeedContentDatabase +import org.pixeldroid.app.utils.api.objects.FeedContentDatabase interface FeedContentDao{ diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/NotificationDao.kt b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/NotificationDao.kt similarity index 85% rename from app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/NotificationDao.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/NotificationDao.kt index b4fa57d2..0a6717df 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/NotificationDao.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/NotificationDao.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils.db.dao.feedContent +package org.pixeldroid.app.utils.db.dao.feedContent import androidx.paging.PagingSource import androidx.room.Dao import androidx.room.Query -import com.h.pixeldroid.utils.api.objects.Notification +import org.pixeldroid.app.utils.api.objects.Notification @Dao interface NotificationDao: FeedContentDao { diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/posts/HomePostDao.kt b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/posts/HomePostDao.kt similarity index 77% rename from app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/posts/HomePostDao.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/posts/HomePostDao.kt index 3f7b1b4b..2236785a 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/posts/HomePostDao.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/posts/HomePostDao.kt @@ -1,10 +1,10 @@ -package com.h.pixeldroid.utils.db.dao.feedContent.posts +package org.pixeldroid.app.utils.db.dao.feedContent.posts import androidx.paging.PagingSource import androidx.room.Dao import androidx.room.Query -import com.h.pixeldroid.utils.db.dao.feedContent.FeedContentDao -import com.h.pixeldroid.utils.db.entities.HomeStatusDatabaseEntity +import org.pixeldroid.app.utils.db.dao.feedContent.FeedContentDao +import org.pixeldroid.app.utils.db.entities.HomeStatusDatabaseEntity @Dao interface HomePostDao: FeedContentDao { diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/posts/PublicPostDao.kt b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/posts/PublicPostDao.kt similarity index 77% rename from app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/posts/PublicPostDao.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/posts/PublicPostDao.kt index 6658ae40..7901f0a1 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/dao/feedContent/posts/PublicPostDao.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/dao/feedContent/posts/PublicPostDao.kt @@ -1,10 +1,10 @@ -package com.h.pixeldroid.utils.db.dao.feedContent.posts +package org.pixeldroid.app.utils.db.dao.feedContent.posts import androidx.paging.PagingSource import androidx.room.Dao import androidx.room.Query -import com.h.pixeldroid.utils.db.dao.feedContent.FeedContentDao -import com.h.pixeldroid.utils.db.entities.PublicFeedStatusDatabaseEntity +import org.pixeldroid.app.utils.db.dao.feedContent.FeedContentDao +import org.pixeldroid.app.utils.db.entities.PublicFeedStatusDatabaseEntity @Dao interface PublicPostDao: FeedContentDao { diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/entities/HomeStatusDatabaseEntity.kt b/app/src/main/java/org/pixeldroid/app/utils/db/entities/HomeStatusDatabaseEntity.kt similarity index 97% rename from app/src/main/java/com/h/pixeldroid/utils/db/entities/HomeStatusDatabaseEntity.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/entities/HomeStatusDatabaseEntity.kt index d0a3fcf6..42d0653d 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/entities/HomeStatusDatabaseEntity.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/entities/HomeStatusDatabaseEntity.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils.db.entities +package org.pixeldroid.app.utils.db.entities import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index -import com.h.pixeldroid.utils.api.objects.* +import org.pixeldroid.app.utils.api.objects.* import java.util.* @Entity( diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/entities/InstanceDatabaseEntity.kt b/app/src/main/java/org/pixeldroid/app/utils/db/entities/InstanceDatabaseEntity.kt similarity index 91% rename from app/src/main/java/com/h/pixeldroid/utils/db/entities/InstanceDatabaseEntity.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/entities/InstanceDatabaseEntity.kt index 2906dcb1..58e71342 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/entities/InstanceDatabaseEntity.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/entities/InstanceDatabaseEntity.kt @@ -1,8 +1,7 @@ -package com.h.pixeldroid.utils.db.entities +package org.pixeldroid.app.utils.db.entities import androidx.room.Entity import androidx.room.PrimaryKey -import com.h.pixeldroid.utils.api.objects.Instance @Entity(tableName = "instances") data class InstanceDatabaseEntity ( diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/entities/PublicFeedStatusDatabaseEntity.kt b/app/src/main/java/org/pixeldroid/app/utils/db/entities/PublicFeedStatusDatabaseEntity.kt similarity index 97% rename from app/src/main/java/com/h/pixeldroid/utils/db/entities/PublicFeedStatusDatabaseEntity.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/entities/PublicFeedStatusDatabaseEntity.kt index f08b6eba..9986d601 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/entities/PublicFeedStatusDatabaseEntity.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/entities/PublicFeedStatusDatabaseEntity.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils.db.entities +package org.pixeldroid.app.utils.db.entities import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index -import com.h.pixeldroid.utils.api.objects.* +import org.pixeldroid.app.utils.api.objects.* import java.util.* @Entity( diff --git a/app/src/main/java/com/h/pixeldroid/utils/db/entities/UserDatabaseEntity.kt b/app/src/main/java/org/pixeldroid/app/utils/db/entities/UserDatabaseEntity.kt similarity index 94% rename from app/src/main/java/com/h/pixeldroid/utils/db/entities/UserDatabaseEntity.kt rename to app/src/main/java/org/pixeldroid/app/utils/db/entities/UserDatabaseEntity.kt index cd0e8b20..54725b4d 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/db/entities/UserDatabaseEntity.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/entities/UserDatabaseEntity.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.db.entities +package org.pixeldroid.app.utils.db.entities import androidx.room.Entity import androidx.room.ForeignKey diff --git a/app/src/main/java/com/h/pixeldroid/utils/di/APIModule.kt b/app/src/main/java/org/pixeldroid/app/utils/di/APIModule.kt similarity index 93% rename from app/src/main/java/com/h/pixeldroid/utils/di/APIModule.kt rename to app/src/main/java/org/pixeldroid/app/utils/di/APIModule.kt index a60ecf90..06ff09a8 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/di/APIModule.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/di/APIModule.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid.utils.di +package org.pixeldroid.app.utils.di -import com.h.pixeldroid.utils.api.PixelfedAPI -import com.h.pixeldroid.utils.api.objects.Token -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.utils.api.PixelfedAPI +import org.pixeldroid.app.utils.api.objects.Token +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity import dagger.Module import dagger.Provides import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/com/h/pixeldroid/utils/di/ApplicationComponent.kt b/app/src/main/java/org/pixeldroid/app/utils/di/ApplicationComponent.kt similarity index 67% rename from app/src/main/java/com/h/pixeldroid/utils/di/ApplicationComponent.kt rename to app/src/main/java/org/pixeldroid/app/utils/di/ApplicationComponent.kt index 253cd6e1..3fdff9b7 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/di/ApplicationComponent.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/di/ApplicationComponent.kt @@ -1,11 +1,11 @@ -package com.h.pixeldroid.utils.di +package org.pixeldroid.app.utils.di import android.app.Application import android.content.Context -import com.h.pixeldroid.utils.BaseActivity -import com.h.pixeldroid.utils.PixelDroidApplication -import com.h.pixeldroid.utils.db.AppDatabase -import com.h.pixeldroid.utils.BaseFragment +import org.pixeldroid.app.utils.BaseActivity +import org.pixeldroid.app.utils.PixelDroidApplication +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.utils.BaseFragment import dagger.Component import javax.inject.Singleton diff --git a/app/src/main/java/com/h/pixeldroid/utils/di/ApplicationModule.kt b/app/src/main/java/org/pixeldroid/app/utils/di/ApplicationModule.kt similarity index 92% rename from app/src/main/java/com/h/pixeldroid/utils/di/ApplicationModule.kt rename to app/src/main/java/org/pixeldroid/app/utils/di/ApplicationModule.kt index 16bca60b..88b8008e 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/di/ApplicationModule.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/di/ApplicationModule.kt @@ -1,4 +1,4 @@ -package com.h.pixeldroid.utils.di +package org.pixeldroid.app.utils.di import android.app.Application import android.content.Context diff --git a/app/src/main/java/com/h/pixeldroid/utils/di/DatabaseModule.kt b/app/src/main/java/org/pixeldroid/app/utils/di/DatabaseModule.kt similarity index 83% rename from app/src/main/java/com/h/pixeldroid/utils/di/DatabaseModule.kt rename to app/src/main/java/org/pixeldroid/app/utils/di/DatabaseModule.kt index c58be288..6b2e4dbe 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/di/DatabaseModule.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/di/DatabaseModule.kt @@ -1,8 +1,8 @@ -package com.h.pixeldroid.utils.di +package org.pixeldroid.app.utils.di import android.content.Context import androidx.room.Room -import com.h.pixeldroid.utils.db.AppDatabase +import org.pixeldroid.app.utils.db.AppDatabase import dagger.Module import dagger.Provides import javax.inject.Singleton diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a7fed3d6..082aad05 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context="com.h.pixeldroid.MainActivity"> + tools:context="org.pixeldroid.app.MainActivity"> - - - - + diff --git a/app/src/main/res/layout/image_album_creation.xml b/app/src/main/res/layout/image_album_creation.xml index cb763f56..1409a55e 100644 --- a/app/src/main/res/layout/image_album_creation.xml +++ b/app/src/main/res/layout/image_album_creation.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/post_fragment.xml b/app/src/main/res/layout/post_fragment.xml index 6d538ec2..10e73aae 100644 --- a/app/src/main/res/layout/post_fragment.xml +++ b/app/src/main/res/layout/post_fragment.xml @@ -55,7 +55,7 @@ android:layout_marginTop="10dp" app:layout_constraintTop_toBottomOf="@+id/profilePic"> - - + - + diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index f3e04443..2ffb30f9 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -26,7 +26,7 @@ android:summary="@string/about_pixeldroid" app:icon="@drawable/info_black_24dp"> + android:targetPackage="org.pixeldroid.app" + android:targetClass="org.pixeldroid.app.settings.AboutActivity"/> diff --git a/app/src/test/java/com/h/pixeldroid/APIUnitTest.kt b/app/src/test/java/org/pixeldroid/app/APIUnitTest.kt similarity index 99% rename from app/src/test/java/com/h/pixeldroid/APIUnitTest.kt rename to app/src/test/java/org/pixeldroid/app/APIUnitTest.kt index 142d2dc6..cb683510 100644 --- a/app/src/test/java/com/h/pixeldroid/APIUnitTest.kt +++ b/app/src/test/java/org/pixeldroid/app/APIUnitTest.kt @@ -1,9 +1,9 @@ -package com.h.pixeldroid +package org.pixeldroid.app import com.github.tomakehurst.wiremock.client.WireMock.* import com.github.tomakehurst.wiremock.junit.WireMockRule -import com.h.pixeldroid.utils.api.PixelfedAPI -import com.h.pixeldroid.utils.api.objects.* +import org.pixeldroid.app.utils.api.PixelfedAPI +import org.pixeldroid.app.utils.api.objects.* import kotlinx.coroutines.runBlocking import org.junit.Assert.assertEquals import org.junit.Rule @@ -140,7 +140,7 @@ class APIUnitTest { ))) val OAUTH_SCHEME = "oauth2redirect" val SCOPE = "read write follow" - val PACKAGE_ID = "com.h.pixeldroid" + val PACKAGE_ID = "org.pixeldroid.app" val token: Token = runBlocking { PixelfedAPI.createFromUrl("http://localhost:8089") diff --git a/app/src/test/java/com/h/pixeldroid/PostUnitTest.kt b/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt similarity index 97% rename from app/src/test/java/com/h/pixeldroid/PostUnitTest.kt rename to app/src/test/java/org/pixeldroid/app/PostUnitTest.kt index e70bb86f..c9a89937 100644 --- a/app/src/test/java/com/h/pixeldroid/PostUnitTest.kt +++ b/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt @@ -1,6 +1,6 @@ -package com.h.pixeldroid +package org.pixeldroid.app -import com.h.pixeldroid.utils.api.objects.* +import org.pixeldroid.app.utils.api.objects.* import org.junit.Assert import org.junit.Test import java.text.SimpleDateFormat From d75e349070e888693ed2fdabe2a492dec6299021 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Thu, 22 Apr 2021 12:01:10 +0200 Subject: [PATCH 2/2] fix wrong rename --- app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt b/app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt index 04a38746..8df00b14 100644 --- a/app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt +++ b/app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt @@ -88,7 +88,7 @@ class CameraTest { val scenario = launchFragmentInContainer() scenario.onFragment { fragment -> - fragment.view?.findViewById(_root_ide_package_.org.pixeldroid.app.R.id.photo_view_button)?.performClick() + fragment.view?.findViewById(R.id.photo_view_button)?.performClick() } Thread.sleep(1000) @@ -99,7 +99,7 @@ class CameraTest { fun switchButton() { val scenario = launchFragmentInContainer() scenario.onFragment { fragment -> - fragment.view?.findViewById(_root_ide_package_.org.pixeldroid.app.R.id.camera_switch_button)?.performClick() + fragment.view?.findViewById(R.id.camera_switch_button)?.performClick() } Thread.sleep(1000)