Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'rename_app_id' into 'master'

Browse Source 
Rename app id

Closes #221

See merge request pixeldroid/PixelDroid!331
This commit is contained in:
Matthieu 2021-04-22 14:49:12 +00:00
commit dce522bc46
131 changed files with 507 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -21,7 +21,7 @@ android {
freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"] freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"]
} }
defaultConfig { defaultConfig {
applicationId "com.h.pixeldroid" applicationId "org.pixeldroid.app"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 10 versionCode 10

4
app/proguard-rules.pro vendored
View File

@ -37,9 +37,9 @@
# APP SPECIFIC OPTIONS # APP SPECIFIC OPTIONS
# keep members of our model classes, they are used in json de/serialization # 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; **[] $VALUES;
public *; public *;
} }

12
app/src/androidTest/java/com/h/pixeldroid/CameraTest.kt → app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.Manifest import android.Manifest
import android.content.Context 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.Intents
import androidx.test.espresso.intent.matcher.IntentMatchers import androidx.test.espresso.intent.matcher.IntentMatchers
import androidx.test.rule.GrantPermissionRule import androidx.test.rule.GrantPermissionRule
import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
import com.h.pixeldroid.postCreation.camera.CameraFragment import org.pixeldroid.app.postCreation.camera.CameraFragment
import com.h.pixeldroid.testUtility.clearData import org.pixeldroid.app.testUtility.clearData
import com.h.pixeldroid.testUtility.initDB import org.pixeldroid.app.testUtility.initDB
import org.hamcrest.CoreMatchers import org.hamcrest.CoreMatchers
import org.hamcrest.Matcher import org.hamcrest.Matcher
import org.junit.After import org.junit.After

6
app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt → app/src/androidTest/java/org/pixeldroid/app/DrawerMenuTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import androidx.test.core.app.ActivityScenario 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.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiDevice
import com.h.pixeldroid.testUtility.* import org.pixeldroid.app.testUtility.*
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule

16
app/src/androidTest/java/com/h/pixeldroid/EditPhotoTest.kt → app/src/androidTest/java/org/pixeldroid/app/EditPhotoTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -22,13 +22,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.GrantPermissionRule import androidx.test.rule.GrantPermissionRule
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import com.h.pixeldroid.postCreation.photoEdit.PhotoEditActivity import org.pixeldroid.app.postCreation.photoEdit.PhotoEditActivity
import com.h.pixeldroid.postCreation.photoEdit.ThumbnailAdapter import org.pixeldroid.app.postCreation.photoEdit.ThumbnailAdapter
import com.h.pixeldroid.settings.AboutActivity import org.pixeldroid.app.settings.AboutActivity
import com.h.pixeldroid.testUtility.clearData import org.pixeldroid.app.testUtility.clearData
import com.h.pixeldroid.testUtility.clickChildViewWithId import org.pixeldroid.app.testUtility.clickChildViewWithId
import com.h.pixeldroid.testUtility.slowSwipeLeft import org.pixeldroid.app.testUtility.slowSwipeLeft
import com.h.pixeldroid.testUtility.waitForView import org.pixeldroid.app.testUtility.waitForView
import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.allOf
import org.junit.* import org.junit.*
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue

9
app/src/androidTest/java/com/h/pixeldroid/HomeFeedTest.kt → app/src/androidTest/java/org/pixeldroid/app/HomeFeedTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
@ -11,10 +11,9 @@ import androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition
import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.viewpager2.widget.ViewPager2 import androidx.viewpager2.widget.ViewPager2
import com.google.android.material.tabs.TabLayout import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.posts.StatusViewHolder
import com.h.pixeldroid.posts.StatusViewHolder import org.pixeldroid.app.testUtility.*
import com.h.pixeldroid.testUtility.*
import org.hamcrest.CoreMatchers.not import org.hamcrest.CoreMatchers.not
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before

24
app/src/androidTest/java/com/h/pixeldroid/IntentTest.kt → app/src/androidTest/java/org/pixeldroid/app/IntentTest.kt
View File

@ -1,17 +1,10 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import android.content.Intent 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.ActivityScenario
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso 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.action.ViewActions
import androidx.test.espresso.assertion.ViewAssertions import androidx.test.espresso.assertion.ViewAssertions
import androidx.test.espresso.contrib.DrawerActions 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.espresso.matcher.ViewMatchers
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.rule.ActivityTestRule import androidx.test.rule.ActivityTestRule
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity import org.pixeldroid.app.posts.StatusViewHolder
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.utils.api.objects.Account
import com.h.pixeldroid.posts.StatusViewHolder import org.pixeldroid.app.utils.api.objects.Account.Companion.ACCOUNT_TAG
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.settings.AboutActivity
import com.h.pixeldroid.utils.api.objects.Account.Companion.ACCOUNT_TAG import org.pixeldroid.app.testUtility.*
import com.h.pixeldroid.settings.AboutActivity
import com.h.pixeldroid.testUtility.*
import org.hamcrest.CoreMatchers import org.hamcrest.CoreMatchers
import org.hamcrest.Matcher import org.hamcrest.Matcher
import org.hamcrest.Matchers
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule

8
app/src/androidTest/java/com/h/pixeldroid/LoginActivityOfflineTest.kt → app/src/androidTest/java/org/pixeldroid/app/LoginActivityOfflineTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
/* /*
import android.content.Context import android.content.Context
import androidx.test.core.app.ActivityScenario 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.platform.app.InstrumentationRegistry.getInstrumentation
import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiDevice
import androidx.test.uiautomator.UiSelector import androidx.test.uiautomator.UiSelector
import com.h.pixeldroid.testUtility.clearData import org.pixeldroid.app.testUtility.clearData
import com.h.pixeldroid.testUtility.initDB import org.pixeldroid.app.testUtility.initDB
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule

21
app/src/androidTest/java/com/h/pixeldroid/LoginActivityOnlineTest.kt → app/src/androidTest/java/org/pixeldroid/app/LoginActivityOnlineTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import android.content.Intent 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.action.ViewActions.replaceText
import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.hasErrorText import androidx.test.espresso.matcher.ViewMatchers.hasErrorText
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity import org.pixeldroid.app.testUtility.clearData
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.testUtility.initDB
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.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
@ -44,7 +39,7 @@ class LoginActivityOnlineTest {
fun setup() { fun setup() {
context = ApplicationProvider.getApplicationContext() context = ApplicationProvider.getApplicationContext()
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() pref.edit().clear().apply()
db = initDB(context) db = initDB(context)
db.clearAllTables() db.clearAllTables()
@ -81,7 +76,7 @@ class LoginActivityOnlineTest {
.putString("clientID", "iwndoiuqwnd") .putString("clientID", "iwndoiuqwnd")
.putString("clientSecret", "wlifowed") .putString("clientSecret", "wlifowed")
.apply() .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) val intent = Intent(ACTION_VIEW, uri, context, LoginActivity::class.java)
ActivityScenario.launch<LoginActivity>(intent) ActivityScenario.launch<LoginActivity>(intent)
onView(withId(R.id.editText)).check(matches( onView(withId(R.id.editText)).check(matches(
@ -91,7 +86,7 @@ class LoginActivityOnlineTest {
@Test @Test
fun incompleteIntentReturnInfoFailsTest() { 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) val intent = Intent(ACTION_VIEW, uri, context, LoginActivity::class.java)
ActivityScenario.launch<LoginActivity>(intent) ActivityScenario.launch<LoginActivity>(intent)
onView(withId(R.id.editText)).check(matches( onView(withId(R.id.editText)).check(matches(
@ -117,7 +112,7 @@ class LoginActivityOnlineTest {
.putString("clientID", testiTesto.clientId) .putString("clientID", testiTesto.clientId)
.putString("clientSecret", testiTesto.clientSecret) .putString("clientSecret", testiTesto.clientSecret)
.apply() .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) val intent = Intent(ACTION_VIEW, uri, context, LoginActivity::class.java)
ActivityScenario.launch<LoginActivity>(intent) ActivityScenario.launch<LoginActivity>(intent)
Thread.sleep(1000) Thread.sleep(1000)

11
app/src/androidTest/java/com/h/pixeldroid/LoginCheckIntent.kt → app/src/androidTest/java/org/pixeldroid/app/LoginCheckIntent.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Intent import android.content.Intent
import android.content.Intent.ACTION_VIEW 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.RootMatchers.isDialog
import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import org.pixeldroid.app.BuildConfig.INSTANCE_URI
import androidx.test.rule.ActivityTestRule import org.pixeldroid.app.testUtility.clearData
import androidx.test.uiautomator.UiDevice import org.pixeldroid.app.testUtility.waitForView
import com.h.pixeldroid.BuildConfig.INSTANCE_URI
import com.h.pixeldroid.testUtility.clearData
import com.h.pixeldroid.testUtility.waitForView
import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.containsString import org.hamcrest.CoreMatchers.containsString
import org.hamcrest.Matcher import org.hamcrest.Matcher

6
app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt → app/src/androidTest/java/org/pixeldroid/app/MockedServerTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
@ -11,8 +11,8 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.* import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import com.h.pixeldroid.testUtility.* import org.pixeldroid.app.testUtility.*
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test

14
app/src/androidTest/java/com/h/pixeldroid/PostCreationActivityTest.kt → app/src/androidTest/java/org/pixeldroid/app/PostCreationActivityTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.Manifest import android.Manifest
import android.content.ClipData import android.content.ClipData
@ -18,10 +18,10 @@ import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.GrantPermissionRule import androidx.test.rule.GrantPermissionRule
import com.h.pixeldroid.postCreation.PostCreationActivity import org.pixeldroid.app.postCreation.PostCreationActivity
import com.h.pixeldroid.settings.AboutActivity import org.pixeldroid.app.settings.AboutActivity
import com.h.pixeldroid.testUtility.* import org.pixeldroid.app.testUtility.*
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import org.junit.* import org.junit.*
import org.junit.rules.Timeout import org.junit.rules.Timeout
import org.junit.runner.RunWith 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 * when the edit button is pressed
*/ */
@Test @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 * when the add image button is pressed
*/ */
@Test @Test

