Commit 7dc57d27 authored by Thomas's avatar Thomas
Browse files

Set AKKOMA instance as PLEROMA

parent 5bc122cb

app/build.gradle

+3 −4
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ dependencies { 
    implementation 'com.vanniktech:emoji-one:0.6.0'

    implementation 'com.github.GrenderG:Toasty:1.5.2'

    implementation 'org.framagit.tom79:SparkButton:1.0.13'

    implementation "com.github.bumptech.glide:glide:4.12.0"

    implementation "com.github.bumptech.glide:okhttp3-integration:4.12.0"

    implementation "com.github.bumptech.glide:glide:4.14.2"

    implementation "com.github.bumptech.glide:okhttp3-integration:4.14.2"



    implementation "org.jsoup:jsoup:1.15.1"
@@ -102,12 +102,11 @@ dependencies { 
    implementation project(path: ':ratethisapp')







    implementation 'com.burhanrashid52:photoeditor:1.5.1'

    implementation project(path: ':cropper')

    annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"

    implementation 'jp.wasabeef:glide-transformations:4.3.0'

    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.22.0'

    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.24.0'

    implementation 'com.google.android.exoplayer:exoplayer:2.18.1'

    implementation "androidx.viewpager2:viewpager2:1.0.0"

    implementation 'com.github.piasy:rxandroidaudio:1.7.0'

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                }

                headerMainBinding.accountName.setText(currentAccount.mastodon_account.display_name);

                Helper.loadPP(BaseMainActivity.this, headerMainBinding.accountProfilePicture, currentAccount, false);

                MastodonHelper.loadProfileMediaMastodon(headerMainBinding.backgroundImage, currentAccount.mastodon_account, MastodonHelper.MediaAccountType.HEADER);

                MastodonHelper.loadProfileMediaMastodon(BaseMainActivity.this, headerMainBinding.backgroundImage, currentAccount.mastodon_account, MastodonHelper.MediaAccountType.HEADER);

                /*

                 * Some general data are loaded when the app starts such;

                 *  - Pinned timelines (in app feature)

app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class EditProfileActivity extends BaseActivity { 
    @SuppressWarnings("deprecation")

    private void initializeView() {

        //Hydrate values

        MastodonHelper.loadProfileMediaMastodon(binding.bannerPp, currentAccount.mastodon_account, MastodonHelper.MediaAccountType.HEADER);

        MastodonHelper.loadProfileMediaMastodon(EditProfileActivity.this, binding.bannerPp, currentAccount.mastodon_account, MastodonHelper.MediaAccountType.HEADER);

        MastodonHelper.loadPPMastodon(binding.accountPp, currentAccount.mastodon_account);

        binding.displayName.setText(currentAccount.mastodon_account.display_name);

        binding.acct.setText(String.format(Locale.getDefault(), "%s@%s", currentAccount.mastodon_account.acct, BaseMainActivity.currentInstance));

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ public class ProfileActivity extends BaseActivity { 
                        }

                );

        //Load header

        MastodonHelper.loadProfileMediaMastodon(binding.bannerPp, account, MastodonHelper.MediaAccountType.HEADER);

        MastodonHelper.loadProfileMediaMastodon(ProfileActivity.this, binding.bannerPp, account, MastodonHelper.MediaAccountType.HEADER);

        //Redraws icon for locked accounts

        final float scale = getResources().getDisplayMetrics().density;

        if (account.locked) {

app/src/main/java/app/fedilab/android/activities/admin/AdminAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public class AdminAccountActivity extends BaseActivity { 
                        }

                );

        //Load header

        MastodonHelper.loadProfileMediaMastodon(binding.bannerPp, adminAccount.account, MastodonHelper.MediaAccountType.HEADER);

        MastodonHelper.loadProfileMediaMastodon(AdminAccountActivity.this, binding.bannerPp, adminAccount.account, MastodonHelper.MediaAccountType.HEADER);

        //Redraws icon for locked accounts

        final float scale = getResources().getDisplayMetrics().density;

        if (adminAccount.account.locked) {