6
app/src/androidTest/java/com/h/pixeldroid/PostCreationFragmentTest.kt → app/src/androidTest/java/org/pixeldroid/app/PostCreationFragmentTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -17,8 +17,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.GrantPermissionRule import androidx.test.rule.GrantPermissionRule
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import com.h.pixeldroid.testUtility.* import org.pixeldroid.app.testUtility.*
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import org.hamcrest.Matcher import org.hamcrest.Matcher
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before

20
app/src/androidTest/java/com/h/pixeldroid/PostTest.kt → app/src/androidTest/java/org/pixeldroid/app/PostTest.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -13,16 +13,14 @@ import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
import com.h.pixeldroid.BuildConfig.INSTANCE_URI import org.pixeldroid.app.BuildConfig.INSTANCE_URI
import com.h.pixeldroid.posts.PostActivity import org.pixeldroid.app.posts.PostActivity
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity import org.pixeldroid.app.utils.api.objects.*
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.testUtility.clearData
import com.h.pixeldroid.utils.api.objects.* import org.pixeldroid.app.testUtility.initDB
import com.h.pixeldroid.testUtility.clearData import org.pixeldroid.app.testUtility.testiTesto
import com.h.pixeldroid.testUtility.initDB import org.pixeldroid.app.testUtility.testiTestoInstance
import com.h.pixeldroid.testUtility.testiTesto
import com.h.pixeldroid.testUtility.testiTestoInstance
import org.hamcrest.CoreMatchers.anyOf import org.hamcrest.CoreMatchers.anyOf
import org.hamcrest.Matcher import org.hamcrest.Matcher
import org.junit.* import org.junit.*

15
app/src/androidTest/java/com/h/pixeldroid/ProfileTest.kt → app/src/androidTest/java/org/pixeldroid/app/ProfileTest.kt
View File

@ -1,29 +1,24 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso
import androidx.test.espresso.Espresso.onView import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions import androidx.test.espresso.action.ViewActions
import androidx.test.espresso.action.ViewActions.swipeDown import androidx.test.espresso.action.ViewActions.swipeDown
import androidx.test.espresso.assertion.ViewAssertions import androidx.test.espresso.assertion.ViewAssertions
import androidx.test.espresso.contrib.RecyclerViewActions
import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.h.pixeldroid.postCreation.PostCreationActivity import org.pixeldroid.app.profile.ProfileActivity
import com.h.pixeldroid.profile.ProfileActivity import org.pixeldroid.app.testUtility.*
import com.h.pixeldroid.testUtility.* import org.pixeldroid.app.utils.api.objects.Account
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.AppDatabase
import okhttp3.internal.wait
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import java.io.Serializable
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
class ProfileTest { class ProfileTest {

4
app/src/androidTest/java/com/h/pixeldroid/testUtility/CustomMatchers.kt → app/src/androidTest/java/org/pixeldroid/app/testUtility/CustomMatchers.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.testUtility package org.pixeldroid.app.testUtility
import android.text.SpannableString import android.text.SpannableString
import android.text.style.ClickableSpan 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.matcher.ViewMatchers.*
import androidx.test.espresso.util.HumanReadables import androidx.test.espresso.util.HumanReadables
import androidx.test.espresso.util.TreeIterables import androidx.test.espresso.util.TreeIterables
import com.h.pixeldroid.R import org.pixeldroid.app.R
import org.hamcrest.BaseMatcher import org.hamcrest.BaseMatcher
import org.hamcrest.CoreMatchers.allOf import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.Description import org.hamcrest.Description

4
app/src/androidTest/java/com/h/pixeldroid/testUtility/DbHelpers.kt → app/src/androidTest/java/org/pixeldroid/app/testUtility/DbHelpers.kt
View File

@ -1,8 +1,8 @@
package com.h.pixeldroid.testUtility package org.pixeldroid.app.testUtility
import android.content.Context import android.content.Context
import androidx.room.Room import androidx.room.Room
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import org.ligi.tracedroid.TraceDroid import org.ligi.tracedroid.TraceDroid

8
app/src/androidTest/java/com/h/pixeldroid/testUtility/Values.kt → app/src/androidTest/java/org/pixeldroid/app/testUtility/Values.kt
View File

@ -1,8 +1,8 @@
package com.h.pixeldroid.testUtility package org.pixeldroid.app.testUtility
import com.h.pixeldroid.BuildConfig.* import org.pixeldroid.app.BuildConfig.*
import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
val testiTestoInstance = InstanceDatabaseEntity( val testiTestoInstance = InstanceDatabaseEntity(
uri = INSTANCE_URI, uri = INSTANCE_URI,

38
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.h.pixeldroid"> package="org.pixeldroid.app">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@ -15,7 +15,7 @@
<uses-feature android:name="android.hardware.location.gps" /> <uses-feature android:name="android.hardware.location.gps" />
<application <application
android:name=".utils.PixelDroidApplication" android:name="org.pixeldroid.app.utils.PixelDroidApplication"
android:allowBackup="false" android:allowBackup="false"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
@ -23,37 +23,37 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:replace="android:allowBackup"> tools:replace="android:allowBackup">
<activity android:name="com.h.pixeldroid.postCreation.camera.CameraActivity" /> <activity android:name="org.pixeldroid.app.postCreation.camera.CameraActivity" />
<activity <activity
android:name=".posts.ReportActivity" android:name="org.pixeldroid.app.posts.ReportActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity android:name=".postCreation.photoEdit.PhotoEditActivity" /> <activity android:name="org.pixeldroid.app.postCreation.photoEdit.PhotoEditActivity" />
<activity <activity
android:name=".postCreation.PostCreationActivity" android:name="org.pixeldroid.app.postCreation.PostCreationActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity <activity
android:name=".profile.FollowsActivity" android:name="org.pixeldroid.app.profile.FollowsActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity <activity
android:name=".posts.PostActivity" android:name="org.pixeldroid.app.posts.PostActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity <activity
android:name=".profile.ProfileActivity" android:name="org.pixeldroid.app.profile.ProfileActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity <activity
android:name=".settings.SettingsActivity" android:name="org.pixeldroid.app.settings.SettingsActivity"
android:label="@string/title_activity_settings2" android:label="@string/title_activity_settings2"
android:parentActivityName=".MainActivity" android:parentActivityName="org.pixeldroid.app.MainActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity <activity
android:name=".MainActivity" android:name="org.pixeldroid.app.MainActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
android:theme="@style/AppTheme.Launcher" android:theme="@style/AppTheme.Launcher"
android:windowSoftInputMode="adjustPan" android:windowSoftInputMode="adjustPan"
@ -69,7 +69,7 @@
android:value=".searchDiscover.SearchActivity" /> android:value=".searchDiscover.SearchActivity" />
</activity> </activity>
<activity <activity
android:name=".LoginActivity" android:name="org.pixeldroid.app.LoginActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"
@ -91,7 +91,7 @@
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity <activity
android:name=".searchDiscover.SearchActivity" android:name="org.pixeldroid.app.searchDiscover.SearchActivity"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity"> tools:ignore="LockedOrientationActivity">
@ -104,19 +104,19 @@
android:resource="@xml/searchable" /> android:resource="@xml/searchable" />
</activity> </activity>
<activity <activity
android:name=".settings.AboutActivity" android:name="org.pixeldroid.app.settings.AboutActivity"
android:parentActivityName=".settings.SettingsActivity" android:parentActivityName="org.pixeldroid.app.settings.SettingsActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<activity <activity
android:name=".settings.LicenseActivity" android:name="org.pixeldroid.app.settings.LicenseActivity"
android:parentActivityName=".settings.AboutActivity" android:parentActivityName="org.pixeldroid.app.settings.AboutActivity"
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" /> tools:ignore="LockedOrientationActivity" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.h.pixeldroid.fileprovider" android:authorities="org.pixeldroid.app.fileprovider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">
<meta-data <meta-data

5
app/src/main/java/com/h/pixeldroid/utils/api/objects/Error.kt
View File

@ -1,5 +0,0 @@
package com.h.pixeldroid.utils.api.objects
data class Error(
val error: String?
)

14
app/src/main/java/com/h/pixeldroid/LoginActivity.kt → app/src/main/java/org/pixeldroid/app/LoginActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context
@ -9,12 +9,12 @@ import android.os.Bundle
import android.view.View import android.view.View
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.h.pixeldroid.databinding.ActivityLoginBinding import org.pixeldroid.app.databinding.ActivityLoginBinding
import com.h.pixeldroid.utils.* import org.pixeldroid.app.utils.*
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.* import org.pixeldroid.app.utils.api.objects.*
import com.h.pixeldroid.utils.db.addUser import org.pixeldroid.app.utils.db.addUser
import com.h.pixeldroid.utils.db.storeInstance import org.pixeldroid.app.utils.db.storeInstance
import kotlinx.coroutines.* import kotlinx.coroutines.*
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException

28
app/src/main/java/com/h/pixeldroid/MainActivity.kt → app/src/main/java/org/pixeldroid/app/MainActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid package org.pixeldroid.app
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -17,19 +17,19 @@ import androidx.paging.ExperimentalPagingApi
import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.adapter.FragmentStateAdapter
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.google.android.material.tabs.TabLayoutMediator import com.google.android.material.tabs.TabLayoutMediator
import com.h.pixeldroid.databinding.ActivityMainBinding import org.pixeldroid.app.databinding.ActivityMainBinding
import com.h.pixeldroid.postCreation.camera.CameraFragment import org.pixeldroid.app.postCreation.camera.CameraFragment
import com.h.pixeldroid.posts.feeds.cachedFeeds.notifications.NotificationsFragment import org.pixeldroid.app.posts.feeds.cachedFeeds.notifications.NotificationsFragment
import com.h.pixeldroid.posts.feeds.cachedFeeds.postFeeds.PostFeedFragment import org.pixeldroid.app.posts.feeds.cachedFeeds.postFeeds.PostFeedFragment
import com.h.pixeldroid.profile.ProfileActivity import org.pixeldroid.app.profile.ProfileActivity
import com.h.pixeldroid.searchDiscover.SearchDiscoverFragment import org.pixeldroid.app.searchDiscover.SearchDiscoverFragment
import com.h.pixeldroid.settings.SettingsActivity import org.pixeldroid.app.settings.SettingsActivity
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.utils.db.addUser import org.pixeldroid.app.utils.db.addUser
import com.h.pixeldroid.utils.db.entities.HomeStatusDatabaseEntity import org.pixeldroid.app.utils.db.entities.HomeStatusDatabaseEntity
import com.h.pixeldroid.utils.db.entities.PublicFeedStatusDatabaseEntity import org.pixeldroid.app.utils.db.entities.PublicFeedStatusDatabaseEntity
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
import com.h.pixeldroid.utils.hasInternet import org.pixeldroid.app.utils.hasInternet
import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
import com.mikepenz.materialdrawer.iconics.iconicsIcon import com.mikepenz.materialdrawer.iconics.iconicsIcon
import com.mikepenz.materialdrawer.model.PrimaryDrawerItem import com.mikepenz.materialdrawer.model.PrimaryDrawerItem

24
app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt → app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation package org.pixeldroid.app.postCreation
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
@ -22,17 +22,17 @@ import androidx.core.net.toFile
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.h.pixeldroid.MainActivity import org.pixeldroid.app.MainActivity
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ActivityPostCreationBinding import org.pixeldroid.app.databinding.ActivityPostCreationBinding
import com.h.pixeldroid.postCreation.camera.CameraActivity import org.pixeldroid.app.postCreation.camera.CameraActivity
import com.h.pixeldroid.postCreation.carousel.CarouselItem import org.pixeldroid.app.postCreation.carousel.CarouselItem
import com.h.pixeldroid.postCreation.carousel.ImageCarousel import org.pixeldroid.app.postCreation.carousel.ImageCarousel
import com.h.pixeldroid.postCreation.photoEdit.PhotoEditActivity import org.pixeldroid.app.postCreation.photoEdit.PhotoEditActivity
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.utils.api.objects.Attachment import org.pixeldroid.app.utils.api.objects.Attachment
import com.h.pixeldroid.utils.db.entities.InstanceDatabaseEntity import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers

2
app/src/main/java/com/h/pixeldroid/postCreation/ProgressRequestBody.kt → app/src/main/java/org/pixeldroid/app/postCreation/ProgressRequestBody.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation package org.pixeldroid.app.postCreation
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject

2
app/src/main/java/com/h/pixeldroid/postCreation/SquareLayout.kt → app/src/main/java/org/pixeldroid/app/postCreation/SquareLayout.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation package org.pixeldroid.app.postCreation
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet

6
app/src/main/java/com/h/pixeldroid/postCreation/camera/CameraActivity.kt → app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraActivity.kt
View File

@ -1,8 +1,8 @@
package com.h.pixeldroid.postCreation.camera package org.pixeldroid.app.postCreation.camera
import android.os.Bundle import android.os.Bundle
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.R import org.pixeldroid.app.R
class CameraActivity : BaseActivity() { class CameraActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {

6
app/src/main/java/com/h/pixeldroid/postCreation/camera/CameraFragment.kt → app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.camera package org.pixeldroid.app.postCreation.camera
import android.Manifest import android.Manifest
import android.app.Activity import android.app.Activity
@ -31,8 +31,8 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.RequestOptions
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.postCreation.PostCreationActivity import org.pixeldroid.app.postCreation.PostCreationActivity
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.File import java.io.File

4
app/src/main/java/com/h/pixeldroid/postCreation/carousel/CarouselAdapter.kt → app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselAdapter.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.carousel package org.pixeldroid.app.postCreation.carousel
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.view.LayoutInflater import android.view.LayoutInflater
@ -9,7 +9,7 @@ import androidx.annotation.IdRes
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.h.pixeldroid.R import org.pixeldroid.app.R
class CarouselAdapter( class CarouselAdapter(

2
app/src/main/java/com/h/pixeldroid/postCreation/carousel/CarouselItem.kt → app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselItem.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.carousel package org.pixeldroid.app.postCreation.carousel
import android.net.Uri import android.net.Uri

2
app/src/main/java/com/h/pixeldroid/postCreation/carousel/CarouselLinearLayoutManager.kt → app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselLinearLayoutManager.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.carousel package org.pixeldroid.app.postCreation.carousel
import android.content.Context import android.content.Context
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager

6
app/src/main/java/com/h/pixeldroid/postCreation/carousel/ImageCarousel.kt → app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.carousel package org.pixeldroid.app.postCreation.carousel
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
@ -15,8 +15,8 @@ import androidx.annotation.LayoutRes
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.* import androidx.recyclerview.widget.*
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ImageCarouselBinding import org.pixeldroid.app.databinding.ImageCarouselBinding
import me.relex.circleindicator.CircleIndicator2 import me.relex.circleindicator.CircleIndicator2
import org.jetbrains.annotations.NotNull import org.jetbrains.annotations.NotNull
import org.jetbrains.annotations.Nullable import org.jetbrains.annotations.Nullable

2
app/src/main/java/com/h/pixeldroid/postCreation/carousel/Utils.kt → app/src/main/java/org/pixeldroid/app/postCreation/carousel/Utils.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.carousel package org.pixeldroid.app.postCreation.carousel
import android.content.Context import android.content.Context
import android.util.DisplayMetrics import android.util.DisplayMetrics

4
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/EditImageFragment.kt → app/src/main/java/org/pixeldroid/app/postCreation/photoEdit/EditImageFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.photoEdit package org.pixeldroid.app.postCreation.photoEdit
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
@ -6,7 +6,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.SeekBar import android.widget.SeekBar
import com.h.pixeldroid.R import org.pixeldroid.app.R
class EditImageFragment : Fragment(), SeekBar.OnSeekBarChangeListener { class EditImageFragment : Fragment(), SeekBar.OnSeekBarChangeListener {

2
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/EditPhotoViewPagerAdapter.kt → app/src/main/java/org/pixeldroid/app/postCreation/photoEdit/EditPhotoViewPagerAdapter.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.photoEdit package org.pixeldroid.app.postCreation.photoEdit
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager

4
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/FilterListFragment.kt → app/src/main/java/org/pixeldroid/app/postCreation/photoEdit/FilterListFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.photoEdit package org.pixeldroid.app.postCreation.photoEdit
import android.graphics.Bitmap import android.graphics.Bitmap
import android.os.Bundle import android.os.Bundle
@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.zomato.photofilters.FilterPack import com.zomato.photofilters.FilterPack
import com.zomato.photofilters.imageprocessors.Filter import com.zomato.photofilters.imageprocessors.Filter
import com.zomato.photofilters.utils.ThumbnailItem import com.zomato.photofilters.utils.ThumbnailItem

2
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/NonSwipeableViewPager.kt → app/src/main/java/org/pixeldroid/app/postCreation/photoEdit/NonSwipeableViewPager.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.photoEdit package org.pixeldroid.app.postCreation.photoEdit
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet

13
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/PhotoEditActivity.kt → app/src/main/java/org/pixeldroid/app/postCreation/photoEdit/PhotoEditActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.photoEdit package org.pixeldroid.app.postCreation.photoEdit
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
@ -18,14 +18,11 @@ import android.widget.Toast
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.google.android.material.tabs.TabLayout import org.pixeldroid.app.R
import com.h.pixeldroid.R import org.pixeldroid.app.databinding.ActivityPhotoEditBinding
import com.h.pixeldroid.databinding.ActivityPhotoEditBinding import org.pixeldroid.app.postCreation.PostCreationActivity
import com.h.pixeldroid.databinding.ActivityPostCreationBinding import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.postCreation.PostCreationActivity
import com.h.pixeldroid.utils.BaseActivity
import com.yalantis.ucrop.UCrop import com.yalantis.ucrop.UCrop
import com.zomato.photofilters.imageprocessors.Filter import com.zomato.photofilters.imageprocessors.Filter
import com.zomato.photofilters.imageprocessors.subfilters.BrightnessSubFilter import com.zomato.photofilters.imageprocessors.subfilters.BrightnessSubFilter

2
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/SpaceItemDecoration.kt → app/src/main/java/org/pixeldroid/app/postCreation/photoEdit/SpaceItemDecoration.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.photoEdit package org.pixeldroid.app.postCreation.photoEdit
import android.graphics.Rect import android.graphics.Rect
import android.view.View import android.view.View

6
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/ThumbnailAdapter.kt → app/src/main/java/org/pixeldroid/app/postCreation/photoEdit/ThumbnailAdapter.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.postCreation.photoEdit package org.pixeldroid.app.postCreation.photoEdit
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
@ -7,8 +7,8 @@ import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ThumbnailListItemBinding import org.pixeldroid.app.databinding.ThumbnailListItemBinding
import com.zomato.photofilters.utils.ThumbnailItem import com.zomato.photofilters.utils.ThumbnailItem
class ThumbnailAdapter (private val context: Context, class ThumbnailAdapter (private val context: Context,

2
app/src/main/java/com/h/pixeldroid/posts/ClickableSpanNoUnderline.kt → app/src/main/java/org/pixeldroid/app/posts/ClickableSpanNoUnderline.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts package org.pixeldroid.app.posts
import android.text.TextPaint import android.text.TextPaint
import android.text.style.ClickableSpan import android.text.style.ClickableSpan

12
app/src/main/java/com/h/pixeldroid/posts/HtmlUtils.kt → app/src/main/java/org/pixeldroid/app/posts/HtmlUtils.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts package org.pixeldroid.app.posts
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
@ -13,11 +13,11 @@ import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.core.text.toSpanned import androidx.core.text.toSpanned
import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.LifecycleCoroutineScope
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Account.Companion.openAccountFromId import org.pixeldroid.app.utils.api.objects.Account.Companion.openAccountFromId
import com.h.pixeldroid.utils.api.objects.Mention import org.pixeldroid.app.utils.api.objects.Mention
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
import java.net.URI import java.net.URI
import java.net.URISyntaxException import java.net.URISyntaxException
import java.text.ParseException import java.text.ParseException

2
app/src/main/java/com/h/pixeldroid/posts/NestedScrollableHost.kt → app/src/main/java/org/pixeldroid/app/posts/NestedScrollableHost.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.h.pixeldroid.posts package org.pixeldroid.app.posts
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet

24
app/src/main/java/com/h/pixeldroid/posts/PostActivity.kt → app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts package org.pixeldroid.app.posts
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -9,17 +9,17 @@ import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.Toast import android.widget.Toast
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ActivityPostBinding import org.pixeldroid.app.databinding.ActivityPostBinding
import com.h.pixeldroid.databinding.CommentBinding import org.pixeldroid.app.databinding.CommentBinding
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Mention import org.pixeldroid.app.utils.api.objects.Mention
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.utils.api.objects.Status.Companion.POST_COMMENT_TAG import org.pixeldroid.app.utils.api.objects.Status.Companion.POST_COMMENT_TAG
import com.h.pixeldroid.utils.api.objects.Status.Companion.POST_TAG import org.pixeldroid.app.utils.api.objects.Status.Companion.POST_TAG
import com.h.pixeldroid.utils.api.objects.Status.Companion.VIEW_COMMENTS_TAG import org.pixeldroid.app.utils.api.objects.Status.Companion.VIEW_COMMENTS_TAG
import com.h.pixeldroid.utils.displayDimensionsInPx import org.pixeldroid.app.utils.displayDimensionsInPx
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException

10
app/src/main/java/com/h/pixeldroid/posts/ReportActivity.kt → app/src/main/java/org/pixeldroid/app/posts/ReportActivity.kt
View File

@ -1,12 +1,12 @@
package com.h.pixeldroid.posts package org.pixeldroid.app.posts
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ActivityReportBinding import org.pixeldroid.app.databinding.ActivityReportBinding
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException

28
app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt → app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts package org.pixeldroid.app.posts
import android.Manifest import android.Manifest
import android.app.AlertDialog import android.app.AlertDialog
@ -17,19 +17,19 @@ import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.RequestBuilder import com.bumptech.glide.RequestBuilder
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.AlbumImageViewBinding import org.pixeldroid.app.databinding.AlbumImageViewBinding
import com.h.pixeldroid.databinding.PostFragmentBinding import org.pixeldroid.app.databinding.PostFragmentBinding
import com.h.pixeldroid.utils.BlurHashDecoder import org.pixeldroid.app.utils.BlurHashDecoder
import com.h.pixeldroid.utils.ImageConverter import org.pixeldroid.app.utils.ImageConverter
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Attachment import org.pixeldroid.app.utils.api.objects.Attachment
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.utils.api.objects.Status.Companion.POST_COMMENT_TAG import org.pixeldroid.app.utils.api.objects.Status.Companion.POST_COMMENT_TAG
import com.h.pixeldroid.utils.api.objects.Status.Companion.POST_TAG import org.pixeldroid.app.utils.api.objects.Status.Companion.POST_TAG
import com.h.pixeldroid.utils.api.objects.Status.Companion.VIEW_COMMENTS_TAG import org.pixeldroid.app.utils.api.objects.Status.Companion.VIEW_COMMENTS_TAG
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
import com.karumi.dexter.Dexter import com.karumi.dexter.Dexter
import com.karumi.dexter.listener.PermissionDeniedResponse import com.karumi.dexter.listener.PermissionDeniedResponse
import com.karumi.dexter.listener.PermissionGrantedResponse import com.karumi.dexter.listener.PermissionGrantedResponse

12
app/src/main/java/com/h/pixeldroid/posts/feeds/CommonFeedFragmentUtils.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/CommonFeedFragmentUtils.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts.feeds package org.pixeldroid.app.posts.feeds
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
@ -12,11 +12,11 @@ import androidx.paging.LoadStateAdapter
import androidx.paging.PagingDataAdapter import androidx.paging.PagingDataAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ErrorLayoutBinding import org.pixeldroid.app.databinding.ErrorLayoutBinding
import com.h.pixeldroid.databinding.LoadStateFooterViewItemBinding import org.pixeldroid.app.databinding.LoadStateFooterViewItemBinding
import com.h.pixeldroid.posts.feeds.uncachedFeeds.FeedViewModel import org.pixeldroid.app.posts.feeds.uncachedFeeds.FeedViewModel
import com.h.pixeldroid.utils.api.objects.FeedContent import org.pixeldroid.app.utils.api.objects.FeedContent
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

14
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/CachedFeedFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/CachedFeedFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts.feeds.cachedFeeds package org.pixeldroid.app.posts.feeds.cachedFeeds
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -16,12 +16,12 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import com.h.pixeldroid.databinding.FragmentFeedBinding import org.pixeldroid.app.databinding.FragmentFeedBinding
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.dao.feedContent.FeedContentDao import org.pixeldroid.app.utils.db.dao.feedContent.FeedContentDao
import com.h.pixeldroid.utils.BaseFragment import org.pixeldroid.app.utils.BaseFragment
import com.h.pixeldroid.posts.feeds.initAdapter import org.pixeldroid.app.posts.feeds.initAdapter
import com.h.pixeldroid.utils.api.objects.FeedContentDatabase import org.pixeldroid.app.utils.api.objects.FeedContentDatabase
/** /**

8
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/FeedContentRepository.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/FeedContentRepository.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package com.h.pixeldroid.posts.feeds.cachedFeeds package org.pixeldroid.app.posts.feeds.cachedFeeds
import androidx.paging.* import androidx.paging.*
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.dao.feedContent.FeedContentDao import org.pixeldroid.app.utils.db.dao.feedContent.FeedContentDao
import com.h.pixeldroid.utils.api.objects.FeedContentDatabase import org.pixeldroid.app.utils.api.objects.FeedContentDatabase
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import javax.inject.Inject import javax.inject.Inject

4
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/FeedViewModel.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/FeedViewModel.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package com.h.pixeldroid.posts.feeds.cachedFeeds package org.pixeldroid.app.posts.feeds.cachedFeeds
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.paging.* import androidx.paging.*
import com.h.pixeldroid.utils.api.objects.FeedContentDatabase import org.pixeldroid.app.utils.api.objects.FeedContentDatabase
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
/** /**

28
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts.feeds.cachedFeeds.notifications package org.pixeldroid.app.posts.feeds.cachedFeeds.notifications
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -18,19 +18,19 @@ import androidx.paging.PagingDataAdapter
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.FragmentNotificationsBinding import org.pixeldroid.app.databinding.FragmentNotificationsBinding
import com.h.pixeldroid.posts.PostActivity import org.pixeldroid.app.posts.PostActivity
import com.h.pixeldroid.posts.feeds.cachedFeeds.CachedFeedFragment import org.pixeldroid.app.posts.feeds.cachedFeeds.CachedFeedFragment
import com.h.pixeldroid.posts.feeds.cachedFeeds.FeedViewModel import org.pixeldroid.app.posts.feeds.cachedFeeds.FeedViewModel
import com.h.pixeldroid.posts.feeds.cachedFeeds.ViewModelFactory import org.pixeldroid.app.posts.feeds.cachedFeeds.ViewModelFactory
import com.h.pixeldroid.posts.parseHTMLText import org.pixeldroid.app.posts.parseHTMLText
import com.h.pixeldroid.posts.setTextViewFromISO8601 import org.pixeldroid.app.posts.setTextViewFromISO8601
import com.h.pixeldroid.profile.ProfileActivity import org.pixeldroid.app.profile.ProfileActivity
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Account
import com.h.pixeldroid.utils.api.objects.Notification import org.pixeldroid.app.utils.api.objects.Notification
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
/** /**

8
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package com.h.pixeldroid.posts.feeds.cachedFeeds.notifications package org.pixeldroid.app.posts.feeds.cachedFeeds.notifications
import androidx.paging.* import androidx.paging.*
import androidx.room.withTransaction import androidx.room.withTransaction
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
import com.h.pixeldroid.utils.api.objects.Notification import org.pixeldroid.app.utils.api.objects.Notification
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
import java.lang.NullPointerException import java.lang.NullPointerException

8
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/postFeeds/HomeFeedRemoteMediator.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/postFeeds/HomeFeedRemoteMediator.kt
View File

@ -1,10 +1,10 @@
package com.h.pixeldroid.posts.feeds.cachedFeeds.postFeeds package org.pixeldroid.app.posts.feeds.cachedFeeds.postFeeds
import androidx.paging.* import androidx.paging.*
import androidx.room.withTransaction import androidx.room.withTransaction
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
import com.h.pixeldroid.utils.db.entities.HomeStatusDatabaseEntity import org.pixeldroid.app.utils.db.entities.HomeStatusDatabaseEntity
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
import java.lang.NullPointerException import java.lang.NullPointerException

20
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/postFeeds/PostFeedFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/postFeeds/PostFeedFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts.feeds.cachedFeeds.postFeeds package org.pixeldroid.app.posts.feeds.cachedFeeds.postFeeds
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -11,15 +11,15 @@ import androidx.paging.PagingDataAdapter
import androidx.paging.RemoteMediator import androidx.paging.RemoteMediator
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.utils.db.dao.feedContent.FeedContentDao import org.pixeldroid.app.utils.db.dao.feedContent.FeedContentDao
import com.h.pixeldroid.posts.StatusViewHolder import org.pixeldroid.app.posts.StatusViewHolder
import com.h.pixeldroid.posts.feeds.cachedFeeds.FeedViewModel import org.pixeldroid.app.posts.feeds.cachedFeeds.FeedViewModel
import com.h.pixeldroid.posts.feeds.cachedFeeds.CachedFeedFragment import org.pixeldroid.app.posts.feeds.cachedFeeds.CachedFeedFragment
import com.h.pixeldroid.posts.feeds.cachedFeeds.ViewModelFactory import org.pixeldroid.app.posts.feeds.cachedFeeds.ViewModelFactory
import com.h.pixeldroid.utils.api.objects.FeedContentDatabase import org.pixeldroid.app.utils.api.objects.FeedContentDatabase
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.utils.displayDimensionsInPx import org.pixeldroid.app.utils.displayDimensionsInPx
/** /**

8
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/postFeeds/PublicFeedRemoteMediator.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/postFeeds/PublicFeedRemoteMediator.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package com.h.pixeldroid.posts.feeds.cachedFeeds.postFeeds package org.pixeldroid.app.posts.feeds.cachedFeeds.postFeeds
import androidx.paging.* import androidx.paging.*
import androidx.room.withTransaction import androidx.room.withTransaction
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.db.entities.PublicFeedStatusDatabaseEntity import org.pixeldroid.app.utils.db.entities.PublicFeedStatusDatabaseEntity
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
import java.lang.NullPointerException import java.lang.NullPointerException

4
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/FeedViewModel.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/FeedViewModel.kt
View File

@ -1,9 +1,9 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds package org.pixeldroid.app.posts.feeds.uncachedFeeds
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.paging.* import androidx.paging.*
import com.h.pixeldroid.utils.api.objects.FeedContent import org.pixeldroid.app.utils.api.objects.FeedContent
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
/** /**

12
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/UncachedFeedFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/UncachedFeedFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds package org.pixeldroid.app.posts.feeds.uncachedFeeds
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -9,17 +9,17 @@ import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.paging.* import androidx.paging.*
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.posts.feeds.launch import org.pixeldroid.app.posts.feeds.launch
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.distinctUntilChangedBy import kotlinx.coroutines.flow.distinctUntilChangedBy
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import com.h.pixeldroid.databinding.FragmentFeedBinding import org.pixeldroid.app.databinding.FragmentFeedBinding
import com.h.pixeldroid.utils.BaseFragment import org.pixeldroid.app.utils.BaseFragment
import com.h.pixeldroid.posts.feeds.initAdapter import org.pixeldroid.app.posts.feeds.initAdapter
import com.h.pixeldroid.utils.api.objects.FeedContent import org.pixeldroid.app.utils.api.objects.FeedContent
/** /**

18
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/accountLists/AccountListFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/accountLists/AccountListFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds.accountLists package org.pixeldroid.app.posts.feeds.uncachedFeeds.accountLists
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -13,14 +13,14 @@ import androidx.paging.PagingDataAdapter
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.AccountListEntryBinding import org.pixeldroid.app.databinding.AccountListEntryBinding
import com.h.pixeldroid.posts.feeds.uncachedFeeds.FeedViewModel import org.pixeldroid.app.posts.feeds.uncachedFeeds.FeedViewModel
import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedFeedFragment import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedFeedFragment
import com.h.pixeldroid.posts.feeds.uncachedFeeds.ViewModelFactory import org.pixeldroid.app.posts.feeds.uncachedFeeds.ViewModelFactory
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Account
import com.h.pixeldroid.utils.api.objects.Account.Companion.ACCOUNT_ID_TAG import org.pixeldroid.app.utils.api.objects.Account.Companion.ACCOUNT_ID_TAG
import com.h.pixeldroid.utils.api.objects.Account.Companion.FOLLOWERS_TAG import org.pixeldroid.app.utils.api.objects.Account.Companion.FOLLOWERS_TAG
/** /**

8
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/accountLists/FollowersContentRepository.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/accountLists/FollowersContentRepository.kt
View File

@ -1,12 +1,12 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds.accountLists package org.pixeldroid.app.posts.feeds.uncachedFeeds.accountLists
import androidx.paging.ExperimentalPagingApi import androidx.paging.ExperimentalPagingApi
import androidx.paging.Pager import androidx.paging.Pager
import androidx.paging.PagingConfig import androidx.paging.PagingConfig
import androidx.paging.PagingData import androidx.paging.PagingData
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedContentRepository import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedContentRepository
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Account
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import javax.inject.Inject import javax.inject.Inject

6
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/accountLists/FollowersPagingSource.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/accountLists/FollowersPagingSource.kt
View File

@ -1,9 +1,9 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds.accountLists package org.pixeldroid.app.posts.feeds.uncachedFeeds.accountLists
import androidx.paging.PagingSource import androidx.paging.PagingSource
import androidx.paging.PagingState import androidx.paging.PagingState
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Account
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException

8
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/profile/ProfileContentRepository.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/profile/ProfileContentRepository.kt
View File

@ -1,12 +1,12 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds.profile package org.pixeldroid.app.posts.feeds.uncachedFeeds.profile
import androidx.paging.ExperimentalPagingApi import androidx.paging.ExperimentalPagingApi
import androidx.paging.Pager import androidx.paging.Pager
import androidx.paging.PagingConfig import androidx.paging.PagingConfig
import androidx.paging.PagingData import androidx.paging.PagingData
import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedContentRepository import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedContentRepository
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import javax.inject.Inject import javax.inject.Inject

6
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/profile/ProfilePagingSource.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/profile/ProfilePagingSource.kt
View File

@ -1,9 +1,9 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds.profile package org.pixeldroid.app.posts.feeds.uncachedFeeds.profile
import androidx.paging.PagingSource import androidx.paging.PagingSource
import androidx.paging.PagingState import androidx.paging.PagingState
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException

10
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchAccountFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchAccountFragment.kt
View File

@ -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.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -6,10 +6,10 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.paging.ExperimentalPagingApi import androidx.paging.ExperimentalPagingApi
import com.h.pixeldroid.posts.feeds.uncachedFeeds.* import org.pixeldroid.app.posts.feeds.uncachedFeeds.*
import com.h.pixeldroid.posts.feeds.uncachedFeeds.accountLists.AccountAdapter import org.pixeldroid.app.posts.feeds.uncachedFeeds.accountLists.AccountAdapter
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Account
import com.h.pixeldroid.utils.api.objects.Results import org.pixeldroid.app.utils.api.objects.Results
/** /**
* Fragment to show a list of [Account]s, as a result of a search. * Fragment to show a list of [Account]s, as a result of a search.

12
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchContentRepository.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchContentRepository.kt
View File

@ -1,13 +1,13 @@
package com.h.pixeldroid.posts.feeds.uncachedFeeds.search package org.pixeldroid.app.posts.feeds.uncachedFeeds.search
import androidx.paging.ExperimentalPagingApi import androidx.paging.ExperimentalPagingApi
import androidx.paging.Pager import androidx.paging.Pager
import androidx.paging.PagingConfig import androidx.paging.PagingConfig
import androidx.paging.PagingData import androidx.paging.PagingData
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedContentRepository import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedContentRepository
import com.h.pixeldroid.utils.api.objects.FeedContent import org.pixeldroid.app.utils.api.objects.FeedContent
import com.h.pixeldroid.utils.api.objects.Results import org.pixeldroid.app.utils.api.objects.Results
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import javax.inject.Inject import javax.inject.Inject
@ -15,7 +15,7 @@ import javax.inject.Inject
* Repository class to perform searches * Repository class to perform searches
* *
* The type argument [T] and the [Results.SearchType][type] argument should always * The type argument [T] and the [Results.SearchType][type] argument should always
* be in agreement, e.g. if [T] is a [com.h.pixeldroid.utils.api.objects.Account] then * be in agreement, e.g. if [T] is a [org.pixeldroid.app.utils.api.objects.Account] then
* [type] should be [Results.SearchType.accounts]. * [type] should be [Results.SearchType.accounts].
*/ */
class SearchContentRepository<T: FeedContent> @ExperimentalPagingApi class SearchContentRepository<T: FeedContent> @ExperimentalPagingApi

16
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchHashtagFragment.kt
View File

@ -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.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -11,13 +11,13 @@ import androidx.paging.ExperimentalPagingApi
import androidx.paging.PagingDataAdapter import androidx.paging.PagingDataAdapter
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.FragmentTagsBinding import org.pixeldroid.app.databinding.FragmentTagsBinding
import com.h.pixeldroid.posts.feeds.uncachedFeeds.FeedViewModel import org.pixeldroid.app.posts.feeds.uncachedFeeds.FeedViewModel
import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedFeedFragment import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedFeedFragment
import com.h.pixeldroid.posts.feeds.uncachedFeeds.ViewModelFactory import org.pixeldroid.app.posts.feeds.uncachedFeeds.ViewModelFactory
import com.h.pixeldroid.utils.api.objects.Results import org.pixeldroid.app.utils.api.objects.Results
import com.h.pixeldroid.utils.api.objects.Tag import org.pixeldroid.app.utils.api.objects.Tag
/** /**
* Fragment to show a list of [hashtag][Tag]s, as a result of a search. * Fragment to show a list of [hashtag][Tag]s, as a result of a search.

8
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt
View File

@ -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.PagingSource
import androidx.paging.PagingState import androidx.paging.PagingState
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.FeedContent import org.pixeldroid.app.utils.api.objects.FeedContent
import com.h.pixeldroid.utils.api.objects.Results import org.pixeldroid.app.utils.api.objects.Results
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException

14
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt → app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchPostsFragment.kt
View File

@ -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.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -10,12 +10,12 @@ import androidx.paging.ExperimentalPagingApi
import androidx.paging.PagingDataAdapter import androidx.paging.PagingDataAdapter
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.posts.StatusViewHolder import org.pixeldroid.app.posts.StatusViewHolder
import com.h.pixeldroid.posts.feeds.uncachedFeeds.* import org.pixeldroid.app.posts.feeds.uncachedFeeds.*
import com.h.pixeldroid.utils.api.objects.Results import org.pixeldroid.app.utils.api.objects.Results
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.utils.displayDimensionsInPx import org.pixeldroid.app.utils.displayDimensionsInPx
/** /**
* Fragment to show a list of [Status]es, as a result of a search. * Fragment to show a list of [Status]es, as a result of a search.

16
app/src/main/java/com/h/pixeldroid/profile/FollowsActivity.kt → app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt
View File

@ -1,13 +1,13 @@
package com.h.pixeldroid.profile package org.pixeldroid.app.profile
import android.os.Bundle import android.os.Bundle
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.posts.feeds.uncachedFeeds.accountLists.AccountListFragment import org.pixeldroid.app.posts.feeds.uncachedFeeds.accountLists.AccountListFragment
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Account
import com.h.pixeldroid.utils.api.objects.Account.Companion.ACCOUNT_ID_TAG import org.pixeldroid.app.utils.api.objects.Account.Companion.ACCOUNT_ID_TAG
import com.h.pixeldroid.utils.api.objects.Account.Companion.ACCOUNT_TAG import org.pixeldroid.app.utils.api.objects.Account.Companion.ACCOUNT_TAG
import com.h.pixeldroid.utils.api.objects.Account.Companion.FOLLOWERS_TAG import org.pixeldroid.app.utils.api.objects.Account.Companion.FOLLOWERS_TAG
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
class FollowsActivity : BaseActivity() { class FollowsActivity : BaseActivity() {

38
app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt → app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.profile package org.pixeldroid.app.profile
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -19,24 +19,24 @@ import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ActivityProfileBinding import org.pixeldroid.app.databinding.ActivityProfileBinding
import com.h.pixeldroid.databinding.FragmentProfilePostsBinding import org.pixeldroid.app.databinding.FragmentProfilePostsBinding
import com.h.pixeldroid.posts.PostActivity import org.pixeldroid.app.posts.PostActivity
import com.h.pixeldroid.posts.feeds.initAdapter import org.pixeldroid.app.posts.feeds.initAdapter
import com.h.pixeldroid.posts.feeds.launch import org.pixeldroid.app.posts.feeds.launch
import com.h.pixeldroid.posts.feeds.uncachedFeeds.FeedViewModel import org.pixeldroid.app.posts.feeds.uncachedFeeds.FeedViewModel
import com.h.pixeldroid.posts.feeds.uncachedFeeds.UncachedContentRepository import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedContentRepository
import com.h.pixeldroid.posts.feeds.uncachedFeeds.profile.ProfileContentRepository import org.pixeldroid.app.posts.feeds.uncachedFeeds.profile.ProfileContentRepository
import com.h.pixeldroid.posts.parseHTMLText import org.pixeldroid.app.posts.parseHTMLText
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.utils.ImageConverter import org.pixeldroid.app.utils.ImageConverter
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Account import org.pixeldroid.app.utils.api.objects.Account
import com.h.pixeldroid.utils.api.objects.FeedContent import org.pixeldroid.app.utils.api.objects.FeedContent
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
import com.h.pixeldroid.utils.openUrl import org.pixeldroid.app.utils.openUrl
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import retrofit2.HttpException import retrofit2.HttpException

12
app/src/main/java/com/h/pixeldroid/profile/ProfilePostsRecyclerViewAdapter.kt → app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.profile package org.pixeldroid.app.profile
import android.content.Intent import android.content.Intent
import android.view.LayoutInflater import android.view.LayoutInflater
@ -7,11 +7,11 @@ import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import androidx.appcompat.content.res.AppCompatResources.getDrawable import androidx.appcompat.content.res.AppCompatResources.getDrawable
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.posts.PostActivity import org.pixeldroid.app.posts.PostActivity
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.utils.ImageConverter.Companion.setSquareImageFromDrawable import org.pixeldroid.app.utils.ImageConverter.Companion.setSquareImageFromDrawable
import com.h.pixeldroid.utils.ImageConverter.Companion.setSquareImageFromURL import org.pixeldroid.app.utils.ImageConverter.Companion.setSquareImageFromURL
/** /**
* [RecyclerView.Adapter] that can display a list of [Status]s * [RecyclerView.Adapter] that can display a list of [Status]s

14
app/src/main/java/com/h/pixeldroid/searchDiscover/SearchActivity.kt → app/src/main/java/org/pixeldroid/app/searchDiscover/SearchActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.searchDiscover package org.pixeldroid.app.searchDiscover
import android.app.SearchManager import android.app.SearchManager
import android.content.Intent import android.content.Intent
@ -8,12 +8,12 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
import androidx.viewpager2.widget.ViewPager2 import androidx.viewpager2.widget.ViewPager2
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator import com.google.android.material.tabs.TabLayoutMediator
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.posts.feeds.uncachedFeeds.search.SearchAccountFragment import org.pixeldroid.app.posts.feeds.uncachedFeeds.search.SearchAccountFragment
import com.h.pixeldroid.posts.feeds.uncachedFeeds.search.SearchHashtagFragment import org.pixeldroid.app.posts.feeds.uncachedFeeds.search.SearchHashtagFragment
import com.h.pixeldroid.posts.feeds.uncachedFeeds.search.SearchPostsFragment import org.pixeldroid.app.posts.feeds.uncachedFeeds.search.SearchPostsFragment
import com.h.pixeldroid.utils.api.objects.Results import org.pixeldroid.app.utils.api.objects.Results
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
class SearchActivity : BaseActivity() { class SearchActivity : BaseActivity() {

20
app/src/main/java/com/h/pixeldroid/searchDiscover/SearchDiscoverFragment.kt → app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.searchDiscover package org.pixeldroid.app.searchDiscover
import android.app.SearchManager import android.app.SearchManager
import android.content.Context import android.content.Context
@ -11,15 +11,15 @@ import androidx.annotation.StringRes
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.FragmentSearchBinding import org.pixeldroid.app.databinding.FragmentSearchBinding
import com.h.pixeldroid.profile.ProfilePostViewHolder import org.pixeldroid.app.profile.ProfilePostViewHolder
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.Status import org.pixeldroid.app.utils.api.objects.Status
import com.h.pixeldroid.posts.PostActivity import org.pixeldroid.app.posts.PostActivity
import com.h.pixeldroid.utils.BaseFragment import org.pixeldroid.app.utils.BaseFragment
import com.h.pixeldroid.utils.ImageConverter import org.pixeldroid.app.utils.ImageConverter
import com.h.pixeldroid.utils.bindingLifecycleAware import org.pixeldroid.app.utils.bindingLifecycleAware
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException

10
app/src/main/java/com/h/pixeldroid/settings/AboutActivity.kt → app/src/main/java/org/pixeldroid/app/settings/AboutActivity.kt
View File

@ -1,11 +1,11 @@
package com.h.pixeldroid.settings package org.pixeldroid.app.settings
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import com.h.pixeldroid.BuildConfig import org.pixeldroid.app.BuildConfig
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ActivityAboutBinding import org.pixeldroid.app.databinding.ActivityAboutBinding
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
class AboutActivity : BaseActivity() { class AboutActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {

8
app/src/main/java/com/h/pixeldroid/settings/LicenseActivity.kt → app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt
View File

@ -1,9 +1,9 @@
package com.h.pixeldroid.settings package org.pixeldroid.app.settings
import android.os.Bundle import android.os.Bundle
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.databinding.ActivityLicensesBinding import org.pixeldroid.app.databinding.ActivityLicensesBinding
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
class LicenseActivity : BaseActivity() { class LicenseActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {

10
app/src/main/java/com/h/pixeldroid/settings/SettingsActivity.kt → app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
View File

@ -1,14 +1,14 @@
package com.h.pixeldroid.settings package org.pixeldroid.app.settings
import android.content.Intent import android.content.Intent
import android.content.SharedPreferences import android.content.SharedPreferences
import android.os.Bundle import android.os.Bundle
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.h.pixeldroid.MainActivity import org.pixeldroid.app.MainActivity
import com.h.pixeldroid.R import org.pixeldroid.app.R
import com.h.pixeldroid.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import com.h.pixeldroid.utils.setThemeFromPreferences import org.pixeldroid.app.utils.setThemeFromPreferences
class SettingsActivity : BaseActivity(), SharedPreferences.OnSharedPreferenceChangeListener { class SettingsActivity : BaseActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
private var restartMainOnExit = false private var restartMainOnExit = false

6
app/src/main/java/com/h/pixeldroid/utils/BaseActivity.kt → app/src/main/java/org/pixeldroid/app/utils/BaseActivity.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils package org.pixeldroid.app.utils
import android.content.Context import android.content.Context
import android.content.res.Configuration import android.content.res.Configuration
@ -7,8 +7,8 @@ import android.os.Build
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
import java.util.* import java.util.*
import javax.inject.Inject import javax.inject.Inject

6
app/src/main/java/com/h/pixeldroid/utils/BaseFragment.kt → app/src/main/java/org/pixeldroid/app/utils/BaseFragment.kt
View File

@ -1,9 +1,9 @@
package com.h.pixeldroid.utils package org.pixeldroid.app.utils
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.h.pixeldroid.utils.db.AppDatabase import org.pixeldroid.app.utils.db.AppDatabase
import com.h.pixeldroid.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.di.PixelfedAPIHolder
import javax.inject.Inject import javax.inject.Inject
/** /**

3
app/src/main/java/com/h/pixeldroid/utils/BlurHashDecoder.kt → app/src/main/java/org/pixeldroid/app/utils/BlurHashDecoder.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils package org.pixeldroid.app.utils
/** /**
* Blurhash implementation from blurhash project: * Blurhash implementation from blurhash project:
@ -11,7 +11,6 @@ import android.content.res.Resources
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import com.h.pixeldroid.utils.api.objects.Attachment
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.cos import kotlin.math.cos
import kotlin.math.pow import kotlin.math.pow

4
app/src/main/java/com/h/pixeldroid/utils/ImageConverter.kt → app/src/main/java/org/pixeldroid/app/utils/ImageConverter.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils package org.pixeldroid.app.utils
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.view.View import android.view.View
@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.RequestOptions
import com.h.pixeldroid.R import org.pixeldroid.app.R
class ImageConverter { class ImageConverter {
companion object { companion object {

5
app/src/main/java/com/h/pixeldroid/utils/PixelDroidApplication.kt → app/src/main/java/org/pixeldroid/app/utils/PixelDroidApplication.kt
View File

@ -1,11 +1,10 @@
package com.h.pixeldroid.utils package org.pixeldroid.app.utils
import android.app.Application import android.app.Application
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.h.pixeldroid.utils.di.* import org.pixeldroid.app.utils.di.*
import com.mikepenz.iconics.Iconics import com.mikepenz.iconics.Iconics
import org.ligi.tracedroid.TraceDroid import org.ligi.tracedroid.TraceDroid
import org.ligi.tracedroid.sending.sendTraceDroidStackTracesIfExist
class PixelDroidApplication: Application() { class PixelDroidApplication: Application() {

4
app/src/main/java/com/h/pixeldroid/utils/Utils.kt → app/src/main/java/org/pixeldroid/app/utils/Utils.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils package org.pixeldroid.app.utils
import android.content.ActivityNotFoundException import android.content.ActivityNotFoundException
import android.content.Context import android.content.Context
@ -15,7 +15,7 @@ import androidx.browser.customtabs.CustomTabsIntent
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import com.h.pixeldroid.R import org.pixeldroid.app.R
import okhttp3.HttpUrl import okhttp3.HttpUrl
import kotlin.properties.ReadWriteProperty import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty import kotlin.reflect.KProperty

4
app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt → app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt
View File

@ -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 io.reactivex.Observable
import okhttp3.MultipartBody import okhttp3.MultipartBody
import retrofit2.Response import retrofit2.Response

6
app/src/main/java/com/h/pixeldroid/utils/api/objects/Account.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt
View File

@ -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.Context
import android.content.Intent import android.content.Intent
import android.util.Log import android.util.Log
import androidx.core.content.ContextCompat.startActivity import androidx.core.content.ContextCompat.startActivity
import com.h.pixeldroid.profile.ProfileActivity import org.pixeldroid.app.profile.ProfileActivity
import com.h.pixeldroid.utils.api.PixelfedAPI import org.pixeldroid.app.utils.api.PixelfedAPI
import retrofit2.HttpException import retrofit2.HttpException
import java.io.IOException import java.io.IOException
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Application.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Application.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Attachment.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Attachment.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Card.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Card.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Context.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Context.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/DiscoverPosts.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/DiscoverPosts.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Emoji.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Emoji.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

5
app/src/main/java/org/pixeldroid/app/utils/api/objects/Error.kt Normal file
View File

@ -0,0 +1,5 @@
package org.pixeldroid.app.utils.api.objects
data class Error(
val error: String?
)

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/FeedContent.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/FeedContent.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
interface FeedContent { interface FeedContent {
val id: String? val id: String?

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Field.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Field.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/History.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/History.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
data class History( data class History(
//Required attributes //Required attributes

4
app/src/main/java/com/h/pixeldroid/utils/api/objects/Instance.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Instance.kt
View File

@ -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 ( data class Instance (
val description: String?, val description: String?,

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Mention.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Mention.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

4
app/src/main/java/com/h/pixeldroid/utils/api/objects/NodeInfo.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/NodeInfo.kt
View File

@ -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 See https://nodeinfo.diaspora.software/schema.html and https://pixelfed.social/api/nodeinfo/2.0.json

4
app/src/main/java/com/h/pixeldroid/utils/api/objects/Notification.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Notification.kt
View File

@ -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.Entity
import androidx.room.ForeignKey import androidx.room.ForeignKey
import androidx.room.Index 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.io.Serializable
import java.util.Date import java.util.Date

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Poll.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Poll.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Relationship.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Relationship.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Report.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Report.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

2
app/src/main/java/com/h/pixeldroid/utils/api/objects/Results.kt → app/src/main/java/org/pixeldroid/app/utils/api/objects/Results.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.utils.api.objects package org.pixeldroid.app.utils.api.objects
import java.io.Serializable import java.io.Serializable

Some files were not shown because too many files have changed in this diff Show More