Add support for Nyastodon-style emoji reactions

Currently translated at 100.0% (1077 of 1077 strings)

Co-authored-by: Poesty Li <poesty7450@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/fedilab/strings/zh_Hans/
Translation: Fedilab/Strings

app/build.gradle

@@ -8,13 +8,13 @@ plugins {
 }
 def flavor
 android {
-    compileSdk 31
+    compileSdk 33
 
     defaultConfig {
         minSdk 21
-        targetSdk 31
-        versionCode 433
-        versionName "3.8.0"
+        targetSdk 33
+        versionCode 477
+        versionName "3.17.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
@@ -63,6 +63,21 @@ android {
             java.srcDirs = ['src/main/java', 'src/fdroid/java']
             res.srcDirs = ['src/main/res', 'src/fdroid/res']
         }
+        main {
+            res.srcDirs = [
+                    'src/main/res/layouts/mastodon',
+                    'src/main/res/layouts/peertube',
+                    'src/main/res/layouts',
+                    'src/main/layout',
+                    'src/main/res/drawables/mastodon',
+                    'src/main/res/drawables/peertube',
+                    'src/main/res/drawables',
+                    'src/main/res/menus/mastodon',
+                    'src/main/res/menus/peertube',
+                    'src/main/res/menus',
+                    'src/main/res'
+            ]
+        }
     }
     configurations {
         all {
@@ -78,8 +93,12 @@ allprojects {
 }
 dependencies {
     implementation project(':autoimageslider')
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+
+    implementation 'com.google.android.material:material:1.7.0'
+
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "com.google.code.gson:gson:2.9.1"
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -88,26 +107,28 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.preference:preference:1.2.0'
     implementation "org.conscrypt:conscrypt-android:2.5.2"
-    implementation 'com.github.evozi:Cyanea:1.0.7'
     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("com.github.bumptech.glide:recyclerview-integration:4.14.2") {
+        // Excludes the support library because it's already included by Glide.
+        transitive = false
+    }
 
     implementation "org.jsoup:jsoup:1.15.1"
 
     implementation 'com.github.mergehez:ArgPlayer:v3.1'
     implementation project(path: ':mytransl')
     implementation project(path: ':ratethisapp')
-
-
+    implementation project(path: ':sparkbutton')
 
     implementation 'com.burhanrashid52:photoeditor:1.5.1'
-    implementation project(path: ':cropper')
+    implementation("com.vanniktech:android-image-cropper:4.3.3")
+    implementation project(path: ':mathjaxandroid')
     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.23.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'
@@ -118,11 +139,10 @@ dependencies {
     implementation "ch.acra:acra-mail:5.9.6"
     implementation "ch.acra:acra-limiter:5.9.3"
     implementation "ch.acra:acra-dialog:5.9.6"
-
     implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
     implementation 'com.github.UnifiedPush:android-connector:2.0.1'
    // implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'
-    playstoreImplementation ('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.3') {
+    playstoreImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.3') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -132,14 +152,56 @@ dependencies {
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'androidx.lifecycle:lifecycle-livedata:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
-    implementation 'androidx.navigation:navigation-fragment:2.5.1'
-    implementation 'androidx.navigation:navigation-ui:2.5.1'
+    implementation 'androidx.navigation:navigation-fragment:2.5.3'
+    implementation 'androidx.navigation:navigation-ui:2.5.3'
     testImplementation 'junit:junit:'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-   // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
-
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
+    implementation 'com.r0adkll:slidableactivity:2.1.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
+
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation "androidx.fragment:fragment:1.5.5"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'com.github.amoskorir:avatarimagegenerator:1.5.0'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.18.1'
+    implementation "com.github.mabbas007:TagsEditText:1.0.5"
+    implementation "net.gotev:uploadservice:4.7.0"
+    implementation "net.gotev:uploadservice-okhttp:4.7.0"
+    implementation 'androidx.media:media:1.6.0'
+    implementation 'com.github.mancj:MaterialSearchBar:0.8.5'
+
+    implementation 'com.github.vkay94:DoubleTapPlayerView:1.0.0'
+
+
+    //************ CAST **************///
+
+    //---> Google libs (google_full)
+    playstoreImplementation "com.google.android.gms:play-services-cast-tv:19.0.1"
+    playstoreImplementation "com.google.android.gms:play-services-cast:21.0.1"
+    playstoreImplementation "androidx.mediarouter:mediarouter:1.3.0"
+    playstoreImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
+
+    playstoreImplementation "com.google.android.gms:play-services-cast-tv:19.0.1"
+    playstoreImplementation "com.google.android.gms:play-services-cast:21.0.1"
+    playstoreImplementation "androidx.mediarouter:mediarouter:1.3.0"
+    playstoreImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
+
+    //----> Other flavors
+    fdroidImplementation 'su.litvak.chromecast:api-v2:0.11.3'
+    fdroidImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
+    fdroidImplementation 'org.slf4j:slf4j-simple:1.7.30'
+    fdroidImplementation 'com.github.evozi:Cyanea:1.0.7'
+
+    fdroidImplementation 'su.litvak.chromecast:api-v2:0.11.3'
+    fdroidImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
+    fdroidImplementation 'org.slf4j:slf4j-simple:1.7.30'
+
 }
 def getCurrentFlavor() {
     Gradle gradle = getGradle()

app/src/androidTest/java/app/fedilab/android/ExampleInstrumentedTest.java

@@ -1,15 +1,15 @@
 package app.fedilab.android;
 
+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/debug/res/xml/compose_shortcuts.xml

@@ -0,0 +1,19 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <shortcut
+        android:shortcutId="compose"
+        android:enabled="true"
+        android:icon="@drawable/ic_baseline_add_comment_24"
+        android:shortcutShortLabel="@string/compose_shortcut_short_label1"
+        tools:targetApi="n_mr1">
+        <intent
+            android:action="app.fedilab.android.shorcut.compose"
+            android:targetClass="app.fedilab.android.activities.MainActivity"
+            android:targetPackage="fr.gouv.etalab.mastodon.debug" />
+
+        <categories android:name="android.shortcut.conversation" />
+        <capability-binding android:key="actions.intent.CREATE_MESSAGE" />
+    </shortcut>
+
+
+</shortcuts>

app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java

@@ -0,0 +1,211 @@
+package app.fedilab.android.activities;
+/* Copyright 2023 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+
+import static app.fedilab.android.peertube.helper.Helper.CAST_ID;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.webkit.MimeTypeMap;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+import app.fedilab.android.R;
+import app.fedilab.android.databinding.ActivityPeertubeBinding;
+import app.fedilab.android.mastodon.activities.BaseBarActivity;
+import app.fedilab.android.peertube.client.data.VideoData;
+import app.fedilab.android.peertube.helper.Helper;
+import su.litvak.chromecast.api.v2.ChromeCast;
+import su.litvak.chromecast.api.v2.MediaStatus;
+import su.litvak.chromecast.api.v2.Status;
+
+
+public class BasePeertubeActivity extends BaseBarActivity {
+
+    protected ActivityPeertubeBinding binding;
+    protected VideoData.Video peertube;
+    protected ExoPlayer player;
+    protected String videoURL;
+    protected String subtitlesStr;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityPeertubeBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+
+
+        binding.minController.castPlay.setOnClickListener(v -> {
+            binding.minController.castLoader.setVisibility(View.VISIBLE);
+            if (PeertubeBaseMainActivity.chromeCast != null) {
+                new Thread(() -> {
+                    try {
+                        int icon = -1;
+                        if (PeertubeBaseMainActivity.chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PLAYING) {
+                            PeertubeBaseMainActivity.chromeCast.pause();
+                            icon = R.drawable.ic_baseline_play_arrow_32;
+                        } else if (PeertubeBaseMainActivity.chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PAUSED) {
+                            PeertubeBaseMainActivity.chromeCast.play();
+                            icon = R.drawable.ic_baseline_pause_32;
+                        }
+                        if (icon != -1) {
+                            Handler mainHandler = new Handler(Looper.getMainLooper());
+                            int finalIcon = icon;
+                            Runnable myRunnable = () -> binding.minController.castPlay.setImageResource(finalIcon);
+                            mainHandler.post(myRunnable);
+                        }
+                        Handler mainHandler = new Handler(Looper.getMainLooper());
+                        Runnable myRunnable = () -> binding.minController.castLoader.setVisibility(View.GONE);
+                        mainHandler.post(myRunnable);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_cast) {
+            if (PeertubeBaseMainActivity.chromeCasts != null && PeertubeBaseMainActivity.chromeCasts.size() > 0) {
+                String[] chromecast_choice = new String[PeertubeBaseMainActivity.chromeCasts.size()];
+                AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this);
+                alt_bld.setTitle(R.string.chromecast_choice);
+                int i = 0;
+                for (ChromeCast cc : PeertubeBaseMainActivity.chromeCasts) {
+                    chromecast_choice[i] = cc.getTitle();
+                    i++;
+                }
+                i = 0;
+                for (ChromeCast cc : PeertubeBaseMainActivity.chromeCasts) {
+                    if (PeertubeBaseMainActivity.chromecastActivated && cc.isConnected()) {
+                        break;
+                    }
+                    i++;
+                }
+
+                alt_bld.setSingleChoiceItems(chromecast_choice, i, (dialog, position) -> {
+                    PeertubeBaseMainActivity.chromeCast = PeertubeBaseMainActivity.chromeCasts.get(position);
+                    new Thread(() -> {
+                        if (PeertubeBaseMainActivity.chromeCast != null) {
+                            Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
+                            Bundle b = new Bundle();
+                            if (PeertubeBaseMainActivity.chromecastActivated) {
+                                b.putInt("displayed", 0);
+                                intentBC.putExtras(b);
+                                LocalBroadcastManager.getInstance(BasePeertubeActivity.this).sendBroadcast(intentBC);
+                                Handler mainHandler = new Handler(Looper.getMainLooper());
+                                Runnable myRunnable = () -> {
+                                    binding.doubleTapPlayerView.setVisibility(View.VISIBLE);
+                                    binding.minController.castMiniController.setVisibility(View.GONE);
+                                };
+                                mainHandler.post(myRunnable);
+
+                            } else {
+                                b.putInt("displayed", 1);
+                                b.putSerializable("castedTube", peertube);
+                                intentBC.putExtras(b);
+                                LocalBroadcastManager.getInstance(BasePeertubeActivity.this).sendBroadcast(intentBC);
+                                try {
+                                    Handler mainHandler = new Handler(Looper.getMainLooper());
+                                    Runnable myRunnable = () -> {
+                                        invalidateOptionsMenu();
+                                        binding.minController.castLoader.setVisibility(View.VISIBLE);
+                                        player.setPlayWhenReady(false);
+                                        binding.doubleTapPlayerView.setVisibility(View.GONE);
+                                        binding.minController.castMiniController.setVisibility(View.VISIBLE);
+                                        dialog.dismiss();
+                                        if (videoURL != null) {
+                                            if (player != null && player.getCurrentPosition() > 0) {
+                                                videoURL += "?start=" + (player.getCurrentPosition() / 1000);
+                                            }
+                                        }
+                                    };
+                                    mainHandler.post(myRunnable);
+                                    if (!PeertubeBaseMainActivity.chromeCast.isConnected()) {
+                                        PeertubeBaseMainActivity.chromeCast.connect();
+                                    }
+                                    myRunnable = this::invalidateOptionsMenu;
+                                    mainHandler.post(myRunnable);
+                                    Status status = PeertubeBaseMainActivity.chromeCast.getStatus();
+                                    if (PeertubeBaseMainActivity.chromeCast.isAppAvailable(CAST_ID) && !status.isAppRunning(CAST_ID)) {
+                                        PeertubeBaseMainActivity.chromeCast.launchApp(CAST_ID);
+                                    }
+                                    if (videoURL != null) {
+                                        String mime = MimeTypeMap.getFileExtensionFromUrl(videoURL);
+                                        PeertubeBaseMainActivity.chromeCast.setRequestTimeout(60000);
+                                        PeertubeBaseMainActivity.chromeCast.load(peertube.getTitle(), null, videoURL, mime);
+                                        PeertubeBaseMainActivity.chromeCast.play();
+                                        binding.minController.castPlay.setImageResource(R.drawable.ic_baseline_pause_32);
+                                    }
+                                    myRunnable = () -> binding.minController.castLoader.setVisibility(View.GONE);
+                                    mainHandler.post(myRunnable);
+                                } catch (IOException | GeneralSecurityException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                            Handler mainHandler = new Handler(Looper.getMainLooper());
+                            Runnable myRunnable = () -> {
+                                invalidateOptionsMenu();
+                                dialog.dismiss();
+                            };
+                            mainHandler.post(myRunnable);
+                        }
+                    }).start();
+                });
+                alt_bld.setPositiveButton(R.string.close, (dialog, id) -> dialog.dismiss());
+                AlertDialog alert = alt_bld.create();
+                alert.show();
+            }
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(@NotNull Menu menu) {
+        getMenuInflater().inflate(R.menu.video_menu, menu);
+        MenuItem castItem = menu.findItem(R.id.action_cast);
+        if (PeertubeBaseMainActivity.chromeCasts != null && PeertubeBaseMainActivity.chromeCasts.size() > 0) {
+            castItem.setVisible(true);
+            if (PeertubeBaseMainActivity.chromeCast != null && PeertubeBaseMainActivity.chromeCast.isConnected()) {
+                castItem.setIcon(R.drawable.ic_baseline_cast_connected_24);
+            } else {
+                castItem.setIcon(R.drawable.ic_baseline_cast_24);
+            }
+        }
+        return true;
+    }
+
+}

app/src/fdroid/java/app/fedilab/android/activities/PeertubeBaseMainActivity.java

@@ -0,0 +1,263 @@
+package app.fedilab.android.activities;
+/* Copyright 2023 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.View;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
+import app.fedilab.android.R;
+import app.fedilab.android.databinding.ActivityMainPeertubeBinding;
+import app.fedilab.android.mastodon.activities.BaseActivity;
+import app.fedilab.android.peertube.client.data.VideoData;
+import app.fedilab.android.peertube.helper.Helper;
+import su.litvak.chromecast.api.v2.ChromeCast;
+import su.litvak.chromecast.api.v2.ChromeCasts;
+import su.litvak.chromecast.api.v2.ChromeCastsListener;
+import su.litvak.chromecast.api.v2.MediaStatus;
+
+public abstract class PeertubeBaseMainActivity extends BaseActivity implements ChromeCastsListener {
+
+    public static List<ChromeCast> chromeCasts;
+    public static ChromeCast chromeCast;
+    public static boolean chromecastActivated = false;
+    protected ActivityMainPeertubeBinding binding;
+    private BroadcastReceiver manage_chromecast;
+    private VideoData.Video castedTube;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityMainPeertubeBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+        ChromeCastsListener chromeCastsListener = this;
+        ChromeCasts.registerListener(chromeCastsListener);
+
+
+        binding.castClose.setOnClickListener(v -> {
+            Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
+            Bundle b = new Bundle();
+            b.putInt("displayed", 0);
+            intentBC.putExtras(b);
+            LocalBroadcastManager.getInstance(PeertubeBaseMainActivity.this).sendBroadcast(intentBC);
+        });
+
+        binding.castTogglePlay.setOnClickListener(v -> {
+            if (chromeCast != null) {
+                new Thread(() -> {
+                    try {
+                        Handler mainHandler = new Handler(Looper.getMainLooper());
+                        Runnable myRunnable = () -> binding.castTogglePlay.setVisibility(View.GONE);
+                        mainHandler.post(myRunnable);
+                        int icon = -1;
+                        if (chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PLAYING) {
+                            chromeCast.pause();
+                            icon = R.drawable.ic_baseline_play_arrow_32;
+                        } else if (chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PAUSED) {
+                            chromeCast.play();
+                            icon = R.drawable.ic_baseline_pause_32;
+                        }
+                        if (icon != -1) {
+                            int finalIcon = icon;
+                            myRunnable = () -> binding.castTogglePlay.setImageResource(finalIcon);
+                            mainHandler.post(myRunnable);
+                        }
+                        myRunnable = () -> binding.castTogglePlay.setVisibility(View.VISIBLE);
+                        mainHandler.post(myRunnable);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+            }
+        });
+
+
+        manage_chromecast = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                Bundle b = intent.getExtras();
+                assert b != null;
+                int state = b.getInt("state_asked", -1);
+                int displayed = b.getInt("displayed", -1);
+                castedTube = (VideoData.Video) b.getSerializable("castedTube");
+
+                if (state == 1) {
+                    discoverCast();
+                } else if (state == 0) {
+                    new Thread(() -> {
+                        try {
+                            if (chromeCast != null) {
+                                chromeCast.stopApp();
+                                chromeCast.disconnect();
+                            }
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }).start();
+                }
+                if (displayed == 1) {
+                    chromecastActivated = true;
+                    if (castedTube != null) {
+                        binding.castInfo.setVisibility(View.VISIBLE);
+                        Helper.loadGiF(PeertubeBaseMainActivity.this, castedTube.getThumbnailPath(), binding.castView);
+                        binding.castTitle.setText(castedTube.getTitle());
+                        binding.castDescription.setText(castedTube.getDescription());
+                    }
+                } else if (displayed == 0) {
+                    chromecastActivated = false;
+                    binding.castInfo.setVisibility(View.GONE);
+                    new Thread(() -> {
+                        try {
+                            if (chromeCast != null) {
+                                chromeCast.stopApp();
+                            }
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }).start();
+                }
+            }
+        };
+        LocalBroadcastManager.getInstance(PeertubeBaseMainActivity.this).registerReceiver(manage_chromecast, new IntentFilter(Helper.RECEIVE_CAST_SETTINGS));
+    }
+
+    @Override
+    public void newChromeCastDiscovered(ChromeCast chromeCast) {
+        if (chromeCasts == null) {
+            chromeCasts = new ArrayList<>();
+            chromeCasts.add(chromeCast);
+        } else {
+            boolean canBeAdded = true;
+            for (ChromeCast cast : chromeCasts) {
+                if (cast.getName().compareTo(chromeCast.getName()) == 0) {
+                    canBeAdded = false;
+                    break;
+                }
+            }
+            if (canBeAdded) {
+                chromeCasts.add(chromeCast);
+            }
+        }
+        try {
+            if (chromeCast.isAppRunning(Helper.CAST_ID) && chromeCast.getMediaStatus() != null && chromeCast.getMediaStatus().playerState != null) {
+                if (binding.castInfo.getVisibility() == View.GONE) {
+                    binding.castInfo.setVisibility(View.VISIBLE);
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    public void chromeCastRemoved(ChromeCast chromeCast) {
+
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        ChromeCasts.unregisterListener(this);
+        if (manage_chromecast != null) {
+            LocalBroadcastManager.getInstance(PeertubeBaseMainActivity.this).unregisterReceiver(manage_chromecast);
+
+            new Thread(() -> {
+                if (chromeCasts != null && chromeCasts.size() > 0) {
+                    for (ChromeCast cast : chromeCasts) {
+                        try {
+                            cast.stopApp();
+                            cast.disconnect();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }).start();
+        }
+        if (chromeCasts != null) {
+            chromeCasts = null;
+        }
+        if (chromeCast != null) {
+            chromeCast = null;
+        }
+    }
+
+
+    //Method for discovering cast devices
+    public void discoverCast() {
+
+        new Thread(() -> {
+            if (chromeCasts != null) {
+                for (ChromeCast cast : chromeCasts) {
+                    try {
+                        cast.disconnect();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+                chromeCasts = null;
+            }
+            chromeCasts = new ArrayList<>();
+            try {
+                List<NetworkInterface> interfaces;
+                interfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
+                for (NetworkInterface ni : interfaces) {
+                    if ((!ni.isLoopback()) && ni.isUp() && (ni.getName().equals("wlan0"))) {
+                        Enumeration<InetAddress> inetAddressEnumeration = ni.getInetAddresses();
+                        while (inetAddressEnumeration.hasMoreElements()) {
+                            InetAddress inetAddress = inetAddressEnumeration.nextElement();
+                            ChromeCasts.restartDiscovery(inetAddress);
+                            int tryFind = 0;
+                            while (ChromeCasts.get().isEmpty() && tryFind < 5) {
+                                try {
+                                    //noinspection BusyWait
+                                    Thread.sleep(1000);
+                                    tryFind++;
+                                } catch (InterruptedException ignored) {
+                                }
+                            }
+                        }
+                    }
+                }
+                ChromeCasts.stopDiscovery();
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                Runnable myRunnable = this::invalidateOptionsMenu;
+                mainHandler.post(myRunnable);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+
+
+}

app/src/fdroid/res/layout/min_controller.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/castMiniController"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black"
+    android:visibility="gone">
+
+    <ImageView
+        android:id="@+id/cast_play"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/play"
+        android:src="@drawable/ic_baseline_play_arrow_32"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cast_loader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/cast_loader_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/please_wait"
+            android:textColor="?colorAccent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/cast_loader_small"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ProgressBar
+            android:id="@+id/cast_loader_small"
+            android:layout_width="wrap_content"
+            android:layout_height="18dp"
+            android:layout_gravity="center"
+            android:layout_marginStart="5dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/cast_loader_text"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/fdroid/res/menu/video_menu.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_cast"
+        android:icon="@drawable/ic_baseline_cast_24"
+        android:title="@string/cast"
+        android:visible="false"
+        app:showAsAction="always" />
+</menu>

app/src/fdroid/res/xml/compose_shortcuts.xml

@@ -0,0 +1,19 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <shortcut
+        android:shortcutId="compose"
+        android:enabled="true"
+        android:icon="@drawable/ic_baseline_add_comment_24"
+        android:shortcutShortLabel="@string/compose_shortcut_short_label1"
+        tools:targetApi="n_mr1">
+        <intent
+            android:action="app.fedilab.android.shorcut.compose"
+            android:targetClass="app.fedilab.android.activities.MainActivity"
+            android:targetPackage="fr.gouv.etalab.mastodon" />
+
+        <categories android:name="android.shortcut.conversation" />
+        <capability-binding android:key="actions.intent.CREATE_MESSAGE" />
+    </shortcut>
+
+
+</shortcuts>

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
@@ -27,10 +28,10 @@
         android:icon="@mipmap/ic_launcher_bubbles"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_bubbles_round"
         android:supportsRtl="true"
-        android:requestLegacyExternalStorage="true"
-        android:theme="@style/AppThemeDark"
+        android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:allowBackup">
 
@@ -79,9 +80,13 @@
             android:roundIcon="@mipmap/ic_launcher_bubbles_round"
             android:targetActivity=".activities.MainActivity">
             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -95,6 +100,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -108,6 +116,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -121,6 +132,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -134,6 +148,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
         </activity-alias>
 
         <activity-alias
@@ -147,6 +164,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
         </activity-alias>
 
 
@@ -166,75 +186,71 @@
                     android:scheme="fedilab" />
             </intent-filter>
         </activity>
+
+
         <activity
-            android:name=".activities.WebviewConnectActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
-        <activity
-            android:name=".activities.StatusHistoryActivity"
+            android:name=".mastodon.activities.StatusHistoryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/status_history"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.ContextActivity"
+            android:name=".mastodon.activities.ContextActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".activities.DraftActivity"
+            android:name=".mastodon.activities.DraftActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".imageeditor.EditImageActivity"
+            android:name=".mastodon.imageeditor.EditImageActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".activities.ComposeActivity"
+            android:name=".mastodon.activities.ComposeActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/compose" />
         <activity
-            android:name=".activities.StatusInfoActivity"
+            android:name=".mastodon.activities.StatusInfoActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".activities.FollowRequestActivity"
+            android:name=".mastodon.activities.FollowRequestActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".activities.WebviewActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
-        <activity
-            android:name=".activities.ProfileActivity"
+            android:name=".mastodon.activities.ProfileActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/account" />
         <activity
-            android:name=".activities.admin.AdminAccountActivity"
+            android:name=".mastodon.activities.admin.AdminAccountActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/account" />
         <activity
-            android:name=".activities.AccountReportActivity"
+            android:name=".mastodon.activities.AccountReportActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/account"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.admin.AdminReportActivity"
+            android:name=".mastodon.activities.admin.AdminReportActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/report"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.ScheduledActivity"
+            android:name=".mastodon.activities.ScheduledActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/scheduled" />
         <activity
-            android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+            android:name="com.canhub.cropper.CropImageActivity"
             android:theme="@style/Base.Theme.AppCompat" />
 
 
         <activity
-            android:name=".activities.SearchResultTabActivity"
+            android:name=".mastodon.activities.SearchResultTabActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/search"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.TrendsActivity"
+            android:name=".mastodon.activities.TrendsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/trending"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.ReorderTimelinesActivity"
+            android:name=".mastodon.activities.ReorderTimelinesActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/reorder_timelines"
             android:theme="@style/AppThemeBar" />
@@ -243,100 +259,88 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/action_about"
             android:theme="@style/AppThemeBar" />
+
         <activity
-            android:name=".activities.admin.AdminDomainBlockActivity"
+            android:name=".mastodon.activities.admin.AdminDomainBlockActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/blocked_domains"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.SuggestionActivity"
+            android:name=".mastodon.activities.SuggestionActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/Suggestions"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.PartnerShipActivity"
+            android:name=".mastodon.activities.DirectoryActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/Directory"
+            android:theme="@style/AppThemeBar" />
+        <activity
+            android:name=".mastodon.activities.PartnerShipActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/action_about"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.ActionActivity"
+            android:name=".mastodon.activities.ActionActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/interactions"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.admin.AdminActionActivity"
+            android:name=".mastodon.activities.admin.AdminActionActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/administration"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.MastodonListActivity"
+            android:name=".mastodon.activities.MastodonListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/action_lists"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.FollowedTagActivity"
+            android:name=".mastodon.activities.FollowedTagActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/followed_tags"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.SettingsActivity"
+            android:name=".mastodon.activities.SettingsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/settings"
             android:theme="@style/AppThemeBar" />
         <activity
-            android:name=".activities.InstanceActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/action_about_instance"
-            android:theme="@style/DialogDark" />
-        <activity
-            android:name=".activities.InstanceProfileActivity"
-            android:excludeFromRecents="true"
-            android:theme="@style/DialogDark" />
-        <activity
-            android:name=".activities.ProxyActivity"
-            android:excludeFromRecents="true"
-            android:theme="@style/DialogDark" />
-        <activity
-            android:name=".activities.HashTagActivity"
+            android:name=".mastodon.activities.HashTagActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".activities.AnnouncementActivity"
+            android:name=".mastodon.activities.AnnouncementActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
-            android:name=".activities.MediaActivity"
+            android:name=".mastodon.activities.MediaActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/TransparentDark" />
+            android:theme="@style/Transparent" />
 
         <activity
-            android:name=".activities.InstanceHealthActivity"
-            android:excludeFromRecents="true"
-            android:theme="@style/DialogDark" />
-
-        <activity
-            android:name=".activities.ReportActivity"
-            android:theme="@style/AppThemeBarDark"
+            android:name=".mastodon.activities.ReportActivity"
+            android:theme="@style/AppThemeBar"
             android:windowSoftInputMode="stateVisible" />
 
         <activity
-            android:name=".activities.CustomSharingActivity"
+            android:name=".mastodon.activities.CustomSharingActivity"
             android:label="@string/settings_title_custom_sharing"
-            android:theme="@style/AppThemeBarDark"
+            android:theme="@style/AppThemeBar"
             android:windowSoftInputMode="stateVisible" />
         <activity
-            android:name=".activities.FilterActivity"
+            android:name=".mastodon.activities.FilterActivity"
             android:label="@string/filters"
-            android:theme="@style/AppThemeBarDark"
+            android:theme="@style/AppThemeBar"
             android:windowSoftInputMode="stateVisible" />
         <activity
-            android:name=".activities.EditProfileActivity"
+            android:name=".mastodon.activities.EditProfileActivity"
             android:label="@string/edit_profile"
-            android:theme="@style/AppThemeBarDark"
+            android:theme="@style/AppThemeBar"
             android:windowSoftInputMode="stateVisible" />
 
         <activity
-            android:name=".activities.CacheActivity"
+            android:name=".mastodon.activities.CacheActivity"
             android:label="@string/action_cache"
-            android:theme="@style/AppThemeBarDark" />
+            android:theme="@style/AppThemeBar" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -349,7 +353,7 @@
         </provider>
 
         <receiver
-            android:name=".broadcastreceiver.ToastMessage"
+            android:name=".mastodon.broadcastreceiver.ToastMessage"
             android:exported="false">
             <intent-filter>
                 <action android:name="RECEIVE_TOAST_MESSAGE" />
@@ -357,7 +361,7 @@
         </receiver>
 
         <receiver
-            android:name=".services.CustomReceiver"
+            android:name=".mastodon.services.CustomReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -368,5 +372,105 @@
                 <action android:name="org.unifiedpush.android.connector.REGISTRATION_REFUSED" />
             </intent-filter>
         </receiver>
+
+
+        <activity
+            android:name=".peertube.activities.PeertubeMainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".peertube.activities.PeertubeActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:resizeableActivity="true"
+            android:supportsPictureInPicture="true"
+            tools:targetApi="n" />
+        <activity
+            android:name=".peertube.activities.PeertubeEditUploadActivity"
+            android:configChanges="orientation|screenSize"
+            android:exported="false"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+
+        <activity
+            android:name=".peertube.activities.ShowChannelActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.ShowAccountActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.AccountActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.MyAccountActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.SearchActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.AllPlaylistsActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.AllLocalPlaylistsActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.PlaylistsActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.VideosTimelineActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.SepiaSearchActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/sepia_search"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.ManageInstancesActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/instances_picker"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.WebviewActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".peertube.activities.LoginActivity"
+            android:configChanges="orientation|screenSize"
+            android:exported="true"
+            android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="backtotubelab"
+                    android:scheme="tubelab" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".peertube.activities.SettingsActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/settings"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".peertube.activities.PeertubeUploadActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/upload_video"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+
+        <service
+            android:name=".peertube.services.RetrieveInfoService"
+            android:exported="false" />
+
+
     </application>
 </manifest>

app/src/main/assets/categories.json

@@ -0,0 +1,20 @@
+{
+  "1": "Music",
+  "2": "Films",
+  "3": "Vehicles",
+  "4": "Art",
+  "5": "Sports",
+  "6": "Travels",
+  "7": "Gaming",
+  "8": "People",
+  "9": "Comedy",
+  "10": "Entertainment",
+  "11": "News & Politics",
+  "12": "How To",
+  "13": "Education",
+  "14": "Activism",
+  "15": "Science & Technology",
+  "16": "Animals",
+  "17": "Kids",
+  "18": "Food"
+}

app/src/main/assets/languages.json

@@ -0,0 +1,199 @@
+{
+  "aa": "Afar",
+  "ab": "Abkhazian",
+  "af": "Afrikaans",
+  "ak": "Akan",
+  "am": "Amharic",
+  "ar": "Arabic",
+  "an": "Aragonese",
+  "ase": "American Sign Language",
+  "as": "Assamese",
+  "av": "Avaric",
+  "avk": "Kotava",
+  "ay": "Aymara",
+  "az": "Azerbaijani",
+  "ba": "Bashkir",
+  "bm": "Bambara",
+  "be": "Belarusian",
+  "bn": "Bengali",
+  "bfi": "British Sign Language",
+  "bi": "Bislama",
+  "bo": "Tibetan",
+  "bs": "Bosnian",
+  "br": "Breton",
+  "bg": "Bulgarian",
+  "bzs": "Brazilian Sign Language",
+  "ca": "Catalan",
+  "cs": "Czech",
+  "ch": "Chamorro",
+  "ce": "Chechen",
+  "cv": "Chuvash",
+  "kw": "Cornish",
+  "co": "Corsican",
+  "cr": "Cree",
+  "cse": "Czech Sign Language",
+  "csl": "Chinese Sign Language",
+  "cy": "Welsh",
+  "da": "Danish",
+  "de": "German",
+  "dv": "Dhivehi",
+  "dsl": "Danish Sign Language",
+  "dz": "Dzongkha",
+  "el": "Greek",
+  "en": "English",
+  "eo": "Esperanto",
+  "et": "Estonian",
+  "eu": "Basque",
+  "ee": "Ewe",
+  "fo": "Faroese",
+  "fa": "Persian",
+  "fj": "Fijian",
+  "fi": "Finnish",
+  "fr": "French",
+  "fy": "Western Frisian",
+  "fsl": "French Sign Language",
+  "ff": "Fulah",
+  "gd": "Scottish Gaelic",
+  "ga": "Irish",
+  "gl": "Galician",
+  "gv": "Manx",
+  "gn": "Guarani",
+  "gsg": "German Sign Language",
+  "gu": "Gujarati",
+  "ht": "Haitian",
+  "ha": "Hausa",
+  "sh": "Serbo-Croatian",
+  "he": "Hebrew",
+  "hz": "Herero",
+  "hi": "Hindi",
+  "ho": "Hiri Motu",
+  "hr": "Croatian",
+  "hu": "Hungarian",
+  "hy": "Armenian",
+  "ig": "Igbo",
+  "ii": "Sichuan Yi",
+  "iu": "Inuktitut",
+  "id": "Indonesian",
+  "ik": "Inupiaq",
+  "is": "Icelandic",
+  "it": "Italian",
+  "jv": "Javanese",
+  "jbo": "Lojban",
+  "ja": "Japanese",
+  "jsl": "Japanese Sign Language",
+  "kab": "Kabyle",
+  "kl": "Kalaallisut",
+  "kn": "Kannada",
+  "ks": "Kashmiri",
+  "ka": "Georgian",
+  "kr": "Kanuri",
+  "kk": "Kazakh",
+  "km": "Khmer",
+  "ki": "Kikuyu",
+  "rw": "Kinyarwanda",
+  "ky": "Kirghiz",
+  "kv": "Komi",
+  "kg": "Kongo",
+  "ko": "Korean",
+  "kj": "Kuanyama",
+  "ku": "Kurdish",
+  "lo": "Lao",
+  "la": "Latin",
+  "lv": "Latvian",
+  "li": "Limburgan",
+  "ln": "Lingala",
+  "lt": "Lithuanian",
+  "lb": "Luxembourgish",
+  "lu": "Luba-Katanga",
+  "lg": "Ganda",
+  "mh": "Marshallese",
+  "ml": "Malayalam",
+  "mr": "Marathi",
+  "mk": "Macedonian",
+  "mg": "Malagasy",
+  "mt": "Maltese",
+  "mn": "Mongolian",
+  "mi": "Maori",
+  "ms": "Malay (macrolanguage)",
+  "my": "Burmese",
+  "na": "Nauru",
+  "nv": "Navajo",
+  "nr": "South Ndebele",
+  "nd": "North Ndebele",
+  "ng": "Ndonga",
+  "ne": "Nepali (macrolanguage)",
+  "nl": "Dutch",
+  "nn": "Norwegian Nynorsk",
+  "nb": "Norwegian Bokmål",
+  "no": "Norwegian",
+  "ny": "Nyanja",
+  "oc": "Occitan",
+  "oj": "Ojibwa",
+  "or": "Oriya (macrolanguage)",
+  "om": "Oromo",
+  "os": "Ossetian",
+  "pa": "Panjabi",
+  "pks": "Pakistan Sign Language",
+  "pl": "Polish",
+  "pt": "Portuguese",
+  "ps": "Pushto",
+  "qu": "Quechua",
+  "rm": "Romansh",
+  "ro": "Romanian",
+  "rsl": "Russian Sign Language",
+  "rn": "Rundi",
+  "ru": "Russian",
+  "sg": "Sango",
+  "sdl": "Saudi Arabian Sign Language",
+  "sfs": "South African Sign Language",
+  "si": "Sinhala",
+  "sk": "Slovak",
+  "sl": "Slovenian",
+  "se": "Northern Sami",
+  "sm": "Samoan",
+  "sn": "Shona",
+  "sd": "Sindhi",
+  "so": "Somali",
+  "st": "Southern Sotho",
+  "es": "Spanish",
+  "sq": "Albanian",
+  "sc": "Sardinian",
+  "sr": "Serbian",
+  "ss": "Swati",
+  "su": "Sundanese",
+  "sw": "Swahili (macrolanguage)",
+  "sv": "Swedish",
+  "swl": "Swedish Sign Language",
+  "ty": "Tahitian",
+  "ta": "Tamil",
+  "tt": "Tatar",
+  "te": "Telugu",
+  "tg": "Tajik",
+  "tl": "Tagalog",
+  "th": "Thai",
+  "ti": "Tigrinya",
+  "tlh": "Klingon",
+  "to": "Tonga (Tonga Islands)",
+  "tn": "Tswana",
+  "ts": "Tsonga",
+  "tk": "Turkmen",
+  "tr": "Turkish",
+  "tw": "Twi",
+  "ug": "Uighur",
+  "uk": "Ukrainian",
+  "ur": "Urdu",
+  "uz": "Uzbek",
+  "ve": "Venda",
+  "vi": "Vietnamese",
+  "wa": "Walloon",
+  "wo": "Wolof",
+  "xh": "Xhosa",
+  "yi": "Yiddish",
+  "yo": "Yoruba",
+  "za": "Zhuang",
+  "zh": "Chinese",
+  "zu": "Zulu",
+  "zxx": "No linguistic content",
+  "zh-Hans": "Simplified Chinese",
+  "zh-Hant": "Traditional Chinese"
+}

app/src/main/assets/release_notes/notes.json

@@ -1,4 +1,214 @@
 [
+  {
+    "version": "3.17.0",
+    "code": "477",
+    "note": "Added:\n- Peertube 2FA support\n- Cache home in background (default disabled -> New settings category and per account) / change frequency\n- Auto-fetch missing messages for the Home (default disabled -> in Settings - Timelines)\n- Automatically switch between tabs when searching\n- More deep links detection\n- Allow to group mentions at the top (default: disabled)\n\n\nFixed:\n- Dynamic color for Android 12+\n- Missing media description for previews\n- Fix a crash when replying\n- Fix button size not changed\n- Forward tags in replies\n- Media cannot be downloaded or shared with Android 10\n- Some crashes"
+  },
+  {
+    "version": "3.16.4",
+    "code": "476",
+    "note": "Added:\n- Cache home in background (default disabled -> New settings category and per account) / change frequency\n- Auto-fetch missing messages for the Home (default disabled -> in Settings - Timelines)\n- Automatically switch between tabs when searching\n\nFixed:\n- Some crashes"
+  },
+  {
+    "version": "3.16.3",
+    "code": "475",
+    "note": "Added:\n- Peertube 2FA support\n\nFixed:\n- Dynamic color for Android 12+"
+  },
+  {
+    "version": "3.16.2",
+    "code": "474",
+    "note": "Added:\n- Peertube support\n- Compose shortcut (long press launcher)\n- Long press compose button to write with another account\n- Edit description and focus for media (for the next Mastodon release)\n\nChanged:\n- Cross actions with two accounts display a dialog\n- Order & compact og values when sharing > title - url - content\n- Tap on top message (user info) open threads\n\nFixed:\n- Text cleared when adding a media\n- Fix Maths not working with quotes\n- Fix crashes"
+  },
+  {
+    "version": "3.16.1",
+    "code": "473",
+    "note": "Changed:\n- Edit description and focus for media (for the next Mastodon release)\n\nChanged:\n- Peertube: remove role support to avoid crashes with older instances\n\nFixed:\n- Fix some crashes"
+  },
+  {
+    "version": "3.16.0",
+    "code": "472",
+    "note": "Changed:\n- Peertube support\n- Compose shortcut\n- Long press compose button to write with another account\n\nChanged:\n- Cross actions with two accounts display a dialog\n- Order & compact og values when sharing > title - url - content\n\nFixed:\n- Text cleared when adding a media\n- Fix crashes"
+  },
+  {
+    "version": "3.15.2",
+    "code": "471",
+    "note": "Changed:\n- Add instance name when sharing\n\nFixed:\n- Fix a crash when removing media\n- Other minor fixes"
+  },
+  {
+    "version": "3.15.1",
+    "code": "470",
+    "note": "Changed:\n- Material dialogs\n\nFixed:\n- Light theme issues"
+  },
+  {
+    "version": "3.15.0",
+    "code": "469",
+    "note": "Added:\n- Maths support (view and compose)\n- Filter DMs in HOME (long press on the tab)\n- Filter languages for users in home timeline (from their profile)\n- Add several targeted languages for translator\n\nChanged:\n- Hide single media with preview is now a setting (default: disabled)\n- Group items in menu of messages\n\nFixed:\n- Cross-actions didn't display account instances"
+  },
+  {
+    "version": "3.14.6",
+    "code": "468",
+    "note": "Added:\n- Maths support (view and compose)\n\nChanged:\n- Hide single media with preview is now a setting (default: disabled)"
+  },
+  {
+    "version": "3.14.5",
+    "code": "467",
+    "note": "Changed:\n- Allow to swipe media for profiles\n\nFixed:\n- Fix crashes with pinch zoom\n- Copy/Paste in threads\n- Fix crash when checking redirection on http links\n- Display menu in media viewer resets pinch-zoom"
+  },
+  {
+    "version": "3.14.4",
+    "code": "466",
+    "note": "Changed:\n- Media viewer (pinch zoom)\n\nFixed:\n- Cross account actions (long press)\n- Boost color\n- Buttons not visible with custom themes.\n- Fix some bad behaviors with media viewer"
+  },
+  {
+    "version": "3.14.3",
+    "code": "465",
+    "note": "Added:\n- Display date of the message instead of the boost (default: disabled)\n- Allow to disable release notes popup in Settings\n\nFixed:\n- Fix timelines slow down and stuttering after some scrolls\n- Fix color issues with follow buttons\n- Fix import from settings (import from login was OK)"
+  },
+  {
+    "version": "3.14.2",
+    "code": "464",
+    "note": "Added:\n- Display familiar followers on profiles\n- Display and filter Instance directory\n\nChanged:\n- Bot and reply icon indicators more visible\n- Single media are hidden with link previews\n\nFixed:\n- Fix a crash with Art timelines\n- Friendica: media cannot be downloaded/shared\n- Fix a crash with pinned timelines"
+  },
+  {
+    "version": "3.14.1",
+    "code": "463",
+    "note": "Added:\n- Search bar: display suggestions when starting by \"@\" or \"#\"\n\nChanged:\n- Preload media in timelines to avoid jumps\n- Search: Automatically switch to account tab if no results for tags\n\nFixed:\n- Fix jumps with the fetch more feature\n- Fix videos cannot be saved\n- Tags cannot be pinned when there are no custom tabs\n- PixelFed view: NSFW not honored\n- Fix crashes"
+  },
+  {
+    "version": "3.14.0",
+    "code": "462",
+    "note": "Added:\n\n- Add Bubble timeline support in extra-features with filters\n- Allow to display public profiles by default to get all messages (Settings > Interface)\n- Glitch: Allow to post messages locally (Can be turned off in Settings)\n- Pixelfed: Custom layout to display Media fully (Also works for other software when there are media)\n- Allow to align left action buttons in messages\n\nChanged:\n- Full rework on links in messages (also mentions and tags)\n- Add pinned tag in \"any\" to avoid to lose it when renaming timeline\n\nFixed:\n- Links to messages not handled by the app\n- CW when editing a message\n- Fix push notifications with several accounts\n- New messages or edition notifications not pushed\n- Fix quotes with tags/mentions\n- Fix notifications\n- Fix sending multiple media\n- Fix crashes"
+  },
+  {
+    "version": "3.13.7",
+    "code": "461",
+    "note": "Added:\n- Pixelfed: Custom layout to display Media fully \n*(Settings > Timelines > Pixelfed Presentation) - Also works for other softwares when there are media\n\nChanged:\n- Add pinned tag in \"any\" to avoid to lose it when renaming timeline\n\nFixed:\n- Fix push notifications with several accounts\n- Fix quotes with tags/mentions\n- Fix notifications\n- Fix sending multiple media\n- Some crashes"
+  },
+  {
+    "version": "3.13.6",
+    "code": "460",
+    "note": "Fixed:\n- Cross-compose: Wrong instance emojis\n- Custom emojis not displayed in notifications\n- Fav/Boost markers with shared messages\n- Empty notifications\n- Fix cw removed when replying\n- Fix expand media with fit preview images when sensitive\n- Fix an issue with fetch more displayed too often (cache clear will help or wait new messages)"
+  },
+  {
+    "version": "3.13.5",
+    "code": "459",
+    "note": "Added:\n- Glitch: Allow to post messages locally (Can be turned off in Settings)\n\nFixed:\n- Crashes"
+  },
+  {
+    "version": "3.13.4",
+    "code": "458",
+    "note": "Added:\n- Add Bubble timeline support in extra-features with filters\n- Allow to display public profiles by default to get all messages (Settings > Interface)\n\nChanged:\n- Full rework on links in messages (also mentions and tags)\n\nFixed:\n- Spoiler text when editing\n- Fix watermarks"
+  },
+  {
+    "version": "3.13.3",
+    "code": "457",
+    "note": "Added:\n- Allow to enable extra features in Settings\n- Customizable settings for extra features\n- Support quotes, reactions with messages\n- Support text format (html, markdown, etc.) when composing\n\nFixed:\n- CW not working with media\n- Media not displayed for older instances\n- Some crashes\n"
+  },
+  {
+    "version": "3.13.2",
+    "code": "456",
+    "note": "Changed:\n- Hidden media smaller with preview images\n\nFixed:\n- Issue with Media for Android 11+\n- Crash when not setting a translation key\n- Fix DeepL for API pro\n- Crash when visiting a profile with a lot of media\n- Home muted accounts not working without filters\n- Animated custom emoji not displayed"
+  },
+  {
+    "version": "3.13.1",
+    "code": "455",
+    "note": "Added:\n- DeepL translation support free/pro keys\n\nChanged:\n- Hide buttons for media when editing\n\nFixed:\n- GIF loaded as static images\n- Suggested accounts cannot be followed"
+  },
+  {
+    "version": "3.13.0",
+    "code": "454",
+    "note": "Added:\n- Post random quotes\n- Group reblogs in home timeline\n- Rename Nitter timelines\n- Android 13 support\n- Pagination with search / trending\n- Allow to remove left margin in messages (default: disabled)\n\nChanged:\n- Display translate button only when language is different\n- Respect blank spaces between words in messages\n- Focus button more accessible when editing media\n- Visual feedback for block on account list\n- Visual changes with compose / top bar\n- Use custom Nitter timeline name in manage timelines\n\nFixed:\n- Behavior with cw toggle\n- Truncated gimini links\n- Nav buttons not visible with media (Light theme)\n- Status bar with Android 5\n- Fix links not clickable\n- Fix deep links\n- Fix remote threads not fetched for some instances\n- Adding description to shared media\n- Open with another accounts\n- Chars size not respected for Android 5-6\n- Wrong instance fetched for instances.social\n- Bouncing Timeline on refresh\n- Links to mentions, tags, urls, not visible.\n- Custom channel sounds not applied\n- users with short username are not linked\n- Fix crashes"
+  },
+  {
+    "version": "3.12.3",
+    "code": "453",
+    "note": "Added:\n- Pagination with search / trending\n\nFixed:\n- Long press on Nitter tabs\n- Open with another accounts\n- Chars size not respected for Android 5-6\n- Wrong instance fetched for instances.social"
+  },
+  {
+    "version": "3.12.2",
+    "code": "452",
+    "note": "Added:\n- Rename Nitter timelines\n- Android 13 support\n\nChanged:\n- Visual feedback for block on account list\n- Visual changes with compose / top bar\n\nFixed:\n- Nav buttons not visible with media (Light theme)\n- Status bar with Android 5\n- Fix links not clickable\n- Fix deep links\n- Fix remote threads not fetched for some instances\n- Adding description to shared media\n- Fix crashes"
+  },
+  {
+    "version": "3.12.1",
+    "code": "451",
+    "note": "Added:\n- Post random quotes\n- Group reblogs in home timeline\n\nChanged:\n- Display translate button only when language is different\n- Respect blank spaces between words in messages\n- Focus button more accessible when editing media\n\nFixed:\n- Behavior with cw toggle\n- Truncated gimini links"
+  },
+  {
+    "version": "3.12.0",
+    "code": "450",
+    "note": "Added:\n- Full data import/export feature\n- Android 13 themed icon support\n\nFixed:\n- Fix a regression with filters\n- Fix dark solarized theme\n- Fix hide link previews for CW\n- Fix status bar color for all themes\n- Fix language in compose \"...\"\n- Fix add all home muted accounts from lists\n- Fix top notification badges"
+  },
+  {
+    "version": "3.11.3",
+    "code": "449",
+    "note": "Added:\n- Add more targeted languages in picker for translations\n- Add account name in push notifications\n\nFixed:\n- Fix a crash when changing language\n- Fix counter colors\n- Fix default link color\n- Fix a crash when clicking on mentions"
+  },
+  {
+    "version": "3.11.2",
+    "code": "448",
+    "note": "Added:\n- Mute/Unmute accounts in the Home timeline from their messages or their profiles\n- Add all users from a list to \"Muted home\" in one click\n- Display/Manage users that are muted for home\n\nFixed:\n- Timeline crashes"
+  },
+  {
+    "version": "3.11.0",
+    "code": "446",
+    "note": "Added:\n- Display all messages in threads from remote instances (when possible)\n- Allow to unmute/unfollow/unpin a tag from tag timelines\n- Display most used accounts in header menu for an easy switch\n- Automatically add the tag when composing from a tag timeline\n- Add a translate button at the bottom of messages (default: disabled)\n- Add account role in profiles\n- Translate morse\n\nChanged:\n- Disable animations after a refresh\n\nFixed:\n- Contact not working when composing\n- Status bar for black theme\n- Message duplicated in conversations when edited\n- Color issue on Android 5\n- Several crashes"
+  },
+  {
+    "version": "3.10.2",
+    "code": "445",
+    "note": "Added:\n- Allow to unmute/unfollow/unpin a tag from tag timelines\n- Automatically add the tag when composing from a tag timeline\n- Add a translate button at the bottom of messages (default: disabled)\n- Add account role in profiles\n\nFixed:\n- Contact not working when composing\n- Status bar for black theme\n- Message duplicated in conversations when edited\n- Color issue on Android 5"
+  },
+  {
+    "version": "3.10.1",
+    "code": "444",
+    "note": "Added:\n- Display all messages in threads from remote instances (when possible)\n* Only public messages for instances using the Mastodon API\n* A dedicated button is displayed at the top right when conditions are filled."
+  },
+  {
+    "version": "3.10.0",
+    "code": "443",
+    "note": "Added:\n- Dracula theme\n- Customize message colors\n- Enable/Disable Card presentation\n\nChanged:\n- Colors for some themes\n- Space between buttons\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache\n- Tag patterns in URL break the link\n- Typo in followed tags"
+  },
+  {
+    "version": "3.9.7",
+    "code": "442",
+    "note": "Added:\n- Dracula theme\n\nChanged:\n- Colors for Light/Dark/Black themes\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Tag patterns in URL break the link\n- Typo in followed tags"
+  },
+  {
+    "version": "3.9.6",
+    "code": "441",
+    "note": "Fixed:\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache"
+  },
+  {
+    "version": "3.9.5",
+    "code": "440",
+    "note": "Fixed:\n- Custom emoji are not always displayed\n- Jumps in timeline when using \"fit preview images\"\n- Dark theme: timeline buttons without toggle"
+  },
+  {
+    "version": "3.9.4",
+    "code": "439",
+    "note": "Changed:\n- Remove card presentation\n- Link color for black theme\n\nFixed:\n- Crash when changing the theme"
+  },
+  {
+    "version": "3.9.3",
+    "code": "438",
+    "note": "Added:\n- New design with 5 themes\n\nChanged:\n- Remove built-in browser support\n- Fit preview image displays images vertically\n- Add counters next to images\n\nFixed:\n- Jumps in timelines\n- Replies to wrong messages with followed instances\n- Bug with delete&redraft with a media\n- List cannot be hidden\n- Some crashes"
+  },
+  {
+    "version": "3.9.1",
+    "code": "436",
+    "note": "Changed:\n- Remove built-in browser support\n- More spaces between action buttons in messages\n\nFixed:\n- Text size issue\n- Text overlap\n- Wrong background for solarized black\n- Mix between light and dark theme\n- Save button hidden"
+  },
+  {
+    "version": "3.9.0",
+    "code": "435",
+    "note": "Added:\n- Migrate to Material Design 3\n- 5 Themes (Light, Dark, Solarized Light/Dark, Black)\n- Automatically switch between Light/Dark\n- Light and Dark theme can be defined for time-based switch\n- Android 12+: Dynamic color\n\nFixed:\n- Jumps in timelines\n"
+  },
+  {
+    "version": "3.8.1",
+    "code": "434",
+    "note": "Added:\n- Mute tags with long press in timelines\n\nChanged:\n- Muted account messages are now removed from cache\n\nFixed:\n- Open with another account\n- Fix jumps in profiles\n- Media not displayed in album -> force indexation\n- Built-in browser does not give admin scope\n- Some crashes"
+  },
   {
     "version": "3.8.0",
     "code": "433",

app/src/main/assets/themes/contributors/Fedilab_theme_ACN.csv

@@ -1,15 +0,0 @@
-base_theme,1
-author,acn128
-name,ACN
-theme_boost_header_color,-727060
-theme_text_header_1_line,-10865760
-theme_text_header_2_line,-11719543
-theme_statuses_color,-197380
-theme_link_color,-13681272
-theme_icons_color,-15395562
-pref_color_background,-1
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-14059009
-theme_text_color,-13027015
-theme_primary,-1

app/src/main/assets/themes/contributors/Fedilab_theme_Breeze_Dark_Yellow.csv

@@ -1,13 +0,0 @@
-base_theme,2
-author,Fedilab
-name,Breeze Dark - Yellow
-theme_boost_header_color,-14012878
-theme_statuses_color,-14473687
-theme_link_color,-12734743
-theme_icons_color,-4340793
-pref_color_background,-15658735
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-148405
-theme_text_color,-1052431
-theme_primary,-13552069

app/src/main/assets/themes/contributors/Fedilab_theme_Cyberpunk_Neon.csv

@@ -1,15 +0,0 @@
-base_theme,2
-author,Roboron
-name,Cyberpunk Neon
-theme_boost_header_color,-16776697,
-theme_text_header_1_line,-1441575,
-theme_text_header_2_line,-5242717,
-theme_statuses_color,-16181197,
-theme_link_color,-1441575,
-theme_icons_color,-16138810,
-pref_color_background,-16774370,
-pref_color_navigation_bar,true,
-pref_color_status_bar,true,
-theme_accent,-1441575,
-theme_text_color,-16138810,
-theme_primary,-16774370,

app/src/main/assets/themes/contributors/Fedilab_theme_Dark_Elephant.csv

@@ -1,15 +0,0 @@
-base_theme,0
-author,S1m
-name,Dark Elephant
-theme_boost_header_color,-13552317
-theme_text_header_1_line,-3479297
-theme_text_header_2_line,-7287815
-theme_statuses_color,-13552317
-theme_link_color,-11098143
-theme_icons_color,-789517
-pref_color_background,-14144456
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-13922086
-theme_text_color,-789517
-theme_primary,-14144456

app/src/main/assets/themes/contributors/Fedilab_theme_Grey_Orange.csv

@@ -1,15 +0,0 @@
-base_theme,2
-author,Jøta Seth
-name,Grey Orange
-theme_boost_header_color,-14869219
-theme_text_header_1_line,-1
-theme_text_header_2_line,-1
-theme_statuses_color,-14145496
-theme_link_color,-26624
-theme_icons_color,-26624
-pref_color_background,-13092808
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-26624
-theme_text_color,-1
-theme_primary,-14408668

app/src/main/assets/themes/contributors/Fedilab_theme_Gruvbox_OLED.csv

@@ -1,15 +0,0 @@
-base_theme,2
-author,@AntoineD@h.kher.nl
-name,Gruvbox OLED
-theme_boost_header_color,-16777216
-theme_text_header_1_line,-265785
-theme_text_header_2_line,-6777062
-theme_statuses_color,-16777216
-theme_link_color,-2647775
-theme_icons_color,-7175308
-pref_color_background,-16777216
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-9921174
-theme_text_color,-265785
-theme_primary,-16777216

app/src/main/assets/themes/contributors/Fedilab_theme_Less_Angry_Orange.csv

@@ -1,15 +0,0 @@
-base_theme,2
-author,AngryTux
-name,Less Angry Orange
-theme_boost_header_color,-15855063
-theme_text_header_1_line,-2128640
-theme_text_header_2_line,-5329234
-theme_statuses_color,-1
-theme_link_color,-12146699
-theme_icons_color,-2128640
-pref_color_background,-15987700
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-3968000
-theme_text_color,-197380
-theme_primary,-14408668

app/src/main/assets/themes/contributors/Fedilab_theme_Mondstern_Fedilab.csv

@@ -1,15 +0,0 @@
-base_theme,2
-author,Mondstern
-name,Mondstern Fedilab
-theme_boost_header_color,-1,
-theme_text_header_1_line,-13855804,
-theme_text_header_2_line,-16227945,
-theme_statuses_color,-14935012,
-theme_link_color,-15542685,
-theme_icons_color,-10723999,
-pref_color_background,-15921907,
-pref_color_navigation_bar,false,
-pref_color_status_bar,false,
-theme_accent,-15542685,
-theme_text_color,-1,
-theme_primary,-14474461,

app/src/main/assets/themes/contributors/Fedilab_theme_Nocturnal.csv

@@ -1,13 +0,0 @@
-base_theme,2
-author,Fedilab
-name,Nocturnal
-theme_boost_header_color,-12895429
-theme_statuses_color,-13553359
-theme_link_color,-16747570
-theme_icons_color,-10158118
-pref_color_background,-14606047
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-13136013
-theme_text_color,-2236963
-theme_primary,-14013910

app/src/main/assets/themes/contributors/Fedilab_theme_Photon_Dark.csv

@@ -1,15 +0,0 @@
-base_theme,2
-author,Jøta Seth
-name,Photon Dark
-theme_boost_header_color,-14145496
-theme_text_header_1_line,-1
-theme_text_header_2_line,-1
-theme_statuses_color,-14935012
-theme_link_color,-14059009
-theme_icons_color,-9474193
-pref_color_background,-15921907
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-14059009
-theme_text_color,-1
-theme_primary,-14474461

app/src/main/assets/themes/contributors/Fedilab_theme_Solarized_Cyan_Accent.csv

@@ -1,15 +0,0 @@
-base_theme,1
-author,Animaly
-name,Solarized - Cyan Accent
-theme_boost_header_color,-69167
-theme_text_header_1_line,-4880128
-theme_text_header_2_line,-7102047
-theme_statuses_color,-133405
-theme_link_color,-14251054
-theme_icons_color,-10106727
-pref_color_background,-1120043
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-8021760
-theme_text_color,-16766154
-theme_primary,-1120043

app/src/main/assets/themes/contributors/Fedilab_theme_Solarized_Dark_Purple.csv

@@ -1,15 +0,0 @@
-base_theme,2
-author,Fedilab
-name,Solarized Dark - Purple
-theme_boost_header_color,-16506327
-theme_text_header_1_line,-1120043
-theme_text_header_2_line,-1120043
-theme_statuses_color,-16304574
-theme_link_color,-14251054
-theme_icons_color,-7102047
-pref_color_background,-16766154
-pref_color_navigation_bar,true
-pref_color_status_bar,true
-theme_accent,-9670204
-theme_text_color,-133405
-theme_primary,-16304574

app/src/main/assets/themes/cyanea_themes.json

@@ -1,47 +0,0 @@
-[
-  {
-    "theme_name": "Dark",
-    "base_theme": "DARK",
-    "primary": "#FF272727",
-    "primary_dark": "#FF272727",
-    "primary_light": "#FFd9e1e8",
-    "accent": "#FF2b90d9",
-    "accent_dark": "#FF1b80c9",
-    "accent_light": "#FF772b90d9",
-    "background": "#FF272727",
-    "background_dark": "#FF282c37",
-    "background_light": "#FF282c37",
-    "should_tint_statusbar": true,
-    "should_tint_navbar": true
-  },
-  {
-    "theme_name": "Light",
-    "base_theme": "LIGHT",
-    "primary": "#FFFFFF",
-    "primary_dark": "#FFFFFFFF",
-    "primary_light": "#FFd9e1e8",
-    "accent": "#FF2b90d9",
-    "accent_dark": "#FF1b80c9",
-    "accent_light": "#FF772b90d9",
-    "background": "#FFFFFFFF",
-    "background_dark": "#FFFFFFFF",
-    "background_light": "#FFFFFFFF",
-    "should_tint_statusbar": true,
-    "should_tint_navbar": true
-  },
-  {
-    "theme_name": "Black",
-    "base_theme": "DARK",
-    "primary": "#FF000000",
-    "primary_dark": "#FF000000",
-    "primary_light": "#FF000000",
-    "accent": "#FF606984",
-    "accent_dark": "#FF606984",
-    "accent_light": "#FF606984",
-    "background": "#FF000000",
-    "background_dark": "#FF000000",
-    "background_light": "#FF000000",
-    "should_tint_statusbar": true,
-    "should_tint_navbar": true
-  }
-]

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

@@ -15,16 +15,20 @@ package app.fedilab.android;
  * see <http://www.gnu.org/licenses>. */
 
 
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.StrictMode;
+import android.webkit.WebView;
 
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 
-import com.jaredrummler.cyanea.Cyanea;
-import com.jaredrummler.cyanea.prefs.CyaneaTheme;
+import net.gotev.uploadservice.UploadServiceConfig;
+import net.gotev.uploadservice.observer.request.GlobalRequestObserver;
 
 import org.acra.ACRA;
 import org.acra.ReportField;
@@ -33,49 +37,50 @@ import org.acra.config.DialogConfigurationBuilder;
 import org.acra.config.MailSenderConfigurationBuilder;
 import org.acra.data.StringFormat;
 
-import java.util.List;
+import java.util.Objects;
 
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.peertube.services.GlobalUploadObserver;
 import es.dmoral.toasty.Toasty;
 
 
 public class MainApplication extends MultiDexApplication {
 
-
-    private static MainApplication app;
-
-    public static MainApplication getApp() {
-        return app;
-    }
+    public static String UPLOAD_CHANNEL_ID = "upload_info_peertube";
+    private WebView webView;
 
     @Override
     public void onCreate() {
         super.onCreate();
-        app = this;
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MainApplication.this);
-
-
-        Cyanea.init(this, super.getResources());
-        List<CyaneaTheme> list = CyaneaTheme.Companion.from(getAssets(), "themes/cyanea_themes.json");
-        boolean custom_theme = sharedpreferences.getBoolean("use_custom_theme", false);
-        boolean no_theme_set = sharedpreferences.getBoolean("no_theme_set", true);
-        if (no_theme_set && !custom_theme) {
-            list.get(0).apply(Cyanea.getInstance());
-            SharedPreferences.Editor editor = sharedpreferences.edit();
-            editor.putBoolean("no_theme_set", false);
-            editor.apply();
+        try {
+            webView = new WebView(this);
+        } catch (Exception ignored) {
         }
         StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
         StrictMode.setVmPolicy(builder.build());
-
         Toasty.Config.getInstance().apply();
+        if (webView != null) {
+            try {
+                webView.destroy();
+            } catch (Exception ignored) {
+            }
+        }
+
+        createNotificationChannel();
+        UploadServiceConfig.initialize(MainApplication.this, UPLOAD_CHANNEL_ID, true);
+
+        new GlobalRequestObserver(this, new GlobalUploadObserver());
     }
 
+
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
         MultiDex.install(MainApplication.this);
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MainApplication.this);
         boolean send_crash_reports = sharedpreferences.getBoolean(getString(R.string.SET_SEND_CRASH_REPORTS), false);
+        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
+        ThemeHelper.switchTo(currentTheme);
         if (send_crash_reports) {
             ACRA.init(this, new CoreConfigurationBuilder()
                     //core configuration:
@@ -92,7 +97,6 @@ public class MainApplication extends MultiDexApplication {
                                     .withResIcon(R.mipmap.ic_launcher)
                                     .withText(getString(R.string.crash_title))
                                     .withCommentPrompt(getString(R.string.crash_message))
-                                    .withResTheme(R.style.DialogDark)
                                     .withPositiveButtonText(getString(R.string.send_email))
                                     .withNegativeButtonText(getString(R.string.cancel))
                                     .build()
@@ -108,4 +112,15 @@ public class MainApplication extends MultiDexApplication {
             );
         }
     }
+
+
+    private void createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(UPLOAD_CHANNEL_ID,
+                    getString(R.string.notification_channel_name),
+                    NotificationManager.IMPORTANCE_LOW);
+            channel.setSound(null, null);
+            ((NotificationManager) Objects.requireNonNull(getSystemService(Context.NOTIFICATION_SERVICE))).createNotificationChannel(channel);
+        }
+    }
 }

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

@@ -18,13 +18,11 @@ package app.fedilab.android.activities;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 
 import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 
 import java.util.ArrayList;
@@ -33,17 +31,18 @@ import java.util.List;
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.BuildConfig;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.databinding.ActivityAboutBinding;
-import app.fedilab.android.helper.CrossActionHelper;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.activities.BaseBarActivity;
+import app.fedilab.android.mastodon.activities.ProfileActivity;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.helper.CrossActionHelper;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
 
 
-public class AboutActivity extends BaseActivity {
+public class AboutActivity extends BaseBarActivity {
 
 
     private ActivityAboutBinding binding;
@@ -52,13 +51,12 @@ public class AboutActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityAboutBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         try {
@@ -79,13 +77,12 @@ public class AboutActivity extends BaseActivity {
         }
         binding.aboutSupportPaypal.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.paypal.me/Mastalab"));
 
-        binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(AboutActivity.this));
         if (BuildConfig.DONATIONS) {
             binding.aboutSupportPaypal.setVisibility(View.VISIBLE);
         } else {
             binding.aboutSupportPaypal.setVisibility(View.GONE);
         }
-        binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
+        binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
         binding.aboutWebsite.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://fedilab.app"));
         CrossActionHelper.fetchRemoteAccount(AboutActivity.this, "@apps@toot.fedilab.app", new CrossActionHelper.Callback() {
             @Override
@@ -118,7 +115,7 @@ public class AboutActivity extends BaseActivity {
                                 if (relationShips != null && relationShips.size() > 0) {
                                     if (!relationShips.get(0).following) {
                                         binding.accountFollow.setVisibility(View.VISIBLE);
-                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false)
+                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false, null)
                                                 .observe(AboutActivity.this, relationShip -> binding.accountFollow.setVisibility(View.GONE)));
                                     }
                                 }

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

@@ -1,163 +0,0 @@
-package app.fedilab.android.activities;
-/* Copyright 2021 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-
-import static app.fedilab.android.BaseMainActivity.currentAccount;
-import static app.fedilab.android.ui.drawer.StatusAdapter.sendAction;
-
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.TypedValue;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.preference.PreferenceManager;
-
-import app.fedilab.android.BaseMainActivity;
-import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.app.StatusCache;
-import app.fedilab.android.databinding.ActivityConversationBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonContext;
-import app.fedilab.android.viewmodel.mastodon.StatusesVM;
-
-public class ContextActivity extends BaseActivity {
-
-    public static boolean expand;
-    public static boolean displayCW;
-    public static Resources.Theme theme;
-    Fragment currentFragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
-        app.fedilab.android.databinding.ActivityConversationBinding binding = ActivityConversationBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        setSupportActionBar(binding.toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        //Remove title
-        if (actionBar != null) {
-            actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
-        }
-        binding.title.setText(R.string.context_conversation);
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);
-        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);
-
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setDisplayShowHomeEnabled(true);
-        }
-        binding.toolbar.setPopupTheme(Helper.popupStyle());
-        Bundle b = getIntent().getExtras();
-        displayCW = sharedpreferences.getBoolean(getString(R.string.SET_EXPAND_CW), false);
-        Status focusedStatus = null; // or other values
-        if (b != null)
-            focusedStatus = (Status) b.getSerializable(Helper.ARG_STATUS);
-        if (focusedStatus == null || currentAccount == null || currentAccount.mastodon_account == null) {
-            finish();
-            return;
-        }
-        MastodonHelper.loadPPMastodon(binding.profilePicture, currentAccount.mastodon_account);
-        Bundle bundle = new Bundle();
-        bundle.putSerializable(Helper.ARG_STATUS, focusedStatus);
-        currentFragment = Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_content_main, new FragmentMastodonContext(), bundle, null, null);
-        StatusesVM timelinesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class);
-        timelinesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> {
-            if (status != null) {
-                StatusCache statusCache = new StatusCache();
-                statusCache.instance = BaseMainActivity.currentInstance;
-                statusCache.user_id = BaseMainActivity.currentUserID;
-                statusCache.status = status;
-                statusCache.status_id = status.id;
-                //Update cache
-                new Thread(() -> {
-                    try {
-                        new StatusCache(getApplication()).updateIfExists(statusCache);
-                        Handler mainHandler = new Handler(Looper.getMainLooper());
-                        //Update UI
-                        Runnable myRunnable = () -> sendAction(ContextActivity.this, Helper.ARG_STATUS_ACTION, status, null);
-                        mainHandler.post(myRunnable);
-                    } catch (DBException e) {
-                        e.printStackTrace();
-                    }
-                }).start();
-            }
-        });
-    }
-
-
-    @Override
-    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_context, menu);
-        MenuItem itemExpand = menu.findItem(R.id.action_expand);
-        if (expand) {
-            itemExpand.setIcon(R.drawable.ic_baseline_expand_less_24);
-        } else {
-            itemExpand.setIcon(R.drawable.ic_baseline_expand_more_24);
-        }
-        MenuItem itemDisplayCW = menu.findItem(R.id.action_show_cw);
-        if (displayCW) {
-            itemDisplayCW.setIcon(R.drawable.ic_baseline_remove_red_eye_24);
-        } else {
-            itemDisplayCW.setIcon(R.drawable.ic_outline_remove_red_eye_24);
-        }
-        return true;
-    }
-
-    public void setCurrentFragment(FragmentMastodonContext fragmentMastodonContext) {
-        currentFragment = fragmentMastodonContext;
-    }
-
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        } else if (item.getItemId() == R.id.action_expand) {
-            expand = !expand;
-            if (currentFragment != null && currentFragment instanceof FragmentMastodonContext) {
-                ((FragmentMastodonContext) currentFragment).redraw();
-            }
-            invalidateOptionsMenu();
-        } else if (item.getItemId() == R.id.action_show_cw) {
-            displayCW = !displayCW;
-            if (currentFragment != null && currentFragment instanceof FragmentMastodonContext) {
-                ((FragmentMastodonContext) currentFragment).refresh();
-            }
-            invalidateOptionsMenu();
-        }
-        return true;
-    }
-
-}

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

@@ -1,217 +0,0 @@
-package app.fedilab.android.activities;
-/* Copyright 2022 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-
-import static app.fedilab.android.BaseMainActivity.currentAccount;
-
-import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.core.content.ContextCompat;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.app.Pinned;
-import app.fedilab.android.client.entities.app.PinnedTimeline;
-import app.fedilab.android.client.entities.app.StatusDraft;
-import app.fedilab.android.client.entities.app.TagTimeline;
-import app.fedilab.android.client.entities.app.Timeline;
-import app.fedilab.android.databinding.ActivityHashtagBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
-import app.fedilab.android.viewmodel.mastodon.ReorderVM;
-import app.fedilab.android.viewmodel.mastodon.TagVM;
-import es.dmoral.toasty.Toasty;
-
-
-public class HashTagActivity extends BaseActivity {
-
-
-    public static int position;
-    private String tag;
-    private boolean pinnedTag;
-    private boolean followedTag;
-    private TagVM tagVM;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
-        ActivityHashtagBinding binding = ActivityHashtagBinding.inflate(getLayoutInflater());
-
-        setContentView(binding.getRoot());
-        Bundle b = getIntent().getExtras();
-        if (b != null) {
-            tag = b.getString(Helper.ARG_SEARCH_KEYWORD, null);
-        }
-        if (tag == null)
-            finish();
-        pinnedTag = false;
-        followedTag = false;
-        setSupportActionBar(binding.toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        //Remove title
-        if (actionBar != null) {
-            actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
-        }
-        binding.title.setText(tag);
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setDisplayShowHomeEnabled(true);
-        }
-
-        tagVM = new ViewModelProvider(HashTagActivity.this).get(TagVM.class);
-        tagVM.getTag(MainActivity.currentInstance, MainActivity.currentToken, tag).observe(this, returnedTag -> {
-            if (returnedTag != null) {
-                followedTag = returnedTag.following;
-                invalidateOptionsMenu();
-            }
-        });
-        ReorderVM reorderVM = new ViewModelProvider(HashTagActivity.this).get(ReorderVM.class);
-        reorderVM.getAllPinned().observe(HashTagActivity.this, pinned -> {
-            if (pinned != null) {
-                if (pinned.pinnedTimelines != null) {
-                    for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
-                        if (pinnedTimeline.tagTimeline != null) {
-                            if (pinnedTimeline.tagTimeline.name.equalsIgnoreCase(tag)) {
-                                pinnedTag = true;
-                                invalidateOptionsMenu();
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        Bundle bundle = new Bundle();
-        bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TAG);
-        bundle.putString(Helper.ARG_SEARCH_KEYWORD, tag);
-        Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_tags, new FragmentMastodonTimeline(), bundle, null, null);
-        binding.toolbar.setPopupTheme(Helper.popupStyle());
-        binding.compose.setOnClickListener(v -> {
-            Intent intentToot = new Intent(HashTagActivity.this, ComposeActivity.class);
-            StatusDraft statusDraft = new StatusDraft();
-            Status status = new Status();
-            status.text = "#" + tag;
-            List<Status> statuses = new ArrayList<>();
-            statuses.add(status);
-            statusDraft.statusDraftList = statuses;
-            Bundle _b = new Bundle();
-            _b.putSerializable(Helper.ARG_TAG_TIMELINE, statusDraft);
-            intentToot.putExtras(_b);
-            startActivity(intentToot);
-        });
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        } else if (item.getItemId() == R.id.action_add_timeline) {
-            new Thread(() -> {
-                try {
-                    Pinned pinned = new Pinned(HashTagActivity.this).getPinned(currentAccount);
-                    boolean canBeAdded = true;
-                    boolean update = true;
-                    if (pinned == null) {
-                        pinned = new Pinned();
-                        pinned.pinnedTimelines = new ArrayList<>();
-                        update = false;
-                    } else {
-                        for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
-                            if (pinnedTimeline.type == Timeline.TimeLineEnum.TAG) {
-                                if (pinnedTimeline.tagTimeline.name.compareTo(tag.trim()) == 0) {
-                                    canBeAdded = false;
-                                }
-                            }
-                        }
-                    }
-                    if (!canBeAdded) {
-                        Handler mainHandler = new Handler(Looper.getMainLooper());
-                        Runnable myRunnable = () -> Toasty.warning(HashTagActivity.this, getString(R.string.tags_already_stored), Toasty.LENGTH_SHORT).show();
-                        mainHandler.post(myRunnable);
-                        return;
-                    }
-                    PinnedTimeline pinnedTimeline = new PinnedTimeline();
-                    pinnedTimeline.type = Timeline.TimeLineEnum.TAG;
-                    pinnedTimeline.position = pinned.pinnedTimelines.size();
-                    pinnedTimeline.displayed = true;
-                    TagTimeline tagTimeline = new TagTimeline();
-                    tagTimeline.name = tag.trim();
-                    tagTimeline.isNSFW = false;
-                    tagTimeline.isART = false;
-                    pinnedTimeline.tagTimeline = tagTimeline;
-                    pinned.pinnedTimelines.add(pinnedTimeline);
-                    if (update) {
-                        new Pinned(HashTagActivity.this).updatePinned(pinned);
-                    } else {
-                        new Pinned(HashTagActivity.this).insertPinned(pinned);
-                    }
-                    Bundle b = new Bundle();
-                    b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true);
-                    Intent intentBD = new Intent(Helper.BROADCAST_DATA);
-                    intentBD.putExtras(b);
-                    LocalBroadcastManager.getInstance(HashTagActivity.this).sendBroadcast(intentBD);
-                    pinnedTag = true;
-                    invalidateOptionsMenu();
-                } catch (DBException e) {
-                    e.printStackTrace();
-                }
-            }).start();
-        } else if (item.getItemId() == R.id.action_follow_tag) {
-            tagVM.follow(MainActivity.currentInstance, MainActivity.currentToken, tag).observe(this, returnedTag -> {
-                if (returnedTag != null) {
-                    followedTag = returnedTag.following;
-                    invalidateOptionsMenu();
-                }
-            });
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-
-    @Override
-    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_hashtag, menu);
-        MenuItem pin = menu.findItem(R.id.action_add_timeline);
-        MenuItem follow = menu.findItem(R.id.action_follow_tag);
-        if (pinnedTag && pin != null) {
-            pin.setVisible(false);
-        }
-        if (followedTag && follow != null) {
-            follow.setVisible(false);
-        }
-        return super.onCreateOptionsMenu(menu);
-    }
-
-}

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

@@ -1,175 +0,0 @@
-package app.fedilab.android.activities;
-/* Copyright 2022 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.UnderlineSpan;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.preference.PreferenceManager;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.target.CustomTarget;
-import com.bumptech.glide.request.transition.Transition;
-
-import app.fedilab.android.BaseMainActivity;
-import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Instance;
-import app.fedilab.android.databinding.ActivityInstanceBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.InstancesVM;
-
-
-public class InstanceActivity extends BaseActivity {
-
-
-    ActivityInstanceBinding binding;
-    private boolean applyMaxChar = false;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeDialog(this);
-        binding = ActivityInstanceBinding.inflate(getLayoutInflater());
-
-        setContentView(binding.getRoot());
-
-        getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        if (getSupportActionBar() != null)
-            getSupportActionBar().hide();
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(InstanceActivity.this);
-
-
-        final SpannableString contentAbout = new SpannableString(getString(R.string.action_about_instance));
-        contentAbout.setSpan(new UnderlineSpan(), 0, contentAbout.length(), 0);
-        contentAbout.setSpan(new ForegroundColorSpan(ContextCompat.getColor(InstanceActivity.this, R.color.cyanea_accent_reference)), 0, contentAbout.length(),
-                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-        binding.tos.setText(contentAbout);
-
-        final SpannableString contentPrivacy = new SpannableString(getString(R.string.action_privacy_policy));
-        contentPrivacy.setSpan(new UnderlineSpan(), 0, contentPrivacy.length(), 0);
-        contentPrivacy.setSpan(new ForegroundColorSpan(ContextCompat.getColor(InstanceActivity.this, R.color.cyanea_accent_reference)), 0, contentPrivacy.length(),
-                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-        binding.privacy.setText(contentPrivacy);
-
-        binding.tos.setOnClickListener(v -> Helper.openBrowser(InstanceActivity.this, "https://" + MainActivity.currentInstance + "/about"));
-        binding.privacy.setOnClickListener(v -> Helper.openBrowser(InstanceActivity.this, "https://" + MainActivity.currentInstance + "/privacy-policy"));
-        binding.close.setOnClickListener(
-
-                view -> {
-                    if (applyMaxChar) {
-                        String max_char = binding.maxChar.getText().toString();
-
-                        SharedPreferences.Editor editor = sharedpreferences.edit();
-                        if (!max_char.isEmpty()) {
-                            try {
-                                editor.putInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, Integer.parseInt(max_char));
-                                editor.apply();
-                            } catch (Exception ignored) {
-                            }
-                        }
-                    }
-                    finish();
-                }
-
-        );
-
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setDisplayShowHomeEnabled(true);
-        }
-
-        InstancesVM instancesVM = new ViewModelProvider(InstanceActivity.this).get(InstancesVM.class);
-        instancesVM.getInstance(BaseMainActivity.currentInstance).observe(InstanceActivity.this, instanceInfo -> {
-            binding.instanceContainer.setVisibility(View.VISIBLE);
-            binding.loader.setVisibility(View.GONE);
-
-            if (instanceInfo == null || instanceInfo.info == null || instanceInfo.info.description == null) {
-                binding.maxCharContainer.setVisibility(View.VISIBLE);
-                binding.instanceContainer.setVisibility(View.GONE);
-                binding.instanceContact.setVisibility(View.GONE);
-                int val = sharedpreferences.getInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, -1);
-                if (val != -1) {
-                    binding.maxChar.setText(String.valueOf(val));
-                }
-                applyMaxChar = true;
-
-            } else {
-                Instance instance = instanceInfo.info;
-                binding.instanceTitle.setText(instance.title);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                    binding.instanceDescription.setText(Html.fromHtml(instance.description, Html.FROM_HTML_MODE_LEGACY));
-                else
-                    binding.instanceDescription.setText(Html.fromHtml(instance.description));
-                if (instance.description == null || instance.description.trim().length() == 0)
-                    binding.instanceDescription.setText(getString(R.string.instance_no_description));
-                binding.instanceVersion.setText(instance.version);
-                binding.instanceUri.setText(instance.uri);
-                if (instance.email == null) {
-                    binding.instanceContact.hide();
-                }
-                Glide.with(InstanceActivity.this)
-                        .asDrawable()
-                        .load(instance.thumbnail)
-                        .into(new CustomTarget<Drawable>() {
-                            @Override
-                            public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
-                                binding.background.setAlpha(0.2f);
-                                binding.background.setBackground(resource);
-                            }
-
-                            @Override
-                            public void onLoadCleared(@Nullable Drawable placeholder) {
-
-                            }
-                        });
-
-                binding.instanceContact.setOnClickListener(v -> {
-                    Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", instance.email, null));
-                    emailIntent.putExtra(Intent.EXTRA_SUBJECT, "[Mastodon] - " + instance.uri);
-                    startActivity(Intent.createChooser(emailIntent, getString(R.string.send_email)));
-                });
-            }
-        });
-    }
-
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-}

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

@@ -1,114 +0,0 @@
-package app.fedilab.android.activities;
-/* Copyright 2022 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.style.UnderlineSpan;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.core.content.ContextCompat;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.bumptech.glide.Glide;
-
-import app.fedilab.android.BaseMainActivity;
-import app.fedilab.android.R;
-import app.fedilab.android.client.entities.app.InstanceSocial;
-import app.fedilab.android.databinding.ActivityInstanceSocialBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.InstanceSocialVM;
-
-
-public class InstanceHealthActivity extends BaseActivity {
-
-    private ActivityInstanceSocialBinding binding;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeDialog(this);
-        binding = ActivityInstanceSocialBinding.inflate(getLayoutInflater());
-
-        setContentView(binding.getRoot());
-        getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        if (getSupportActionBar() != null)
-            getSupportActionBar().hide();
-
-        binding.close.setOnClickListener(view -> finish());
-
-        SpannableString content = new SpannableString(binding.refInstance.getText().toString());
-        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        binding.refInstance.setText(content);
-        binding.refInstance.setOnClickListener(view -> {
-            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://instances.social"));
-            startActivity(browserIntent);
-        });
-
-        checkInstance();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-
-    private void checkInstance() {
-
-
-        InstanceSocialVM instanceSocialVM = new ViewModelProvider(InstanceHealthActivity.this).get(InstanceSocialVM.class);
-        instanceSocialVM.getInstances(BaseMainActivity.currentInstance.trim()).observe(InstanceHealthActivity.this, instanceSocialList -> {
-            if (instanceSocialList != null && instanceSocialList.instances.size() > 0) {
-                InstanceSocial.Instance instanceSocial = instanceSocialList.instances.get(0);
-                if (instanceSocial.thumbnail != null && !instanceSocial.thumbnail.equals("null"))
-                    Glide.with(InstanceHealthActivity.this)
-                            .asBitmap()
-                            .load(instanceSocial.thumbnail)
-                            .into(binding.backGroundImage);
-                binding.name.setText(instanceSocial.name);
-                if (instanceSocial.up) {
-                    binding.up.setText(R.string.is_up);
-                    binding.up.setTextColor(ContextCompat.getColor(InstanceHealthActivity.this, R.color.green_1));
-                } else {
-                    binding.up.setText(R.string.is_down);
-                    binding.up.setTextColor(ContextCompat.getColor(InstanceHealthActivity.this, R.color.red_1));
-                }
-                binding.uptime.setText(getString(R.string.instance_health_uptime, (instanceSocial.uptime * 100)));
-                if (instanceSocial.checked_at != null)
-                    binding.checkedAt.setText(getString(R.string.instance_health_checkedat, Helper.dateToString(instanceSocial.checked_at)));
-                binding.values.setText(getString(R.string.instance_health_indication, instanceSocial.version, Helper.withSuffix(instanceSocial.active_users), Helper.withSuffix(instanceSocial.statuses)));
-                binding.instanceContainer.setVisibility(View.VISIBLE);
-            } else {
-                binding.instanceContainer.setVisibility(View.VISIBLE);
-                binding.mainContainer.setVisibility(View.GONE);
-                binding.noInstance.setVisibility(View.VISIBLE);
-            }
-            binding.loader.setVisibility(View.GONE);
-        });
-    }
-
-
-}

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

@@ -15,11 +15,15 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import static app.fedilab.android.helper.MastodonHelper.REDIRECT_CONTENT_WEB;
+import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
 
+import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.FrameLayout;
@@ -32,14 +36,18 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Matcher;
 
+import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.app.Account;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.login.FragmentLoginMain;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
-import app.fedilab.android.viewmodel.mastodon.AdminVM;
-import app.fedilab.android.viewmodel.mastodon.OauthVM;
+import app.fedilab.android.mastodon.activities.BaseActivity;
+import app.fedilab.android.mastodon.activities.ProxyActivity;
+import app.fedilab.android.mastodon.client.entities.app.Account;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.OauthVM;
+import app.fedilab.android.ui.fragment.FragmentLoginMain;
 import es.dmoral.toasty.Toasty;
 
 
@@ -48,12 +56,40 @@ public class LoginActivity extends BaseActivity {
 
     public static Account.API apiLogin;
     public static String currentInstanceLogin, client_idLogin, client_secretLogin, softwareLogin;
-    private final int PICK_IMPORT = 5557;
-    private boolean requestedAdmin;
+    public static boolean requestedAdmin;
+
+
+    @SuppressLint("ApplySharedPref")
+    public void proceedLogin(Activity activity, Account account) {
+        new Thread(() -> {
+            try {
+                //update the database
+                new Account(activity).insertOrUpdate(account);
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                BaseMainActivity.currentToken = account.token;
+                BaseMainActivity.currentUserID = account.user_id;
+                BaseMainActivity.api = Account.API.MASTODON;
+                SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                editor.putString(Helper.PREF_USER_TOKEN, account.token);
+                editor.putString(PREF_USER_SOFTWARE, BaseMainActivity.api.name());
+                editor.commit();
+                //The user is now authenticated, it will be redirected to MainActivity
+                Runnable myRunnable = () -> {
+                    Intent mainActivity = new Intent(activity, MainActivity.class);
+                    startActivity(mainActivity);
+                    finish();
+                };
+                mainHandler.post(myRunnable);
+            } catch (DBException e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
 
     private void manageItent(Intent intent) {
 
-        if (intent != null && intent.getData() != null && intent.getData().toString().contains(REDIRECT_CONTENT_WEB + "?code=")) {
+        if (intent != null && intent.getData() != null && intent.getData().toString().contains(MastodonHelper.REDIRECT_CONTENT_WEB + "?code=")) {
             String url = intent.getData().toString();
             Matcher matcher = Helper.codePattern.matcher(url);
             if (!matcher.find()) {
@@ -78,18 +114,23 @@ public class LoginActivity extends BaseActivity {
                             //API call to retrieve account information for the new token
                             AccountsVM accountsVM = new ViewModelProvider(LoginActivity.this).get(AccountsVM.class);
                             accountsVM.getConnectedAccount(currentInstanceLogin, account.token).observe(LoginActivity.this, mastodonAccount -> {
-                                account.mastodon_account = mastodonAccount;
-                                account.user_id = mastodonAccount.id;
-                                //We check if user have really moderator rights
-                                if (requestedAdmin) {
-                                    AdminVM adminVM = new ViewModelProvider(LoginActivity.this).get(AdminVM.class);
-                                    adminVM.getAccount(account.instance, account.token, account.user_id).observe(LoginActivity.this, adminAccount -> {
-                                        account.admin = adminAccount != null;
-                                        WebviewConnectActivity.proceedLogin(LoginActivity.this, account);
-                                    });
+                                if (mastodonAccount != null) {
+                                    account.mastodon_account = mastodonAccount;
+                                    account.user_id = mastodonAccount.id;
+                                    //We check if user have really moderator rights
+                                    if (requestedAdmin) {
+                                        AdminVM adminVM = new ViewModelProvider(LoginActivity.this).get(AdminVM.class);
+                                        adminVM.getAccount(account.instance, account.token, account.user_id).observe(LoginActivity.this, adminAccount -> {
+                                            account.admin = adminAccount != null;
+                                            proceedLogin(LoginActivity.this, account);
+                                        });
+                                    } else {
+                                        proceedLogin(LoginActivity.this, account);
+                                    }
                                 } else {
-                                    WebviewConnectActivity.proceedLogin(LoginActivity.this, account);
+                                    Toasty.error(LoginActivity.this, getString(R.string.toast_token), Toast.LENGTH_LONG).show();
                                 }
+
                             });
                         } else {
                             Toasty.error(LoginActivity.this, getString(R.string.toast_token), Toast.LENGTH_LONG).show();
@@ -99,7 +140,6 @@ public class LoginActivity extends BaseActivity {
         }
     }
 
-
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -109,24 +149,18 @@ public class LoginActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(LoginActivity.this);
         setContentView(new FrameLayout(this));
         FragmentLoginMain fragmentLoginMain = new FragmentLoginMain();
         Helper.addFragment(getSupportFragmentManager(), android.R.id.content, fragmentLoginMain, null, null, null);
-        requestedAdmin = false;
         //The activity handles a redirect URI, it will extract token code and will proceed to authentication
         //That happens when the user wants to use an external browser
         manageItent(getIntent());
+
+
     }
 
-    public boolean requestedAdmin() {
-        return requestedAdmin;
-    }
-
-    public boolean setAdmin(boolean askAdmin) {
-        return requestedAdmin = askAdmin;
-    }
 
     @Override
     protected void onResume() {
@@ -138,9 +172,6 @@ public class LoginActivity extends BaseActivity {
     public boolean onCreateOptionsMenu(@NotNull Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.main_login, menu);
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(LoginActivity.this);
-        boolean embedded_browser = sharedpreferences.getBoolean(getString(R.string.SET_EMBEDDED_BROWSER), true);
-        menu.findItem(R.id.action_custom_tabs).setChecked(!embedded_browser);
         return true;
     }
 
@@ -150,17 +181,8 @@ public class LoginActivity extends BaseActivity {
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
         int id = item.getItemId();
-
         if (id == R.id.action_proxy) {
-            Intent intent = new Intent(LoginActivity.this, ProxyActivity.class);
-            startActivity(intent);
-        } else if (id == R.id.action_custom_tabs) {
-            item.setChecked(!item.isChecked());
-            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(LoginActivity.this);
-            SharedPreferences.Editor editor = sharedpreferences.edit();
-            editor.putBoolean(getString(R.string.SET_EMBEDDED_BROWSER), !item.isChecked());
-            editor.apply();
-            return false;
+            (new ProxyActivity()).show(getSupportFragmentManager(), null);
         } else if (id == R.id.action_request_admin) {
             item.setChecked(!item.isChecked());
             requestedAdmin = item.isChecked();
@@ -169,20 +191,5 @@ public class LoginActivity extends BaseActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode,
-                                    Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == PICK_IMPORT && resultCode == RESULT_OK) {
-            if (data == null || data.getData() == null) {
-                Toasty.error(LoginActivity.this, getString(R.string.toot_select_file_error), Toast.LENGTH_LONG).show();
-                return;
-            }
-            //  String filename = Helper.getFilePathFromURI(LoginActivity.this, data.getData());
-            //   Sqlite.importDB(LoginActivity.this, filename);
-        } else {
-            Toasty.error(LoginActivity.this, getString(R.string.toot_select_file_error), Toast.LENGTH_LONG).show();
-        }
-    }
 
 }

app/src/main/java/app/fedilab/android/activities/SettingsActivity.kt

@@ -1,70 +0,0 @@
-package app.fedilab.android.activities
-/* Copyright 2022 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.appcompat.app.AlertDialog
-import androidx.navigation.findNavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.navigateUp
-import androidx.navigation.ui.setupActionBarWithNavController
-import app.fedilab.android.R
-import app.fedilab.android.databinding.ActivitySettingsBinding
-import app.fedilab.android.helper.Helper
-import app.fedilab.android.helper.ThemeHelper
-import app.fedilab.android.ui.fragment.settings.FragmentThemingSettings
-
-class SettingsActivity : BaseActivity(), FragmentThemingSettings.ActionTheming {
-    private lateinit var binding: ActivitySettingsBinding
-    private lateinit var appBarConfiguration: AppBarConfiguration
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        ThemeHelper.applyThemeBar(this)
-
-        binding = ActivitySettingsBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        val navController = findNavController(R.id.fragment_container)
-        appBarConfiguration = AppBarConfiguration.Builder().build()
-        setupActionBarWithNavController(navController, appBarConfiguration)
-    }
-
-
-    override fun onSupportNavigateUp(): Boolean {
-        val navController = findNavController(R.id.fragment_container)
-        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val navController = findNavController(R.id.fragment_container)
-        if (item.itemId == android.R.id.home && navController.currentDestination?.id == R.id.FragmentSettingsCategories) {
-            finish()
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    override fun restart() {
-        val restartBuilder = AlertDialog.Builder(this, Helper.dialogStyle())
-        restartBuilder.setTitle(getString(R.string.restart_the_app))
-        restartBuilder.setMessage(getString(R.string.restart_the_app_theme))
-        restartBuilder.setNegativeButton(R.string.no) { dialog, which -> dialog.dismiss() }
-        restartBuilder.setPositiveButton(R.string.restart) { dialog, which ->
-            dialog.dismiss()
-            Helper.restart(this)
-        }
-        restartBuilder.create().show()
-    }
-}

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

@@ -1,326 +0,0 @@
-/* Copyright 2021 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-package app.fedilab.android.activities;
-
-
-import static app.fedilab.android.activities.LoginActivity.apiLogin;
-import static app.fedilab.android.activities.LoginActivity.client_idLogin;
-import static app.fedilab.android.activities.LoginActivity.client_secretLogin;
-import static app.fedilab.android.activities.LoginActivity.currentInstanceLogin;
-import static app.fedilab.android.activities.LoginActivity.softwareLogin;
-import static app.fedilab.android.helper.Helper.PREF_USER_TOKEN;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.View;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.preference.PreferenceManager;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.regex.Matcher;
-
-import app.fedilab.android.BaseMainActivity;
-import app.fedilab.android.R;
-import app.fedilab.android.client.entities.app.Account;
-import app.fedilab.android.databinding.ActivityWebviewConnectBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
-import app.fedilab.android.viewmodel.mastodon.AdminVM;
-import app.fedilab.android.viewmodel.mastodon.OauthVM;
-import es.dmoral.toasty.Toasty;
-
-
-public class WebviewConnectActivity extends BaseActivity {
-
-
-    private ActivityWebviewConnectBinding binding;
-    private AlertDialog alert;
-    private String login_url;
-    private boolean requestedAdmin;
-
-
-    @SuppressWarnings("deprecation")
-    public static void clearCookies(Context context) {
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            CookieManager.getInstance().removeAllCookies(null);
-            CookieManager.getInstance().flush();
-        } else {
-            CookieSyncManager cookieSyncMngr = CookieSyncManager.createInstance(context);
-            cookieSyncMngr.startSync();
-            CookieManager cookieManager = CookieManager.getInstance();
-            cookieManager.removeAllCookie();
-            cookieManager.removeSessionCookie();
-            cookieSyncMngr.stopSync();
-            cookieSyncMngr.sync();
-        }
-    }
-
-    @SuppressLint("ApplySharedPref")
-    public static void proceedLogin(Activity activity, Account account) {
-        new Thread(() -> {
-            try {
-                //update the database
-                new Account(activity).insertOrUpdate(account);
-                Handler mainHandler = new Handler(Looper.getMainLooper());
-                BaseMainActivity.currentToken = account.token;
-                BaseMainActivity.currentUserID = account.user_id;
-                BaseMainActivity.api = Account.API.MASTODON;
-                SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-                SharedPreferences.Editor editor = sharedpreferences.edit();
-                editor.putString(PREF_USER_TOKEN, account.token);
-                editor.commit();
-                //The user is now authenticated, it will be redirected to MainActivity
-                Runnable myRunnable = () -> {
-                    Intent mainActivity = new Intent(activity, MainActivity.class);
-                    activity.startActivity(mainActivity);
-                    activity.finish();
-                };
-                mainHandler.post(myRunnable);
-            } catch (DBException e) {
-                e.printStackTrace();
-            }
-        }).start();
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(WebviewConnectActivity.this);
-
-        binding = ActivityWebviewConnectBinding.inflate(getLayoutInflater());
-        View rootView = binding.getRoot();
-        setContentView(rootView);
-
-        Bundle b = getIntent().getExtras();
-        if (b != null) {
-            login_url = b.getString("login_url");
-            requestedAdmin = b.getBoolean("requestedAdmin", false);
-        }
-        if (login_url == null)
-            finish();
-
-        clearCookies(WebviewConnectActivity.this);
-        binding.webviewConnect.getSettings().setJavaScriptEnabled(true);
-        String user_agent = sharedpreferences.getString(getString(R.string.SET_CUSTOM_USER_AGENT), Helper.USER_AGENT);
-        binding.webviewConnect.getSettings().setUserAgentString(user_agent);
-        binding.webviewConnect.getSettings().setDomStorageEnabled(true);
-        CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webviewConnect, true);
-
-
-        final ProgressBar pbar = findViewById(R.id.progress_bar);
-        binding.webviewConnect.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int progress) {
-                if (progress < 100 && pbar.getVisibility() == ProgressBar.GONE) {
-                    pbar.setVisibility(ProgressBar.VISIBLE);
-                }
-                pbar.setProgress(progress);
-                if (progress == 100) {
-                    pbar.setVisibility(ProgressBar.GONE);
-                }
-            }
-        });
-
-        binding.webviewConnect.setWebViewClient(new WebViewClient() {
-
-           /* @Override
-            public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
-                String x_xsrf_token = null;
-                String x_csrf_token = null;
-                if (request.getUrl().toString().contains("accounts/verify_credentials")) {
-
-                    String cookies = CookieManager.getInstance().getCookie(request.getUrl().toString());
-
-                    Map<String, String> requestHeaders = request.getRequestHeaders();
-                    Iterator<Map.Entry<String, String>> it = requestHeaders.entrySet().iterator();
-                    while (it.hasNext()) {
-                        Map.Entry<String, String> pair = it.next();
-                        if (pair.getKey().compareTo("X-XSRF-TOKEN") == 0) {
-                            x_xsrf_token = pair.getValue();
-                        }
-                        if (pair.getKey().compareTo("X-CSRF-TOKEN") == 0) {
-                            x_csrf_token = pair.getValue();
-                        }
-                        it.remove();
-                    }
-                    if (x_xsrf_token != null && x_csrf_token != null) {
-                        String finalX_xsrf_token = x_xsrf_token;
-                        String finalX_csrf_token = x_csrf_token;
-                        new Handler(Looper.getMainLooper()).post(() -> {
-                            view.stopLoading();
-                            SharedPreferences sharedpreferences1 = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                            SharedPreferences.Editor editor = sharedpreferences1.edit();
-                            String token = "X-XSRF-TOKEN= " + finalX_xsrf_token + ";X-CSRF-TOKEN= " + finalX_csrf_token + "|" + cookies;
-                            editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
-                            editor.commit();
-                            view.setVisibility(View.GONE);
-                            //Update the account with the token;
-                            new UpdateAccountInfoAsyncTask(WebviewConnectActivity.this, token, clientId, clientSecret, null, instance, social);
-                        });
-                    }
-                }
-                return super.shouldInterceptRequest(view, request);
-            }*/
-
-
-            public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
-                if (request.getUrl().toString().contains(currentInstanceLogin + "/api/v1")) {
-                    request.getRequestHeaders();
-                    Map<String, String> requestHeaders = request.getRequestHeaders();
-                    Iterator<Map.Entry<String, String>> it = requestHeaders.entrySet().iterator();
-                    String token = null;
-                    while (it.hasNext()) {
-                        Map.Entry<String, String> pair = it.next();
-                        if (pair.getKey().equals("Authorization")) {
-                            token = pair.getValue();
-                            break;
-                        }
-                        it.remove();
-                    }
-                    if (token != null) {
-                        AccountsVM accountsVM = new ViewModelProvider(WebviewConnectActivity.this).get(AccountsVM.class);
-                        String finalToken = token;
-                        Handler mainHandler = new Handler(Looper.getMainLooper());
-                        Runnable myRunnable = () -> {
-                            accountsVM.getConnectedAccount(currentInstanceLogin, finalToken).observe(WebviewConnectActivity.this, mastodonAccount -> {
-                                if (mastodonAccount != null) {
-                                    Account account = new Account();
-                                    account.client_id = client_idLogin;
-                                    account.client_secret = client_secretLogin;
-                                    account.token = finalToken;
-                                    account.api = apiLogin;
-                                    account.software = softwareLogin;
-                                    account.instance = currentInstanceLogin;
-                                    account.mastodon_account = mastodonAccount;
-                                    account.user_id = mastodonAccount.id;
-                                    //We check if user have really moderator rights
-                                    if (requestedAdmin) {
-                                        AdminVM adminVM = new ViewModelProvider(WebviewConnectActivity.this).get(AdminVM.class);
-                                        adminVM.getAccount(account.instance, account.token, account.user_id).observe(WebviewConnectActivity.this, adminAccount -> {
-                                            account.admin = adminAccount != null;
-                                            proceedLogin(WebviewConnectActivity.this, account);
-                                        });
-                                    } else {
-                                        proceedLogin(WebviewConnectActivity.this, account);
-                                    }
-                                } else {
-                                    Toasty.error(WebviewConnectActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
-                                }
-                            });
-                        };
-                        mainHandler.post(myRunnable);
-                    }
-                }
-                return super.shouldInterceptRequest(view, request);
-            }
-
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                super.shouldOverrideUrlLoading(view, url);
-                if (url.contains(Helper.REDIRECT_CONTENT_WEB)) {
-                    Matcher matcher = Helper.codePattern.matcher(url);
-                    if (!matcher.find()) {
-                        return false;
-                    }
-                    String code = matcher.group(1);
-                    OauthVM oauthVM = new ViewModelProvider(WebviewConnectActivity.this).get(OauthVM.class);
-                    //API call to get the user token
-                    String scope = requestedAdmin ? Helper.OAUTH_SCOPES_ADMIN : Helper.OAUTH_SCOPES;
-                    oauthVM.createToken(currentInstanceLogin, "authorization_code", client_idLogin, client_secretLogin, Helper.REDIRECT_CONTENT_WEB, scope, code)
-                            .observe(WebviewConnectActivity.this, tokenObj -> {
-                                if (tokenObj != null) {
-                                    Account account = new Account();
-                                    account.client_id = client_idLogin;
-                                    account.client_secret = client_secretLogin;
-                                    account.token = tokenObj.token_type + " " + tokenObj.access_token;
-                                    account.api = apiLogin;
-                                    account.software = softwareLogin;
-                                    account.instance = currentInstanceLogin;
-                                    //API call to retrieve account information for the new token
-                                    AccountsVM accountsVM = new ViewModelProvider(WebviewConnectActivity.this).get(AccountsVM.class);
-                                    accountsVM.getConnectedAccount(currentInstanceLogin, account.token).observe(WebviewConnectActivity.this, mastodonAccount -> {
-                                        if (mastodonAccount != null) {
-                                            account.mastodon_account = mastodonAccount;
-                                            account.user_id = mastodonAccount.id;
-                                            //We check if user have really moderator rights
-                                            if (requestedAdmin) {
-                                                AdminVM adminVM = new ViewModelProvider(WebviewConnectActivity.this).get(AdminVM.class);
-                                                adminVM.getAccount(account.instance, account.token, account.user_id).observe(WebviewConnectActivity.this, adminAccount -> {
-                                                    account.admin = adminAccount != null;
-                                                    proceedLogin(WebviewConnectActivity.this, account);
-                                                });
-                                            } else {
-                                                proceedLogin(WebviewConnectActivity.this, account);
-                                            }
-                                        } else {
-                                            Toasty.error(WebviewConnectActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
-                                        }
-                                    });
-                                } else {
-                                    Toasty.error(WebviewConnectActivity.this, getString(R.string.toast_token), Toasty.LENGTH_SHORT).show();
-                                }
-                            });
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        });
-
-        binding.webviewConnect.loadUrl(login_url);
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (binding.webviewConnect.canGoBack()) {
-            binding.webviewConnect.goBack();
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (alert != null) {
-            alert.dismiss();
-            alert = null;
-        }
-        binding.webviewConnect.destroy();
-    }
-}

app/src/main/java/app/fedilab/android/client/entities/app/DomainsBlock.java

@@ -1,132 +0,0 @@
-package app.fedilab.android.client.entities.app;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
-import androidx.preference.PreferenceManager;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.sqlite.Sqlite;
-
-
-public class DomainsBlock {
-
-    public static final String LAST_DATE_OF_UPDATE = "LAST_DATE_OF_UPDATE";
-    public static List<String> trackingDomains = null;
-
-    private static void getDomains(Context context) {
-        if (trackingDomains == null) {
-            try {
-                SQLiteDatabase db = Sqlite.getInstance(context.getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                Cursor c = db.query(Sqlite.TABLE_DOMAINS_TRACKING, null, null, null, null, null, null, null);
-                trackingDomains = cursorToDomain(c);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static void updateDomains(Context _mContext) {
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(_mContext);
-        String last_date = sharedpreferences.getString(LAST_DATE_OF_UPDATE, null);
-        Date dateUpdate = new Date(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(10));
-        Date dateLastUpdate = Helper.stringToDate(_mContext, last_date);
-        SQLiteDatabase db = Sqlite.getInstance(_mContext.getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-        if (last_date == null || dateUpdate.after(dateLastUpdate)) {
-            new Thread(() -> {
-                try {
-                    HttpsURLConnection connection = (HttpsURLConnection) new URL("https://hosts.fedilab.app/hosts").openConnection();
-                    if (connection.getResponseCode() > HttpsURLConnection.HTTP_MOVED_TEMP) {
-                        return;
-                    }
-                    BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-                    String line;
-                    List<String> domains = new ArrayList<>();
-                    while ((line = br.readLine()) != null) {
-                        if (line.startsWith("0.0.0.0 ")) {
-                            try {
-                                domains.add(line.replace("0.0.0.0 ", "").trim());
-                            } catch (Exception e) {
-                                return;
-                            }
-
-                        }
-                    }
-                    br.close();
-                    connection.disconnect();
-                    insertDomains(db, domains);
-                    SharedPreferences.Editor editor = sharedpreferences.edit();
-                    editor.putString(LAST_DATE_OF_UPDATE, Helper.dateToString(new Date()));
-                    editor.apply();
-                } catch (IOException | DBException e) {
-                    e.printStackTrace();
-                }
-            }).start();
-        } else {
-            getDomains(_mContext);
-        }
-    }
-
-    /**
-     * Insert a domains in db
-     *
-     * @param domains {@link List<String>}
-     * @throws DBException exception with database
-     */
-    private static void insertDomains(SQLiteDatabase db, List<String> domains) throws DBException {
-
-        if (db == null) {
-            throw new DBException("db is null. Wrong initialization.");
-        }
-        db.delete(Sqlite.TABLE_DOMAINS_TRACKING, null, null);
-        DomainsBlock.trackingDomains = new ArrayList<>();
-        for (String domain : domains) {
-            ContentValues values = new ContentValues();
-            values.put(Sqlite.COL_DOMAIN, domain);
-            //Inserts token
-            try {
-                db.insertOrThrow(Sqlite.TABLE_DOMAINS_TRACKING, null, values);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            DomainsBlock.trackingDomains.add(domain);
-        }
-    }
-
-
-    /***
-     * Method to hydrate domain from database
-     * @param c Cursor
-     * @return List<String>
-     */
-    private static List<String> cursorToDomain(Cursor c) {
-        //No element found
-        if (c.getCount() == 0) {
-            c.close();
-            return null;
-        }
-        List<String> domains = new ArrayList<>();
-        while (c.moveToNext()) {
-            domains.add(c.getString(c.getColumnIndexOrThrow(Sqlite.COL_DOMAIN)));
-        }
-        //Close the cursor
-        c.close();
-        //domains list is returned
-        return domains;
-    }
-}

app/src/main/java/app/fedilab/android/helper/SettingsStorage.java

@@ -1,134 +0,0 @@
-package app.fedilab.android.helper;
-/* Copyright 2022 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import static app.fedilab.android.BaseMainActivity.currentAccount;
-import static app.fedilab.android.helper.LogoHelper.getMainLogo;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.Environment;
-
-import androidx.preference.PreferenceManager;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Date;
-import java.util.Map;
-
-import app.fedilab.android.R;
-
-
-//From https://stackoverflow.com/a/10864463
-
-public class SettingsStorage {
-
-
-    public static boolean saveSharedPreferencesToFile(Context context) {
-        boolean res = false;
-        ObjectOutputStream output = null;
-        String fileName = "Fedilab_settings_export_" + Helper.dateFileToString(context, new Date()) + ".txt";
-        String filePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
-        String fullPath = filePath + "/" + fileName;
-        File dst = new File(fullPath);
-        try {
-            output = new ObjectOutputStream(new FileOutputStream(dst));
-            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
-            output.writeObject(sharedpreferences.getAll());
-            res = true;
-            String message = context.getString(R.string.data_export_settings_success);
-            Intent intentOpen = new Intent();
-            intentOpen.setAction(android.content.Intent.ACTION_VIEW);
-            Uri uri = Uri.parse("file://" + fullPath);
-            intentOpen.setDataAndType(uri, "text/txt");
-            String title = context.getString(R.string.data_export_settings);
-            Helper.notify_user(context, currentAccount, intentOpen, BitmapFactory.decodeResource(context.getResources(),
-                    getMainLogo(context)), Helper.NotifType.BACKUP, title, message);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (output != null) {
-                    output.flush();
-                    output.close();
-                }
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            }
-        }
-        return res;
-    }
-
-    @SuppressLint("ApplySharedPref")
-    @SuppressWarnings({"unchecked", "UnnecessaryUnboxing"})
-    public static boolean loadSharedPreferencesFromFile(Context context, Uri srcUri) {
-        boolean res = false;
-        ObjectInputStream input = null;
-        try {
-            input = new ObjectInputStream(context.getContentResolver().openInputStream(srcUri));
-            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
-            SharedPreferences.Editor prefEdit = sharedpreferences.edit();
-            prefEdit.clear();
-            Map<String, ?> entries = (Map<String, ?>) input.readObject();
-            for (Map.Entry<String, ?> entry : entries.entrySet()) {
-                Object v = entry.getValue();
-                String key = entry.getKey();
-                //We skip some values
-                if (key.compareTo(Helper.PREF_USER_ID) == 0) {
-                    continue;
-                }
-                if (key.compareTo(Helper.PREF_INSTANCE) == 0) {
-                    continue;
-                }
-                if (key.compareTo(Helper.PREF_USER_INSTANCE) == 0) {
-                    continue;
-                }
-                if (key.compareTo(Helper.PREF_USER_TOKEN) == 0) {
-                    continue;
-                }
-                if (v instanceof Boolean)
-                    prefEdit.putBoolean(key, ((Boolean) v).booleanValue());
-                else if (v instanceof Float)
-                    prefEdit.putFloat(key, ((Float) v).floatValue());
-                else if (v instanceof Integer)
-                    prefEdit.putInt(key, ((Integer) v).intValue());
-                else if (v instanceof Long)
-                    prefEdit.putLong(key, ((Long) v).longValue());
-                else if (v instanceof String)
-                    prefEdit.putString(key, ((String) v));
-            }
-            prefEdit.commit();
-            res = true;
-        } catch (IOException | ClassNotFoundException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (input != null) {
-                    input.close();
-                }
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            }
-        }
-        return res;
-    }
-}

app/src/main/java/app/fedilab/android/helper/SpannableHelper.java

@@ -1,973 +0,0 @@
-package app.fedilab.android.helper;
-/* Copyright 2021 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-
-import static app.fedilab.android.BaseMainActivity.currentAccount;
-import static app.fedilab.android.helper.Helper.USER_AGENT;
-import static app.fedilab.android.helper.ThemeHelper.linkColor;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextPaint;
-import android.text.style.ClickableSpan;
-import android.text.style.QuoteSpan;
-import android.text.style.URLSpan;
-import android.util.Patterns;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.webkit.URLUtil;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
-import androidx.preference.PreferenceManager;
-
-import com.bumptech.glide.Glide;
-
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import app.fedilab.android.R;
-import app.fedilab.android.activities.ContextActivity;
-import app.fedilab.android.activities.HashTagActivity;
-import app.fedilab.android.activities.ProfileActivity;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Announcement;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.Emoji;
-import app.fedilab.android.client.entities.api.Mention;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.databinding.PopupLinksBinding;
-import es.dmoral.toasty.Toasty;
-
-public class SpannableHelper {
-
-    public static final String CLICKABLE_SPAN = "CLICKABLE_SPAN";
-
-    public static Spannable convert(Context context, String text,
-                                    Status status, Account account, Announcement announcement,
-                                    boolean convertHtml,
-                                    WeakReference<View> viewWeakReference) {
-
-
-        SpannableString initialContent;
-        if (text == null) {
-            return null;
-        }
-        text = text.replaceAll("((<\\s?p\\s?>|<\\s?br\\s?\\/?>)&gt;(((?!([<])).)*))", "$2<blockquote>$3</blockquote>");
-        Pattern imgPattern = Pattern.compile("<img [^>]*src=\"([^\"]+)\"[^>]*>");
-        Matcher matcherImg = imgPattern.matcher(text);
-        HashMap<String, String> imagesToReplace = new LinkedHashMap<>();
-        int inc = 0;
-        while (matcherImg.find()) {
-            String replacement = "[FEDI_IMG_" + inc + "]";
-            imagesToReplace.put(replacement, matcherImg.group(1));
-            inc++;
-            text = text.replaceAll(Pattern.quote(matcherImg.group()), replacement);
-        }
-
-        SpannableStringBuilder content;
-        View view = viewWeakReference.get();
-        List<Mention> mentionList = null;
-        List<Emoji> emojiList = null;
-        if (status != null) {
-            mentionList = status.mentions;
-            emojiList = status.emojis;
-        } else if (account != null) {
-            emojiList = account.emojis;
-        } else if (announcement != null) {
-            emojiList = announcement.emojis;
-        }
-        HashMap<String, String> urlDetails = new HashMap<>();
-        if (convertHtml) {
-            Matcher matcherALink = Helper.aLink.matcher(text);
-
-            //We stock details
-            while (matcherALink.find()) {
-                String urlText = matcherALink.group(3);
-                String url = matcherALink.group(2);
-                if (urlText != null && urlText.startsWith(">")) {
-                    urlText = urlText.substring(1);
-                }
-                if (url != null && urlText != null && !url.equals(urlText) && !urlText.contains("<span")) {
-                    urlDetails.put(url, urlText);
-                }
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                initialContent = new SpannableString(Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY));
-            else
-                initialContent = new SpannableString(Html.fromHtml(text));
-
-            content = new SpannableStringBuilder(initialContent);
-            URLSpan[] urls = content.getSpans(0, (content.length() - 1), URLSpan.class);
-            for (URLSpan span : urls) {
-                content.removeSpan(span);
-            }
-            //Make tags, mentions, groups
-            interaction(context, content, mentionList);
-            //Make all links
-            linkify(context, content, urlDetails);
-            linkifyURL(context, content, urlDetails);
-            emails(context, content);
-            gemini(context, content);
-            replaceQuoteSpans(context, content);
-        } else {
-            content = new SpannableStringBuilder(text);
-        }
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean animate = !sharedpreferences.getBoolean(context.getString(R.string.SET_DISABLE_ANIMATED_EMOJI), false);
-        if (emojiList != null && emojiList.size() > 0) {
-            for (Emoji emoji : emojiList) {
-                Matcher matcher = Pattern.compile(":" + emoji.shortcode + ":", Pattern.LITERAL)
-                        .matcher(content);
-                while (matcher.find()) {
-                    CustomEmoji customEmoji = new CustomEmoji(new WeakReference<>(view));
-                    content.setSpan(customEmoji, matcher.start(), matcher.end(), 0);
-                    Glide.with(view)
-                            .asDrawable()
-                            .load(animate ? emoji.url : emoji.static_url)
-                            .into(customEmoji.getTarget(animate));
-                }
-            }
-        }
-
-        if (imagesToReplace.size() > 0) {
-            for (Map.Entry<String, String> entry : imagesToReplace.entrySet()) {
-                String key = entry.getKey();
-                String url = entry.getValue();
-                Matcher matcher = Pattern.compile(key, Pattern.LITERAL)
-                        .matcher(content);
-                while (matcher.find()) {
-                    CustomEmoji customEmoji = new CustomEmoji(new WeakReference<>(view));
-                    content.setSpan(customEmoji, matcher.start(), matcher.end(), 0);
-                    Glide.with(view)
-                            .asDrawable()
-                            .load(url)
-                            .into(customEmoji.getTarget(animate));
-                }
-            }
-
-        }
-        return trimSpannable(new SpannableStringBuilder(content));
-    }
-
-    private static void linkify(Context context, SpannableStringBuilder content, HashMap<String, String> urlDetails) {
-        //--- URLs ----
-        Matcher matcherLink = Patterns.WEB_URL.matcher(content);
-
-        int offSetTruncate = 0;
-
-
-        while (matcherLink.find()) {
-            int matchStart = matcherLink.start() - offSetTruncate;
-            int matchEnd = matchStart + matcherLink.group().length();
-            if (matchEnd > content.toString().length()) {
-                matchEnd = content.toString().length();
-            }
-
-            if (content.toString().length() < matchEnd || matchStart < 0 || matchStart > matchEnd) {
-                continue;
-            }
-
-
-            final String url = content.toString().substring(matchStart, matchEnd);
-            String newURL = Helper.transformURL(context, url);
-            //If URL has been transformed
-            if (newURL.compareTo(url) != 0) {
-                content.replace(matchStart, matchEnd, newURL);
-                offSetTruncate -= (newURL.length() - url.length());
-                matchEnd = matchStart + newURL.length();
-                //The transformed URL was in the list of URLs having a different names
-                if (urlDetails.containsKey(url)) {
-                    urlDetails.put(newURL, urlDetails.get(url));
-                }
-            }
-
-            //Truncate URL if needed
-            //TODO: add an option to disable truncated URLs
-            String urlText = newURL;
-            if (newURL.length() > 30 && !urlDetails.containsKey(urlText)) {
-                urlText = urlText.substring(0, 30);
-                urlText += "…";
-                content.replace(matchStart, matchEnd, urlText);
-                matchEnd = matchStart + 31;
-                offSetTruncate += (newURL.length() - urlText.length());
-            } /*else if (urlDetails.containsKey(urlText) && urlDetails.get(urlText) != null) {
-                urlText = urlDetails.get(urlText);
-                if (urlText != null) {
-                    content.replace(matchStart, matchEnd, urlText);
-                    matchEnd = matchStart + urlText.length();
-                    offSetTruncate += (newURL.length() - urlText.length());
-                }
-            }*/
-
-
-            if (matchEnd <= content.length() && matchEnd >= matchStart) {
-                content.setSpan(new LongClickableSpan() {
-                    @Override
-                    public void onLongClick(View view) {
-                        Context mContext = view.getContext();
-                        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(mContext, Helper.dialogStyle());
-                        PopupLinksBinding popupLinksBinding = PopupLinksBinding.inflate(LayoutInflater.from(context));
-                        dialogBuilder.setView(popupLinksBinding.getRoot());
-                        AlertDialog alertDialog = dialogBuilder.create();
-                        alertDialog.show();
-                        String finalURl = newURL;
-                        String uniqueUrl = newURL.endsWith("…") ? newURL : newURL + "…";
-                        if (urlDetails.containsValue(uniqueUrl)) {
-                            finalURl = Helper.getKeyByValue(urlDetails, uniqueUrl);
-                        }
-                        if (finalURl == null) {
-                            return;
-                        }
-                        if (finalURl.startsWith("http://")) {
-                            finalURl = finalURl.replace("http://", "https://");
-                        }
-                        String finalURl1 = finalURl;
-                        popupLinksBinding.displayFullLink.setOnClickListener(v -> {
-                            AlertDialog.Builder builder = new AlertDialog.Builder(mContext, Helper.dialogStyle());
-                            builder.setMessage(finalURl1);
-                            builder.setTitle(context.getString(R.string.display_full_link));
-                            builder.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
-                                    .show();
-                            alertDialog.dismiss();
-                        });
-                        popupLinksBinding.shareLink.setOnClickListener(v -> {
-                            Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                            sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
-                            sendIntent.putExtra(Intent.EXTRA_TEXT, finalURl1);
-                            sendIntent.setType("text/plain");
-                            sendIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            Intent intentChooser = Intent.createChooser(sendIntent, context.getString(R.string.share_with));
-                            intentChooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            context.startActivity(intentChooser);
-                            alertDialog.dismiss();
-                        });
-
-                        popupLinksBinding.openOtherApp.setOnClickListener(v -> {
-                            Intent intent = new Intent(Intent.ACTION_VIEW);
-                            intent.setData(Uri.parse(finalURl1));
-                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                            try {
-                                context.startActivity(intent);
-                            } catch (Exception e) {
-                                Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                            }
-                            alertDialog.dismiss();
-                        });
-
-                        popupLinksBinding.copyLink.setOnClickListener(v -> {
-                            ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-                            ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, finalURl1);
-                            if (clipboard != null) {
-                                clipboard.setPrimaryClip(clip);
-                                Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
-                            }
-                            alertDialog.dismiss();
-                        });
-
-                        popupLinksBinding.checkRedirect.setOnClickListener(v -> {
-                            try {
-
-                                URL finalUrlCheck = new URL(finalURl1);
-                                new Thread(() -> {
-                                    try {
-                                        String redirect = null;
-                                        HttpsURLConnection httpsURLConnection = (HttpsURLConnection) finalUrlCheck.openConnection();
-                                        httpsURLConnection.setConnectTimeout(10 * 1000);
-                                        httpsURLConnection.setRequestProperty("http.keepAlive", "false");
-                                        httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
-                                        httpsURLConnection.setRequestMethod("HEAD");
-                                        httpsURLConnection.setInstanceFollowRedirects(false);
-                                        if (httpsURLConnection.getResponseCode() == 301 || httpsURLConnection.getResponseCode() == 302) {
-                                            Map<String, List<String>> map = httpsURLConnection.getHeaderFields();
-                                            for (Map.Entry<String, List<String>> entry : map.entrySet()) {
-                                                if (entry.toString().toLowerCase().startsWith("location")) {
-                                                    Matcher matcher = Patterns.WEB_URL.matcher(entry.toString());
-                                                    if (matcher.find()) {
-                                                        redirect = matcher.group(1);
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        httpsURLConnection.getInputStream().close();
-                                        if (redirect != null && finalURl1 != null && redirect.compareTo(finalURl1) != 0) {
-                                            URL redirectURL = new URL(redirect);
-                                            String host = redirectURL.getHost();
-                                            String protocol = redirectURL.getProtocol();
-                                            if (protocol == null || host == null) {
-                                                redirect = null;
-                                            }
-                                        }
-                                        Handler mainHandler = new Handler(context.getMainLooper());
-                                        String finalRedirect = redirect;
-                                        Runnable myRunnable = () -> {
-                                            AlertDialog.Builder builder1 = new AlertDialog.Builder(view.getContext(), Helper.dialogStyle());
-                                            if (finalRedirect != null) {
-                                                builder1.setMessage(context.getString(R.string.redirect_detected, finalURl1, finalRedirect));
-                                                builder1.setNegativeButton(R.string.copy_link, (dialog, which) -> {
-                                                    ClipboardManager clipboard1 = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-                                                    ClipData clip1 = ClipData.newPlainText(Helper.CLIP_BOARD, finalRedirect);
-                                                    if (clipboard1 != null) {
-                                                        clipboard1.setPrimaryClip(clip1);
-                                                        Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
-                                                    }
-                                                    dialog.dismiss();
-                                                });
-                                                builder1.setNeutralButton(R.string.share_link, (dialog, which) -> {
-                                                    Intent sendIntent1 = new Intent(Intent.ACTION_SEND);
-                                                    sendIntent1.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
-                                                    sendIntent1.putExtra(Intent.EXTRA_TEXT, finalURl1);
-                                                    sendIntent1.setType("text/plain");
-                                                    context.startActivity(Intent.createChooser(sendIntent1, context.getString(R.string.share_with)));
-                                                    dialog.dismiss();
-                                                });
-                                            } else {
-                                                builder1.setMessage(R.string.no_redirect);
-                                            }
-                                            builder1.setTitle(context.getString(R.string.check_redirect));
-                                            builder1.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
-                                                    .show();
-
-                                        };
-                                        mainHandler.post(myRunnable);
-                                    } catch (IOException e) {
-                                        e.printStackTrace();
-                                    }
-
-                                }).start();
-                            } catch (MalformedURLException e) {
-                                e.printStackTrace();
-                            }
-
-                            alertDialog.dismiss();
-                        });
-
-                    }
-
-                    @Override
-                    public void onClick(@NonNull View textView) {
-                        String finalURl = newURL;
-                        String finalURl2 = url;
-                        String uniqueNewURL = newURL.endsWith("…") ? newURL : newURL + "…";
-                        if (urlDetails.containsValue(uniqueNewURL)) {
-                            finalURl = Helper.getKeyByValue(urlDetails, uniqueNewURL);
-                        }
-                        String uniqueUrl = url.endsWith("…") ? url : url + "…";
-                        if (urlDetails.containsValue(uniqueUrl)) {
-                            finalURl2 = Helper.getKeyByValue(urlDetails, uniqueUrl);
-                        }
-                        textView.setTag(CLICKABLE_SPAN);
-                        Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
-                        Matcher matcherLink = null;
-                        if (finalURl2 != null) {
-                            matcherLink = link.matcher(finalURl2);
-                        }
-                        if (finalURl2 != null && matcherLink.find() && !finalURl2.contains("medium.com")) {
-                            if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
-                                CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalURl2, new CrossActionHelper.Callback() {
-                                    @Override
-                                    public void federatedStatus(Status status) {
-                                        Intent intent = new Intent(context, ContextActivity.class);
-                                        intent.putExtra(Helper.ARG_STATUS, status);
-                                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                        context.startActivity(intent);
-                                    }
-
-                                    @Override
-                                    public void federatedAccount(Account account) {
-                                    }
-                                });
-                            } else {//It's an account
-                                CrossActionHelper.fetchRemoteAccount(context, currentAccount, matcherLink.group(2) + "@" + matcherLink.group(1), new CrossActionHelper.Callback() {
-                                    @Override
-                                    public void federatedStatus(Status status) {
-                                    }
-
-                                    @Override
-                                    public void federatedAccount(Account account) {
-                                        Intent intent = new Intent(context, ProfileActivity.class);
-                                        Bundle b = new Bundle();
-                                        b.putSerializable(Helper.ARG_ACCOUNT, account);
-                                        intent.putExtras(b);
-                                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                        context.startActivity(intent);
-                                    }
-                                });
-                            }
-                        } else {
-                            Helper.openBrowser(context, finalURl);
-                        }
-
-                    }
-
-                    @Override
-                    public void updateDrawState(@NonNull TextPaint ds) {
-                        super.updateDrawState(ds);
-                        ds.setUnderlineText(false);
-                        ds.setColor(linkColor);
-                    }
-                }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-            }
-        }
-    }
-
-    private static void linkifyURL(Context context, SpannableStringBuilder content, HashMap<String, String> urlDetails) {
-
-        for (Map.Entry<String, String> entry : urlDetails.entrySet()) {
-            String value = entry.getValue();
-            if (value.startsWith("@") || value.startsWith("#") || !URLUtil.isValidUrl(value)) {
-                continue;
-            }
-            SpannableString contentUrl;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                contentUrl = new SpannableString(Html.fromHtml(value, Html.FROM_HTML_MODE_LEGACY));
-            else
-                contentUrl = new SpannableString(Html.fromHtml(value));
-
-            Pattern word = Pattern.compile(contentUrl.toString());
-            Matcher matcherLink = word.matcher(content);
-            while (matcherLink.find()) {
-                String url = entry.getKey();
-                int matchStart = matcherLink.start();
-                int matchEnd = matchStart + matcherLink.group().length();
-                if (matchEnd > content.toString().length()) {
-                    matchEnd = content.toString().length();
-                }
-
-                if (content.toString().length() < matchEnd || matchStart < 0 || matchStart > matchEnd) {
-                    continue;
-                }
-                if (matchEnd <= content.length()) {
-                    content.setSpan(new LongClickableSpan() {
-                        @Override
-                        public void onLongClick(View view) {
-                            Context mContext = view.getContext();
-                            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(mContext, Helper.dialogStyle());
-                            PopupLinksBinding popupLinksBinding = PopupLinksBinding.inflate(LayoutInflater.from(context));
-                            dialogBuilder.setView(popupLinksBinding.getRoot());
-                            AlertDialog alertDialog = dialogBuilder.create();
-                            alertDialog.show();
-                            String finalURl = url;
-                            if (urlDetails.containsValue(url)) {
-                                finalURl = Helper.getKeyByValue(urlDetails, url);
-                            }
-                            String finalURl1 = finalURl;
-                            popupLinksBinding.displayFullLink.setOnClickListener(v -> {
-                                AlertDialog.Builder builder = new AlertDialog.Builder(mContext, Helper.dialogStyle());
-                                builder.setMessage(finalURl1);
-                                builder.setTitle(context.getString(R.string.display_full_link));
-                                builder.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
-                                        .show();
-                                alertDialog.dismiss();
-                            });
-                            popupLinksBinding.shareLink.setOnClickListener(v -> {
-                                Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                                sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
-                                sendIntent.putExtra(Intent.EXTRA_TEXT, finalURl1);
-                                sendIntent.setType("text/plain");
-                                sendIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                Intent intentChooser = Intent.createChooser(sendIntent, context.getString(R.string.share_with));
-                                intentChooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                context.startActivity(intentChooser);
-                                alertDialog.dismiss();
-                            });
-
-                            popupLinksBinding.openOtherApp.setOnClickListener(v -> {
-                                Intent intent = new Intent(Intent.ACTION_VIEW);
-                                intent.setData(Uri.parse(finalURl1));
-                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                try {
-                                    context.startActivity(intent);
-                                } catch (Exception e) {
-                                    Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                                }
-                                alertDialog.dismiss();
-                            });
-
-                            popupLinksBinding.copyLink.setOnClickListener(v -> {
-                                ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-                                ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, finalURl1);
-                                if (clipboard != null) {
-                                    clipboard.setPrimaryClip(clip);
-                                    Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
-                                }
-                                alertDialog.dismiss();
-                            });
-
-                            popupLinksBinding.checkRedirect.setOnClickListener(v -> {
-                                try {
-
-                                    URL finalUrlCheck = new URL(finalURl1);
-                                    new Thread(() -> {
-                                        try {
-                                            String redirect = null;
-                                            HttpsURLConnection httpsURLConnection = (HttpsURLConnection) finalUrlCheck.openConnection();
-                                            httpsURLConnection.setConnectTimeout(10 * 1000);
-                                            httpsURLConnection.setRequestProperty("http.keepAlive", "false");
-                                            httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
-                                            httpsURLConnection.setRequestMethod("HEAD");
-                                            httpsURLConnection.setInstanceFollowRedirects(false);
-                                            if (httpsURLConnection.getResponseCode() == 301 || httpsURLConnection.getResponseCode() == 302) {
-                                                Map<String, List<String>> map = httpsURLConnection.getHeaderFields();
-                                                for (Map.Entry<String, List<String>> entry : map.entrySet()) {
-                                                    if (entry.toString().toLowerCase().startsWith("location")) {
-                                                        Matcher matcher = Patterns.WEB_URL.matcher(entry.toString());
-                                                        if (matcher.find()) {
-                                                            redirect = matcher.group(1);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                            httpsURLConnection.getInputStream().close();
-                                            if (redirect != null && finalURl1 != null && redirect.compareTo(finalURl1) != 0) {
-                                                URL redirectURL = new URL(redirect);
-                                                String host = redirectURL.getHost();
-                                                String protocol = redirectURL.getProtocol();
-                                                if (protocol == null || host == null) {
-                                                    redirect = null;
-                                                }
-                                            }
-                                            Handler mainHandler = new Handler(context.getMainLooper());
-                                            String finalRedirect = redirect;
-                                            Runnable myRunnable = () -> {
-                                                AlertDialog.Builder builder1 = new AlertDialog.Builder(view.getContext(), Helper.dialogStyle());
-                                                if (finalRedirect != null) {
-                                                    builder1.setMessage(context.getString(R.string.redirect_detected, finalURl1, finalRedirect));
-                                                    builder1.setNegativeButton(R.string.copy_link, (dialog, which) -> {
-                                                        ClipboardManager clipboard1 = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-                                                        ClipData clip1 = ClipData.newPlainText(Helper.CLIP_BOARD, finalRedirect);
-                                                        if (clipboard1 != null) {
-                                                            clipboard1.setPrimaryClip(clip1);
-                                                            Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
-                                                        }
-                                                        dialog.dismiss();
-                                                    });
-                                                    builder1.setNeutralButton(R.string.share_link, (dialog, which) -> {
-                                                        Intent sendIntent1 = new Intent(Intent.ACTION_SEND);
-                                                        sendIntent1.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
-                                                        sendIntent1.putExtra(Intent.EXTRA_TEXT, finalURl1);
-                                                        sendIntent1.setType("text/plain");
-                                                        context.startActivity(Intent.createChooser(sendIntent1, context.getString(R.string.share_with)));
-                                                        dialog.dismiss();
-                                                    });
-                                                } else {
-                                                    builder1.setMessage(R.string.no_redirect);
-                                                }
-                                                builder1.setTitle(context.getString(R.string.check_redirect));
-                                                builder1.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss())
-                                                        .show();
-
-                                            };
-                                            mainHandler.post(myRunnable);
-                                        } catch (IOException e) {
-                                            e.printStackTrace();
-                                        }
-
-                                    }).start();
-                                } catch (MalformedURLException e) {
-                                    e.printStackTrace();
-                                }
-
-                                alertDialog.dismiss();
-                            });
-
-                        }
-
-                        @Override
-                        public void onClick(@NonNull View textView) {
-                            String finalURl = url;
-                            if (urlDetails.containsValue(url)) {
-                                finalURl = Helper.getKeyByValue(urlDetails, url);
-                            }
-
-                            textView.setTag(CLICKABLE_SPAN);
-                            Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
-                            Matcher matcherLink = null;
-                            if (finalURl != null) {
-                                matcherLink = link.matcher(finalURl);
-                            }
-                            if (finalURl != null && matcherLink.find() && !finalURl.contains("medium.com")) {
-                                if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
-                                    CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalURl, new CrossActionHelper.Callback() {
-                                        @Override
-                                        public void federatedStatus(Status status) {
-                                            Intent intent = new Intent(context, ContextActivity.class);
-                                            intent.putExtra(Helper.ARG_STATUS, status);
-                                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                            context.startActivity(intent);
-                                        }
-
-                                        @Override
-                                        public void federatedAccount(Account account) {
-                                        }
-                                    });
-                                } else {//It's an account
-                                    CrossActionHelper.fetchRemoteAccount(context, currentAccount, matcherLink.group(2) + "@" + matcherLink.group(1), new CrossActionHelper.Callback() {
-                                        @Override
-                                        public void federatedStatus(Status status) {
-                                        }
-
-                                        @Override
-                                        public void federatedAccount(Account account) {
-                                            Intent intent = new Intent(context, ProfileActivity.class);
-                                            Bundle b = new Bundle();
-                                            b.putSerializable(Helper.ARG_ACCOUNT, account);
-                                            intent.putExtras(b);
-                                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                            context.startActivity(intent);
-                                        }
-                                    });
-                                }
-                            } else {
-                                Helper.openBrowser(context, finalURl);
-                            }
-
-                        }
-
-                        @Override
-                        public void updateDrawState(@NonNull TextPaint ds) {
-                            super.updateDrawState(ds);
-                            ds.setUnderlineText(false);
-                            ds.setColor(linkColor);
-                        }
-                    }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-                }
-            }
-        }
-    }
-
-    private static void gemini(Context context, Spannable content) {
-        // --- For all patterns defined in Helper class ---
-        Pattern pattern = Helper.geminiPattern;
-        Matcher matcher = pattern.matcher(content);
-        while (matcher.find()) {
-            int matchStart = matcher.start();
-            int matchEnd = matcher.end();
-            String geminiLink = content.toString().substring(matchStart, matchEnd);
-            if (matchStart >= 0 && matchEnd <= content.toString().length() && matchEnd >= matchStart) {
-                ClickableSpan[] clickableSpans = content.getSpans(matchStart, matchEnd, ClickableSpan.class);
-                if (clickableSpans != null) {
-                    for (ClickableSpan clickableSpan : clickableSpans) {
-                        content.removeSpan(clickableSpan);
-                    }
-                }
-                content.removeSpan(clickableSpans);
-                content.setSpan(new ClickableSpan() {
-                    @Override
-                    public void onClick(@NonNull View textView) {
-                        Helper.openBrowser(context, geminiLink);
-                    }
-
-                    @Override
-                    public void updateDrawState(@NonNull TextPaint ds) {
-                        super.updateDrawState(ds);
-                        ds.setUnderlineText(false);
-                        ds.setColor(linkColor);
-                    }
-                }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-            }
-        }
-    }
-
-    private static void emails(Context context, Spannable content) {
-        // --- For all patterns defined in Helper class ---
-        Pattern pattern = Helper.emailPattern;
-        Matcher matcher = pattern.matcher(content);
-
-        while (matcher.find()) {
-            int matchStart = matcher.start();
-            int matchEnd = matcher.end();
-            String email = content.toString().substring(matchStart, matchEnd);
-            if (matchStart >= 0 && matchEnd <= content.toString().length() && matchEnd >= matchStart) {
-                ClickableSpan[] clickableSpans = content.getSpans(matchStart, matchEnd, ClickableSpan.class);
-                if (clickableSpans != null) {
-                    for (ClickableSpan clickableSpan : clickableSpans) {
-                        content.removeSpan(clickableSpan);
-                    }
-                }
-                content.removeSpan(clickableSpans);
-                content.setSpan(new ClickableSpan() {
-                    @Override
-                    public void onClick(@NonNull View textView) {
-                        Intent intent = new Intent(Intent.ACTION_SEND);
-                        intent.setType("plain/text");
-                        intent.putExtra(Intent.EXTRA_EMAIL, new String[]{email});
-                        context.startActivity(Intent.createChooser(intent, null));
-                    }
-
-                    @Override
-                    public void updateDrawState(@NonNull TextPaint ds) {
-                        super.updateDrawState(ds);
-                        ds.setUnderlineText(false);
-                        ds.setColor(linkColor);
-                    }
-                }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-            }
-        }
-    }
-
-    private static void interaction(Context context, Spannable content, List<Mention> mentions) {
-        // --- For all patterns defined in Helper class ---
-        for (Map.Entry<Helper.PatternType, Pattern> entry : Helper.patternHashMap.entrySet()) {
-            Helper.PatternType patternType = entry.getKey();
-            Pattern pattern = entry.getValue();
-            Matcher matcher = pattern.matcher(content);
-            if (pattern == Helper.mentionPattern && mentions == null) {
-                continue;
-            } else if (pattern == Helper.mentionLongPattern && mentions == null) {
-                continue;
-            }
-
-            while (matcher.find()) {
-                int matchStart = matcher.start();
-                int matchEnd = matcher.end();
-                String word = content.toString().substring(matchStart, matchEnd);
-                if (matchStart >= 0 && matchEnd <= content.toString().length() && matchEnd >= matchStart) {
-                    URLSpan[] span = content.getSpans(matchStart, matchEnd, URLSpan.class);
-                    content.removeSpan(span);
-                    content.setSpan(new ClickableSpan() {
-                        @Override
-                        public void onClick(@NonNull View textView) {
-                            textView.setTag(CLICKABLE_SPAN);
-                            switch (patternType) {
-                                case TAG:
-                                    Intent intent = new Intent(context, HashTagActivity.class);
-                                    Bundle b = new Bundle();
-                                    b.putString(Helper.ARG_SEARCH_KEYWORD, word.trim());
-                                    intent.putExtras(b);
-                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                    context.startActivity(intent);
-                                    break;
-                                case GROUP:
-                                    break;
-                                case MENTION:
-                                    intent = new Intent(context, ProfileActivity.class);
-                                    b = new Bundle();
-                                    Mention targetedMention = null;
-                                    HashMap<String, Integer> countUsername = new HashMap<>();
-
-                                    if (mentions != null) {
-                                        for (Mention mention : mentions) {
-                                            Integer count = countUsername.get(mention.username);
-                                            if (count == null) {
-                                                count = 0;
-                                            }
-                                            if (countUsername.containsKey(mention.username)) {
-                                                countUsername.put(mention.username, count + 1);
-                                            } else {
-                                                countUsername.put(mention.username, 1);
-                                            }
-                                        }
-                                        for (Mention mention : mentions) {
-                                            Integer count = countUsername.get(mention.username);
-                                            if (count == null) {
-                                                count = 0;
-                                            }
-                                            if (word.trim().compareToIgnoreCase("@" + mention.username) == 0 && count == 1) {
-                                                targetedMention = mention;
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    if (targetedMention != null) {
-                                        b.putString(Helper.ARG_USER_ID, targetedMention.id);
-                                    } else {
-                                        b.putString(Helper.ARG_MENTION, word.trim());
-                                    }
-
-                                    intent.putExtras(b);
-                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                    context.startActivity(intent);
-                                    break;
-                                case MENTION_LONG:
-                                    intent = new Intent(context, ProfileActivity.class);
-                                    b = new Bundle();
-                                    targetedMention = null;
-                                    if (mentions != null) {
-                                        for (Mention mention : mentions) {
-                                            if (word.trim().substring(1).compareToIgnoreCase("@" + mention.acct) == 0) {
-                                                targetedMention = mention;
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    if (targetedMention != null) {
-                                        b.putString(Helper.ARG_USER_ID, targetedMention.id);
-                                    } else {
-                                        b.putString(Helper.ARG_MENTION, word.trim());
-                                    }
-                                    intent.putExtras(b);
-                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                    context.startActivity(intent);
-                                    break;
-                            }
-                        }
-
-                        @Override
-                        public void updateDrawState(@NonNull TextPaint ds) {
-                            super.updateDrawState(ds);
-                            ds.setUnderlineText(false);
-                            ds.setColor(linkColor);
-                        }
-                    }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-                }
-            }
-        }
-    }
-
-    /**
-     * Convert HTML content to text. Also, it handles click on link
-     * This needs to be run asynchronously
-     *
-     * @param status  {@link Status} - Status concerned by the spannable transformation
-     * @param content String - text to convert, it can be content, spoiler, poll items, etc.
-     * @return Spannable string
-     */
-    private static void convertOuich(@NonNull Status status, SpannableStringBuilder content) {
-
-        Matcher matcher = Helper.ouichesPattern.matcher(content);
-        while (matcher.find()) {
-            Attachment attachment = new Attachment();
-            attachment.type = "audio";
-            String tag = matcher.group(1);
-            attachment.id = tag;
-            if (tag == null) {
-                continue;
-            }
-            attachment.remote_url = "http://ouich.es/mp3/" + tag + ".mp3";
-            attachment.url = "http://ouich.es/mp3/" + tag + ".mp3";
-            if (status.media_attachments == null) {
-                status.media_attachments = new ArrayList<>();
-            }
-            boolean alreadyAdded = false;
-            for (Attachment at : status.media_attachments) {
-                if (tag.compareTo(at.id) == 0) {
-                    alreadyAdded = true;
-                    break;
-                }
-            }
-            if (!alreadyAdded) {
-                status.media_attachments.add(attachment);
-            }
-        }
-    }
-
-
-    private static void replaceQuoteSpans(Context context, Spannable spannable) {
-        QuoteSpan[] quoteSpans = spannable.getSpans(0, spannable.length(), QuoteSpan.class);
-        for (QuoteSpan quoteSpan : quoteSpans) {
-            int start = spannable.getSpanStart(quoteSpan);
-            int end = spannable.getSpanEnd(quoteSpan);
-            int flags = spannable.getSpanFlags(quoteSpan);
-            spannable.removeSpan(quoteSpan);
-            int colord = ContextCompat.getColor(context, R.color.cyanea_accent_reference);
-            spannable.setSpan(new CustomQuoteSpan(
-                            ContextCompat.getColor(context, R.color.transparent),
-                            colord,
-                            10,
-                            20),
-                    start,
-                    end,
-                    flags);
-        }
-    }
-
-
-
-    /**
-     * Remove extra carriage returns at the bottom due to <p> tags in toots
-     *
-     * @param spannable SpannableStringBuilder
-     * @return SpannableStringBuilder
-     */
-    private static SpannableStringBuilder trimSpannable(SpannableStringBuilder spannable) {
-
-        int trimStart = 0;
-        int trimEnd = 0;
-        String text = spannable.toString();
-
-        while (text.length() > 0 && text.startsWith("\n")) {
-            text = text.substring(1);
-            trimStart += 1;
-        }
-
-        while (text.length() > 0 && text.endsWith("\n")) {
-            text = text.substring(0, text.length() - 1);
-            trimEnd += 1;
-        }
-        return spannable.delete(0, trimStart).delete(spannable.length() - trimEnd, spannable.length());
-    }
-
-    /**
-     * Makes the move to account clickable
-     *
-     * @param context Context
-     * @return SpannableString
-     */
-    public static SpannableString moveToText(final Context context, Account account) {
-        SpannableString spannableString = null;
-        if (account.moved != null) {
-            spannableString = new SpannableString(context.getString(R.string.account_moved_to, account.acct, "@" + account.moved.acct));
-            int startPosition = spannableString.toString().indexOf("@" + account.moved.acct);
-            int endPosition = startPosition + ("@" + account.moved.acct).length();
-            if (startPosition >= 0 && endPosition <= spannableString.toString().length() && endPosition >= startPosition)
-                spannableString.setSpan(new ClickableSpan() {
-                                            @Override
-                                            public void onClick(@NonNull View textView) {
-                                                Intent intent = new Intent(context, ProfileActivity.class);
-                                                Bundle b = new Bundle();
-                                                b.putSerializable(Helper.ARG_ACCOUNT, account.moved);
-                                                intent.putExtras(b);
-                                                context.startActivity(intent);
-                                            }
-
-                                            @Override
-                                            public void updateDrawState(@NonNull TextPaint ds) {
-                                                super.updateDrawState(ds);
-                                            }
-                                        },
-                        startPosition, endPosition,
-                        Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-        }
-        return spannableString;
-    }
-}

app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,31 +17,30 @@ package app.fedilab.android.activities;
 
 import android.app.Activity;
 import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.ArrayList;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.api.admin.AdminAccount;
-import app.fedilab.android.client.entities.api.admin.AdminReport;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityAdminReportBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.StatusReportAdapter;
-import app.fedilab.android.viewmodel.mastodon.AdminVM;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminReport;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.ui.drawer.StatusReportAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
 import es.dmoral.toasty.Toasty;
 
-public class AccountReportActivity extends BaseActivity {
+public class AccountReportActivity extends BaseBarActivity {
 
 
     private String account_id;
@@ -52,13 +51,12 @@ public class AccountReportActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityAdminReportBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         report = null;
@@ -70,8 +68,8 @@ public class AccountReportActivity extends BaseActivity {
             report = (AdminReport) b.getSerializable(Helper.ARG_REPORT);
         }
 
-        binding.allow.getBackground().setColorFilter(ContextCompat.getColor(AccountReportActivity.this, R.color.green_1), PorterDuff.Mode.MULTIPLY);
-        binding.reject.getBackground().setColorFilter(ContextCompat.getColor(AccountReportActivity.this, R.color.red_1), PorterDuff.Mode.MULTIPLY);
+        binding.allow.getBackground().setColorFilter(ThemeHelper.getAttColor(this, R.attr.colorPrimary), PorterDuff.Mode.MULTIPLY);
+        binding.reject.getBackground().setColorFilter(ThemeHelper.getAttColor(this, R.attr.colorError), PorterDuff.Mode.MULTIPLY);
 
 
         if (account_id == null && report == null && targeted_account == null) {
@@ -323,6 +321,7 @@ public class AccountReportActivity extends BaseActivity {
         }
 
     }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {

app/src/main/java/app/fedilab/android/mastodon/activities/ActionActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,25 +14,23 @@ package app.fedilab.android.activities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityActionsBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAccount;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonDomainBlock;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAccount;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonDomainBlock;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
 
-public class ActionActivity extends BaseActivity {
+public class ActionActivity extends BaseBarActivity {
 
     private ActivityActionsBinding binding;
     private boolean canGoBack;
@@ -43,13 +41,12 @@ public class ActionActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityActionsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         canGoBack = false;
         binding.favourites.setOnClickListener(v -> displayTimeline(Timeline.TimeLineEnum.FAVOURITE_TIMELINE));
@@ -57,11 +54,12 @@ public class ActionActivity extends BaseActivity {
         binding.muted.setOnClickListener(v -> displayTimeline(Timeline.TimeLineEnum.MUTED_TIMELINE));
         binding.blocked.setOnClickListener(v -> displayTimeline(Timeline.TimeLineEnum.BLOCKED_TIMELINE));
         binding.domainBlock.setOnClickListener(v -> displayTimeline(Timeline.TimeLineEnum.BLOCKED_DOMAIN_TIMELINE));
+        binding.mutedHome.setOnClickListener(v -> displayTimeline(Timeline.TimeLineEnum.MUTED_TIMELINE_HOME));
     }
 
     private void displayTimeline(Timeline.TimeLineEnum type) {
         canGoBack = true;
-        if (type == Timeline.TimeLineEnum.MUTED_TIMELINE || type == Timeline.TimeLineEnum.BLOCKED_TIMELINE) {
+        if (type == Timeline.TimeLineEnum.MUTED_TIMELINE || type == Timeline.TimeLineEnum.BLOCKED_TIMELINE || type == Timeline.TimeLineEnum.MUTED_TIMELINE_HOME) {
 
             ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {
                 fragmentMastodonAccount = new FragmentMastodonAccount();
@@ -117,6 +115,9 @@ public class ActionActivity extends BaseActivity {
             case BLOCKED_DOMAIN_TIMELINE:
                 setTitle(R.string.blocked_domains);
                 break;
+            case MUTED_TIMELINE_HOME:
+                setTitle(R.string.muted_menu_home);
+                break;
         }
     }
 

app/src/main/java/app/fedilab/android/mastodon/activities/AnnouncementActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -19,22 +19,19 @@ import static app.fedilab.android.BaseMainActivity.currentInstance;
 import static app.fedilab.android.BaseMainActivity.emojis;
 
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.MenuItem;
 
 import androidx.appcompat.app.ActionBar;
-import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.EmojiInstance;
 import app.fedilab.android.databinding.ActivityAnnouncementBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAnnouncement;
+import app.fedilab.android.mastodon.client.entities.api.EmojiInstance;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAnnouncement;
 
 
 public class AnnouncementActivity extends BaseActivity {
@@ -43,7 +40,7 @@ public class AnnouncementActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         ActivityAnnouncementBinding binding = ActivityAnnouncementBinding.inflate(getLayoutInflater());
 
         setContentView(binding.getRoot());
@@ -53,7 +50,6 @@ public class AnnouncementActivity extends BaseActivity {
         //Remove title
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         binding.title.setText(R.string.action_announcements);
         if (getSupportActionBar() != null) {

app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java

@@ -0,0 +1,173 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.color.DynamicColors;
+import com.vanniktech.emoji.EmojiManager;
+import com.vanniktech.emoji.one.EmojiOneProvider;
+
+import org.conscrypt.Conscrypt;
+
+import java.security.Security;
+
+import app.fedilab.android.R;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+
+
+@SuppressLint("Registered")
+public class BaseActivity extends AppCompatActivity {
+
+    public static int currentThemeId;
+
+    static {
+        EmojiManager.install(new EmojiOneProvider());
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+
+        boolean patch_provider = true;
+        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        try {
+            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
+        } catch (Exception ignored) {
+        }
+        if (patch_provider) {
+            try {
+                Security.insertProviderAt(Conscrypt.newProvider(), 1);
+            } catch (Exception ignored) {
+            }
+        }
+
+        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
+        //Default automatic switch
+        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
+
+            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            switch (currentNightMode) {
+                case Configuration.UI_MODE_NIGHT_NO:
+                    String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
+                    switch (defaultLight) {
+                        case "LIGHT":
+                            setTheme(R.style.AppTheme);
+                            currentThemeId = R.style.AppTheme;
+                            break;
+                        case "SOLARIZED_LIGHT":
+                            setTheme(R.style.SolarizedAppTheme);
+                            currentThemeId = R.style.SolarizedAppTheme;
+                            break;
+                    }
+                    break;
+                case Configuration.UI_MODE_NIGHT_YES:
+                    String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
+                    switch (defaultDark) {
+                        case "DARK":
+                            setTheme(R.style.AppTheme);
+                            currentThemeId = R.style.AppTheme;
+                            break;
+                        case "SOLARIZED_DARK":
+                            setTheme(R.style.SolarizedAppTheme);
+                            currentThemeId = R.style.SolarizedAppTheme;
+                            break;
+                        case "BLACK":
+                            setTheme(R.style.BlackAppTheme);
+                            currentThemeId = R.style.BlackAppTheme;
+                            break;
+                        case "DRACULA":
+                            setTheme(R.style.DraculaAppTheme);
+                            currentThemeId = R.style.DraculaAppTheme;
+                            break;
+                    }
+                    break;
+            }
+        } else {
+            switch (currentTheme) {
+                case "LIGHT":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    setTheme(R.style.AppTheme);
+                    currentThemeId = R.style.AppTheme;
+                    break;
+                case "DARK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.AppTheme);
+                    currentThemeId = R.style.AppTheme;
+                    break;
+                case "SOLARIZED_LIGHT":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    setTheme(R.style.SolarizedAppTheme);
+                    currentThemeId = R.style.SolarizedAppTheme;
+                    break;
+                case "SOLARIZED_DARK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.SolarizedAppTheme);
+                    currentThemeId = R.style.SolarizedAppTheme;
+                    break;
+                case "BLACK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.BlackAppTheme);
+                    currentThemeId = R.style.BlackAppTheme;
+                    break;
+                case "DRACULA":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.DraculaAppTheme);
+                    currentThemeId = R.style.DraculaAppTheme;
+                    break;
+            }
+        }
+        super.onCreate(savedInstanceState);
+        boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
+        if (dynamicColor) {
+            DynamicColors.applyToActivityIfAvailable(this);
+        }
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
+            ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
+        }
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.BLACK);
+            window.setNavigationBarColor(Color.BLACK);
+        }
+        Helper.setLocale(this);
+    }
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
+            final Configuration override = new Configuration(newBase.getResources().getConfiguration());
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
+            override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
+            applyOverrideConfiguration(override);
+        }
+        super.attachBaseContext(newBase);
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java

@@ -0,0 +1,161 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.color.DynamicColors;
+import com.vanniktech.emoji.EmojiManager;
+import com.vanniktech.emoji.one.EmojiOneProvider;
+
+import org.conscrypt.Conscrypt;
+
+import java.security.Security;
+
+import app.fedilab.android.R;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+
+
+@SuppressLint("Registered")
+public class BaseBarActivity extends AppCompatActivity {
+
+    static {
+        EmojiManager.install(new EmojiOneProvider());
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean patch_provider = true;
+        try {
+            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
+        } catch (Exception ignored) {
+        }
+        if (patch_provider) {
+            try {
+                Security.insertProviderAt(Conscrypt.newProvider(), 1);
+            } catch (Exception ignored) {
+            }
+        }
+        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
+        //Default automatic switch
+        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
+
+            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            switch (currentNightMode) {
+                case Configuration.UI_MODE_NIGHT_NO:
+                    String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
+                    switch (defaultLight) {
+                        case "LIGHT":
+                            setTheme(R.style.AppThemeBar);
+                            break;
+                        case "SOLARIZED_LIGHT":
+                            setTheme(R.style.SolarizedAppThemeBar);
+                            break;
+                    }
+                    break;
+                case Configuration.UI_MODE_NIGHT_YES:
+                    String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
+                    switch (defaultDark) {
+                        case "DARK":
+                            setTheme(R.style.AppThemeBar);
+                            break;
+                        case "SOLARIZED_DARK":
+                            setTheme(R.style.SolarizedAppThemeBar);
+                            break;
+                        case "BLACK":
+                            setTheme(R.style.BlackAppThemeBar);
+                            break;
+                        case "DRACULA":
+                            setTheme(R.style.DraculaAppThemeBar);
+                            break;
+                    }
+                    break;
+            }
+
+        } else {
+            switch (currentTheme) {
+                case "LIGHT":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    setTheme(R.style.AppThemeBar);
+                    break;
+                case "DARK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.AppThemeBar);
+                    break;
+                case "SOLARIZED_LIGHT":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    setTheme(R.style.SolarizedAppThemeBar);
+                    break;
+                case "SOLARIZED_DARK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.SolarizedAppThemeBar);
+                    break;
+                case "BLACK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.BlackAppThemeBar);
+                    break;
+                case "DRACULA":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.DraculaAppThemeBar);
+                    break;
+            }
+        }
+        super.onCreate(savedInstanceState);
+        boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
+        if (dynamicColor) {
+            DynamicColors.applyToActivityIfAvailable(this);
+        }
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.BLACK);
+            window.setNavigationBarColor(Color.BLACK);
+        }
+        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
+            ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
+        }
+        Helper.setLocale(this);
+    }
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+
+        if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
+            final Configuration override = new Configuration(newBase.getResources().getConfiguration());
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
+            override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
+            applyOverrideConfiguration(override);
+        }
+
+
+        super.attachBaseContext(newBase);
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/BaseTransparentActivity.java

@@ -0,0 +1,161 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.color.DynamicColors;
+import com.vanniktech.emoji.EmojiManager;
+import com.vanniktech.emoji.one.EmojiOneProvider;
+
+import org.conscrypt.Conscrypt;
+
+import java.security.Security;
+
+import app.fedilab.android.R;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+
+
+@SuppressLint("Registered")
+public class BaseTransparentActivity extends AppCompatActivity {
+
+    static {
+        EmojiManager.install(new EmojiOneProvider());
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean patch_provider = true;
+        try {
+            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
+        } catch (Exception ignored) {
+        }
+        if (patch_provider) {
+            try {
+                Security.insertProviderAt(Conscrypt.newProvider(), 1);
+            } catch (Exception ignored) {
+            }
+        }
+        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
+        //Default automatic switch
+        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
+
+            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            switch (currentNightMode) {
+                case Configuration.UI_MODE_NIGHT_NO:
+                    String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
+                    switch (defaultLight) {
+                        case "LIGHT":
+                            setTheme(R.style.Transparent);
+                            break;
+                        case "SOLARIZED_LIGHT":
+                            setTheme(R.style.TransparentSolarized);
+                            break;
+                    }
+                    break;
+                case Configuration.UI_MODE_NIGHT_YES:
+                    String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
+                    switch (defaultDark) {
+                        case "DARK":
+                            setTheme(R.style.Transparent);
+                            break;
+                        case "SOLARIZED_DARK":
+                            setTheme(R.style.TransparentSolarized);
+                            break;
+                        case "BLACK":
+                            setTheme(R.style.TransparentBlack);
+                            break;
+                        case "DRACULA":
+                            setTheme(R.style.TransparentDracula);
+                            break;
+                    }
+                    break;
+            }
+
+        } else {
+            switch (currentTheme) {
+                case "LIGHT":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    setTheme(R.style.Transparent);
+                    break;
+                case "DARK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.Transparent);
+                    break;
+                case "SOLARIZED_LIGHT":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    setTheme(R.style.TransparentSolarized);
+                    break;
+                case "SOLARIZED_DARK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.TransparentSolarized);
+                    break;
+                case "BLACK":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.TransparentBlack);
+                    break;
+                case "DRACULA":
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    setTheme(R.style.TransparentDracula);
+                    break;
+            }
+        }
+        super.onCreate(savedInstanceState);
+        boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
+        if (dynamicColor) {
+            DynamicColors.applyToActivityIfAvailable(this);
+        }
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.BLACK);
+            window.setNavigationBarColor(Color.BLACK);
+        }
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
+            ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
+        }
+        Helper.setLocale(this);
+    }
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
+            final Configuration override = new Configuration(newBase.getResources().getConfiguration());
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
+            override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
+            applyOverrideConfiguration(override);
+        }
+
+
+        super.attachBaseContext(newBase);
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/CacheActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,6 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -25,27 +24,27 @@ import android.view.MenuItem;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.app.Account;
-import app.fedilab.android.client.entities.app.BaseAccount;
-import app.fedilab.android.client.entities.app.CacheAccount;
-import app.fedilab.android.client.entities.app.StatusCache;
-import app.fedilab.android.client.entities.app.StatusDraft;
 import app.fedilab.android.databinding.ActivityCacheBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.CacheHelper;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.CacheAdapter;
+import app.fedilab.android.mastodon.client.entities.app.Account;
+import app.fedilab.android.mastodon.client.entities.app.BaseAccount;
+import app.fedilab.android.mastodon.client.entities.app.CacheAccount;
+import app.fedilab.android.mastodon.client.entities.app.StatusCache;
+import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.CacheHelper;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.drawer.CacheAdapter;
 
-public class CacheActivity extends BaseActivity {
+public class CacheActivity extends BaseBarActivity {
 
     private ActivityCacheBinding binding;
     private List<CacheAccount> cacheAccounts;
@@ -54,12 +53,11 @@ public class CacheActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityCacheBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         CacheHelper.getCacheValues(CacheActivity.this, size -> {
             if (size > 0) {
@@ -123,7 +121,7 @@ public class CacheActivity extends BaseActivity {
             finish();
             return true;
         } else if (item.getItemId() == R.id.action_clear) {
-            AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(CacheActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(CacheActivity.this);
             deleteConfirm.setTitle(getString(R.string.delete_cache));
             deleteConfirm.setMessage(getString(R.string.delete_cache_message));
             deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -133,7 +131,7 @@ public class CacheActivity extends BaseActivity {
                         size = size / 1000000.0f;
                     }
                     binding.fileCacheSize.setText(String.format("%s %s", String.format(Locale.getDefault(), "%.2f", size), getString(R.string.cache_units)));
-                    AlertDialog.Builder restartBuilder = new AlertDialog.Builder(CacheActivity.this, Helper.dialogStyle());
+                    AlertDialog.Builder restartBuilder = new MaterialAlertDialogBuilder(CacheActivity.this);
                     restartBuilder.setMessage(getString(R.string.restart_the_app));
                     restartBuilder.setNegativeButton(R.string.no, (dialogRestart, whichRestart) -> {
                         recreate();

app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -18,7 +18,6 @@ package app.fedilab.android.activities;
 import static app.fedilab.android.BaseMainActivity.currentAccount;
 import static app.fedilab.android.BaseMainActivity.currentInstance;
 import static app.fedilab.android.BaseMainActivity.emojis;
-import static app.fedilab.android.ui.drawer.ComposeAdapter.prepareDraft;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -28,7 +27,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -57,6 +55,8 @@ import androidx.work.OneTimeWorkRequest;
 import androidx.work.OutOfQuotaPolicy;
 import androidx.work.WorkManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -64,37 +64,39 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.Context;
-import app.fedilab.android.client.entities.api.EmojiInstance;
-import app.fedilab.android.client.entities.api.Instance;
-import app.fedilab.android.client.entities.api.Mention;
-import app.fedilab.android.client.entities.api.ScheduledStatus;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.app.BaseAccount;
-import app.fedilab.android.client.entities.app.StatusDraft;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityPaginationBinding;
 import app.fedilab.android.databinding.PopupContactBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.DividerDecorationSimple;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.MediaHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.interfaces.OnDownloadInterface;
-import app.fedilab.android.jobs.ComposeWorker;
-import app.fedilab.android.jobs.ScheduleThreadWorker;
-import app.fedilab.android.services.ThreadMessageService;
-import app.fedilab.android.ui.drawer.AccountsReplyAdapter;
-import app.fedilab.android.ui.drawer.ComposeAdapter;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
-import app.fedilab.android.viewmodel.mastodon.StatusesVM;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.Context;
+import app.fedilab.android.mastodon.client.entities.api.EmojiInstance;
+import app.fedilab.android.mastodon.client.entities.api.Instance;
+import app.fedilab.android.mastodon.client.entities.api.Mention;
+import app.fedilab.android.mastodon.client.entities.api.ScheduledStatus;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.BaseAccount;
+import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.DividerDecorationSimple;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.helper.MediaHelper;
+import app.fedilab.android.mastodon.interfaces.OnDownloadInterface;
+import app.fedilab.android.mastodon.jobs.ComposeWorker;
+import app.fedilab.android.mastodon.jobs.ScheduleThreadWorker;
+import app.fedilab.android.mastodon.services.ThreadMessageService;
+import app.fedilab.android.mastodon.ui.drawer.AccountsReplyAdapter;
+import app.fedilab.android.mastodon.ui.drawer.ComposeAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
 import es.dmoral.toasty.Toasty;
 
 public class ComposeActivity extends BaseActivity implements ComposeAdapter.ManageDrafts, AccountsReplyAdapter.ActionDone, ComposeAdapter.promptDraftListener {
@@ -106,13 +108,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
     public static final int TAKE_PHOTO = 5600;
     private final Timer timer = new Timer();
     private List<Status> statusList;
-    private Status statusReply, statusMention;
+    private Status statusReply, statusMention, statusQuoted;
     private StatusDraft statusDraft;
     private ComposeAdapter composeAdapter;
-    private boolean promptSaveDraft;
-    private boolean restoredDraft;
-
-
     private final BroadcastReceiver imageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(android.content.Context context, Intent intent) {
@@ -128,6 +126,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
                                 if (focusX != -2) {
                                     attachment.focus = focusX + "," + focusY;
                                 }
+
                                 composeAdapter.notifyItemChanged(position);
                                 break;
                             }
@@ -138,18 +137,18 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             }
         }
     };
-
+    private boolean promptSaveDraft;
+    private boolean restoredDraft;
+    private List<Attachment> sharedAttachments;
     private ActivityPaginationBinding binding;
     private BaseAccount account;
     private String instance, token;
     private Uri photoFileUri;
     private ScheduledStatus scheduledStatus;
     private String visibility;
-    private app.fedilab.android.client.entities.api.Account accountMention;
+    private Account accountMention;
     private String statusReplyId;
-    private app.fedilab.android.client.entities.api.Account mentionBooster;
-    private ArrayList<Uri> sharedUriList = new ArrayList<>();
-    private Uri sharedUri;
+    private Account mentionBooster;
     private String sharedSubject, sharedContent, sharedTitle, sharedDescription, shareURL, sharedUrlMedia;
     private String editMessageId;
 
@@ -212,11 +211,11 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
 
     private void storeDraftWarning() {
         if (statusDraft == null) {
-            statusDraft = prepareDraft(statusList, composeAdapter, account.instance, account.user_id);
+            statusDraft = ComposeAdapter.prepareDraft(statusList, composeAdapter, account.instance, account.user_id);
         }
         if (canBeSent(statusDraft)) {
             if (promptSaveDraft) {
-                AlertDialog.Builder alt_bld = new AlertDialog.Builder(ComposeActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(ComposeActivity.this);
                 alt_bld.setMessage(R.string.save_draft);
                 alt_bld.setPositiveButton(R.string.save, (dialog, id) -> {
                     dialog.dismiss();
@@ -317,7 +316,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         } else if (item.getItemId() == R.id.action_photo_camera) {
             photoFileUri = MediaHelper.dispatchTakePictureIntent(ComposeActivity.this);
         } else if (item.getItemId() == R.id.action_contacts) {
-            AlertDialog.Builder builderSingle = new AlertDialog.Builder(ComposeActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(ComposeActivity.this);
 
             builderSingle.setTitle(getString(R.string.select_accounts));
             PopupContactBinding popupContactBinding = PopupContactBinding.inflate(getLayoutInflater(), new LinearLayout(ComposeActivity.this), false);
@@ -393,7 +392,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             }
         } else if (item.getItemId() == R.id.action_schedule) {
             if (statusDraft == null) {
-                statusDraft = prepareDraft(statusList, composeAdapter, account.instance, account.user_id);
+                statusDraft = ComposeAdapter.prepareDraft(statusList, composeAdapter, account.instance, account.user_id);
             }
             if (canBeSent(statusDraft)) {
                 MediaHelper.scheduleMessage(ComposeActivity.this, date -> storeDraft(true, date));
@@ -404,19 +403,20 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         return true;
     }
 
-    private void onRetrieveContact(PopupContactBinding binding, List<app.fedilab.android.client.entities.api.Account> accounts) {
-        binding.loader.setVisibility(View.GONE);
+    private void onRetrieveContact(PopupContactBinding popupContactBinding, List<Account> accounts) {
+        popupContactBinding.loader.setVisibility(View.GONE);
         if (accounts == null) {
             accounts = new ArrayList<>();
         }
         List<Boolean> checkedValues = new ArrayList<>();
-        List<app.fedilab.android.client.entities.api.Account> contacts = new ArrayList<>(accounts);
-        for (app.fedilab.android.client.entities.api.Account account : contacts) {
+        List<Account> contacts = new ArrayList<>(accounts);
+        for (Account account : contacts) {
             checkedValues.add(composeAdapter.getLastComposeContent().contains("@" + account.acct));
         }
         AccountsReplyAdapter contactAdapter = new AccountsReplyAdapter(contacts, checkedValues);
-        binding.lvAccountsSearch.setAdapter(contactAdapter);
-        binding.lvAccountsSearch.setLayoutManager(new LinearLayoutManager(ComposeActivity.this));
+        contactAdapter.actionDone = ComposeActivity.this;
+        popupContactBinding.lvAccountsSearch.setAdapter(contactAdapter);
+        popupContactBinding.lvAccountsSearch.setLayoutManager(new LinearLayoutManager(ComposeActivity.this));
     }
 
     @Override
@@ -444,7 +444,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityPaginationBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
@@ -454,7 +454,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         //Remove title
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -467,6 +466,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         Bundle b = getIntent().getExtras();
         if (b != null) {
             statusReply = (Status) b.getSerializable(Helper.ARG_STATUS_REPLY);
+            statusQuoted = (Status) b.getSerializable(Helper.ARG_QUOTED_MESSAGE);
             statusDraft = (StatusDraft) b.getSerializable(Helper.ARG_STATUS_DRAFT);
             scheduledStatus = (ScheduledStatus) b.getSerializable(Helper.ARG_STATUS_SCHEDULED);
             statusReplyId = b.getString(Helper.ARG_STATUS_REPLY_ID);
@@ -481,11 +481,10 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             } else if (visibility == null && currentAccount != null && currentAccount.mastodon_account != null && currentAccount.mastodon_account.source != null) {
                 visibility = currentAccount.mastodon_account.source.privacy;
             }
-            mentionBooster = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER);
-            accountMention = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
+            mentionBooster = (Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER);
+            accountMention = (Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
             //Shared elements
-            sharedUriList = b.getParcelableArrayList(Helper.ARG_SHARE_URI_LIST);
-            sharedUri = b.getParcelable(Helper.ARG_SHARE_URI);
+            sharedAttachments = (ArrayList<Attachment>) b.getSerializable(Helper.ARG_MEDIA_ATTACHMENTS);
             sharedUrlMedia = b.getString(Helper.ARG_SHARE_URL_MEDIA);
             sharedSubject = b.getString(Helper.ARG_SHARE_SUBJECT, null);
             sharedContent = b.getString(Helper.ARG_SHARE_CONTENT, null);
@@ -500,7 +499,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         if (sharedTitle != null && sharedSubject != null && sharedSubject.length() > sharedTitle.length()) {
             sharedTitle = sharedSubject;
         }
-        binding.toolbar.setPopupTheme(Helper.popupStyle());
         //Edit a scheduled status from server
         if (scheduledStatus != null) {
             statusDraft = new StatusDraft();
@@ -540,10 +538,10 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         if (token == null) {
             token = account.token;
         }
-        if (emojis == null || !emojis.containsKey(currentInstance)) {
+        if (emojis == null || !emojis.containsKey(instance)) {
             new Thread(() -> {
                 try {
-                    emojis.put(currentInstance, new EmojiInstance(ComposeActivity.this).getEmojiList(currentInstance));
+                    emojis.put(instance, new EmojiInstance(ComposeActivity.this).getEmojiList(instance));
                 } catch (DBException e) {
                     e.printStackTrace();
                 }
@@ -561,6 +559,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         List<Status> statusDraftList = new ArrayList<>();
         Status status = new Status();
         status.id = Helper.generateIdString();
+        if (statusQuoted != null) {
+            status.quote_id = statusQuoted.id;
+        }
         statusDraftList.add(status);
 
         if (statusReplyId != null && statusDraft != null) {//Delete and redraft
@@ -637,9 +638,25 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             }
             if (statusReply.spoiler_text != null) {
                 statusDraftList.get(0).spoiler_text = statusReply.spoiler_text;
+                if (statusReply.spoiler_text.trim().length() > 0) {
+                    statusDraftList.get(0).spoilerChecked = true;
+                }
             }
             if (statusReply.language != null && !statusReply.language.isEmpty()) {
-                statusDraftList.get(0).language = statusReply.language;
+                Set<String> storedLanguages = sharedpreferences.getStringSet(getString(R.string.SET_SELECTED_LANGUAGE), null);
+                if (storedLanguages == null || storedLanguages.size() == 0) {
+                    statusDraftList.get(0).language = statusReply.language;
+                } else {
+                    if (storedLanguages.contains(statusReply.language)) {
+                        statusDraftList.get(0).language = statusReply.language;
+                    } else {
+                        String currentCode = sharedpreferences.getString(getString(R.string.SET_COMPOSE_LANGUAGE) + account.user_id + account.instance, Locale.getDefault().getLanguage());
+                        if (currentCode.isEmpty()) {
+                            currentCode = "EN";
+                        }
+                        statusDraftList.get(0).language = currentCode;
+                    }
+                }
             }
             //StatusDraftList at this point should only have one element
             statusList.addAll(statusDraftList);
@@ -651,6 +668,18 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             binding.recyclerView.setAdapter(composeAdapter);
             statusesVM.getContext(currentInstance, BaseMainActivity.currentToken, statusReply.id)
                     .observe(ComposeActivity.this, this::initializeContextView);
+        } else if (statusQuoted != null) {
+            statusList.add(statusQuoted);
+            int statusCount = statusList.size();
+            statusDraftList.get(0).quote_id = statusQuoted.id;
+            //StatusDraftList at this point should only have one element
+            statusList.addAll(statusDraftList);
+            composeAdapter = new ComposeAdapter(statusList, statusCount, account, accountMention, visibility, editMessageId);
+            composeAdapter.manageDrafts = this;
+            composeAdapter.promptDraftListener = this;
+            LinearLayoutManager mLayoutManager = new LinearLayoutManager(ComposeActivity.this);
+            binding.recyclerView.setLayoutManager(mLayoutManager);
+            binding.recyclerView.setAdapter(composeAdapter);
         } else {
             //Compose without replying
             statusList.addAll(statusDraftList);
@@ -680,18 +709,19 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
             }, 0, 10000);
         }
 
-        if (sharedUriList != null && sharedUriList.size() > 0) {
-            List<Uri> uris = new ArrayList<>(sharedUriList);
-            Helper.createAttachmentFromUri(ComposeActivity.this, uris, attachment -> {
+        if (sharedAttachments != null && sharedAttachments.size() > 0) {
+            for (Attachment attachment : sharedAttachments) {
                 composeAdapter.addAttachment(-1, attachment);
-            });
-        } else if (sharedUri != null && !sharedUri.toString().startsWith("http")) {
+            }
+        } /*else if (sharedUri != null && !sharedUri.toString().startsWith("http")) {
             List<Uri> uris = new ArrayList<>();
             uris.add(sharedUri);
-            Helper.createAttachmentFromUri(ComposeActivity.this, uris, attachment -> {
-                composeAdapter.addAttachment(-1, attachment);
+            Helper.createAttachmentFromUri(ComposeActivity.this, uris, attachments -> {
+                for(Attachment attachment: attachments) {
+                    composeAdapter.addAttachment(-1, attachment);
+                }
             });
-        } else if (shareURL != null) {
+        } */ else if (shareURL != null) {
 
             Helper.download(ComposeActivity.this, sharedUrlMedia, new OnDownloadInterface() {
                 @Override
@@ -718,18 +748,20 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         Status status = new Status();
 
         status.id = Helper.generateIdString();
-        status.mentions = statusList.get(position).mentions;
-        status.visibility = statusList.get(position).visibility;
+        status.mentions = statusList.get(position - 1).mentions;
+        status.visibility = statusList.get(position - 1).visibility;
         final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ComposeActivity.this);
         boolean unlistedReplies = sharedpreferences.getBoolean(getString(R.string.SET_UNLISTED_REPLIES), true);
         if (status.visibility.equalsIgnoreCase("public") && unlistedReplies) {
             status.visibility = "unlisted";
         }
-        status.spoiler_text = statusList.get(position).spoiler_text;
-        status.sensitive = statusList.get(position).sensitive;
+        status.spoiler_text = statusList.get(position - 1).spoiler_text;
+        status.sensitive = statusList.get(position - 1).sensitive;
         statusList.add(status);
-        composeAdapter.notifyItemInserted(position + 1);
-        binding.recyclerView.smoothScrollToPosition(position + 1);
+        composeAdapter.notifyItemInserted(position);
+        composeAdapter.notifyItemRangeChanged(0, statusList.size());
+        binding.recyclerView.smoothScrollToPosition(statusList.size());
+
     }
 
     @Override
@@ -833,6 +865,11 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
                     WorkManager.getInstance(ComposeActivity.this).enqueue(oneTimeWorkRequest);
                     statusDraft.workerUuid = oneTimeWorkRequest.getId();
                     statusDraft.scheduled_at = date;
+                    try {
+                        new StatusDraft(ComposeActivity.this).updateStatusDraft(statusDraft);
+                    } catch (DBException e) {
+                        e.printStackTrace();
+                    }
                     Handler mainHandler = new Handler(Looper.getMainLooper());
                     Runnable myRunnable = () -> {
                         Toasty.info(ComposeActivity.this, getString(R.string.toot_scheduled), Toasty.LENGTH_LONG).show();
@@ -873,10 +910,14 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
 
 
     private boolean canBeSent(StatusDraft statusDraft) {
-        if (statusDraft == null || statusDraft.statusDraftList == null || statusDraft.statusDraftList.isEmpty()) {
+        if (statusDraft == null) {
             return false;
         }
-        Status statusCheck = statusDraft.statusDraftList.get(0);
+        List<Status> statuses = statusDraft.statusDraftList;
+        if (statuses == null || statuses.size() == 0) {
+            return false;
+        }
+        Status statusCheck = statuses.get(0);
         if (statusCheck == null) {
             return false;
         }

app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java

@@ -0,0 +1,240 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import static app.fedilab.android.BaseMainActivity.currentAccount;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.TypedValue;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import app.fedilab.android.BaseMainActivity;
+import app.fedilab.android.R;
+import app.fedilab.android.activities.MainActivity;
+import app.fedilab.android.databinding.ActivityConversationBinding;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.StatusCache;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.ui.drawer.StatusAdapter;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonContext;
+import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
+import es.dmoral.toasty.Toasty;
+
+public class ContextActivity extends BaseActivity implements FragmentMastodonContext.FirstMessage {
+
+    public static boolean expand;
+    public static boolean displayCW;
+    public static Resources.Theme theme;
+    Fragment currentFragment;
+    private Status firstMessage;
+    private String remote_instance;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActivityConversationBinding binding = ActivityConversationBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        //Remove title
+        if (actionBar != null) {
+            actionBar.setDisplayShowTitleEnabled(false);
+        }
+        binding.title.setText(R.string.context_conversation);
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);
+        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+        Bundle b = getIntent().getExtras();
+        displayCW = sharedpreferences.getBoolean(getString(R.string.SET_EXPAND_CW), false);
+        Status focusedStatus = null; // or other values
+        if (b != null) {
+            focusedStatus = (Status) b.getSerializable(Helper.ARG_STATUS);
+            remote_instance = b.getString(Helper.ARG_REMOTE_INSTANCE, null);
+        }
+        if (focusedStatus == null || currentAccount == null || currentAccount.mastodon_account == null) {
+            finish();
+            return;
+        }
+        MastodonHelper.loadPPMastodon(binding.profilePicture, currentAccount.mastodon_account);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(Helper.ARG_STATUS, focusedStatus);
+        bundle.putString(Helper.ARG_REMOTE_INSTANCE, remote_instance);
+        FragmentMastodonContext fragmentMastodonContext = new FragmentMastodonContext();
+        fragmentMastodonContext.firstMessage = this;
+        currentFragment = Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_content_main, fragmentMastodonContext, bundle, null, null);
+        if (remote_instance == null) {
+            StatusesVM timelinesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class);
+            timelinesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> {
+                if (status != null) {
+                    StatusCache statusCache = new StatusCache();
+                    statusCache.instance = BaseMainActivity.currentInstance;
+                    statusCache.user_id = BaseMainActivity.currentUserID;
+                    statusCache.status = status;
+                    statusCache.status_id = status.id;
+                    //Update cache
+                    new Thread(() -> {
+                        try {
+                            new StatusCache(getApplication()).updateIfExists(statusCache);
+                            Handler mainHandler = new Handler(Looper.getMainLooper());
+                            //Update UI
+                            Runnable myRunnable = () -> StatusAdapter.sendAction(ContextActivity.this, Helper.ARG_STATUS_ACTION, status, null);
+                            mainHandler.post(myRunnable);
+                        } catch (DBException e) {
+                            e.printStackTrace();
+                        }
+                    }).start();
+                }
+            });
+        }
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_context, menu);
+        MenuItem itemExpand = menu.findItem(R.id.action_expand);
+        if (expand) {
+            itemExpand.setIcon(R.drawable.ic_baseline_expand_less_24);
+        } else {
+            itemExpand.setIcon(R.drawable.ic_baseline_expand_more_24);
+        }
+        MenuItem itemDisplayCW = menu.findItem(R.id.action_show_cw);
+        if (displayCW) {
+            itemDisplayCW.setIcon(R.drawable.ic_baseline_remove_red_eye_24);
+        } else {
+            itemDisplayCW.setIcon(R.drawable.ic_outline_remove_red_eye_24);
+        }
+        MenuItem action_remote = menu.findItem(R.id.action_remote);
+        if (remote_instance != null) {
+            action_remote.setVisible(false);
+        } else {
+            if (firstMessage != null && !firstMessage.visibility.equalsIgnoreCase("direct") && !firstMessage.visibility.equalsIgnoreCase("private")) {
+                Pattern pattern = Helper.statusIdInUrl;
+                Matcher matcher = pattern.matcher(firstMessage.uri);
+                action_remote.setVisible(matcher.find());
+            } else {
+                action_remote.setVisible(false);
+            }
+        }
+        return true;
+    }
+
+    public void setCurrentFragment(FragmentMastodonContext fragmentMastodonContext) {
+        currentFragment = fragmentMastodonContext;
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        } else if (item.getItemId() == R.id.action_expand) {
+            expand = !expand;
+            if (currentFragment != null && currentFragment instanceof FragmentMastodonContext) {
+                ((FragmentMastodonContext) currentFragment).redraw();
+            }
+            invalidateOptionsMenu();
+        } else if (item.getItemId() == R.id.action_show_cw) {
+            displayCW = !displayCW;
+            if (currentFragment != null && currentFragment instanceof FragmentMastodonContext) {
+                ((FragmentMastodonContext) currentFragment).refresh();
+            }
+            invalidateOptionsMenu();
+        } else if (item.getItemId() == R.id.action_remote) {
+
+            if (firstMessage == null) {
+                Toasty.warning(ContextActivity.this, getString(R.string.toast_try_later), Toasty.LENGTH_SHORT).show();
+                return true;
+            }
+            if (firstMessage.account.acct != null) {
+                String instance = null;
+                try {
+                    URL url = new URL(firstMessage.uri);
+                    instance = url.getHost();
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                }
+                if (instance == null) {
+                    Toasty.info(ContextActivity.this, getString(R.string.toast_error_fetch_message), Toasty.LENGTH_SHORT).show();
+                    return true;
+                }
+                if (instance.equalsIgnoreCase(MainActivity.currentInstance)) {
+                    Toasty.info(ContextActivity.this, getString(R.string.toast_on_your_instance), Toasty.LENGTH_SHORT).show();
+                    return true;
+                }
+                Pattern pattern = Helper.statusIdInUrl;
+                Matcher matcher = pattern.matcher(firstMessage.uri);
+                String remoteId = null;
+                if (matcher.find()) {
+                    remoteId = matcher.group(1);
+                }
+                if (remoteId != null) {
+                    StatusesVM statusesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class);
+                    String finalInstance = instance;
+                    statusesVM.getStatus(instance, null, remoteId).observe(ContextActivity.this, status -> {
+                        if (status != null) {
+                            Intent intentContext = new Intent(ContextActivity.this, ContextActivity.class);
+                            intentContext.putExtra(Helper.ARG_STATUS, status);
+                            intentContext.putExtra(Helper.ARG_REMOTE_INSTANCE, finalInstance);
+                            intentContext.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            startActivity(intentContext);
+                        } else {
+                            Toasty.warning(ContextActivity.this, getString(R.string.toast_error_fetch_message), Toasty.LENGTH_SHORT).show();
+                        }
+                    });
+                } else {
+                    Toasty.warning(ContextActivity.this, getString(R.string.toast_error_fetch_message), Toasty.LENGTH_SHORT).show();
+                }
+            } else {
+                Toasty.warning(ContextActivity.this, getString(R.string.toast_error_fetch_message), Toasty.LENGTH_SHORT).show();
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void get(Status status) {
+        firstMessage = status;
+        invalidateOptionsMenu();
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/CustomSharingActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,6 @@ package app.fedilab.android.activities;
 import static app.fedilab.android.BaseMainActivity.currentAccount;
 
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -26,23 +25,21 @@ import android.text.TextUtils;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
 
 import java.util.List;
 import java.util.Set;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.Emoji;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.api.Tag;
 import app.fedilab.android.databinding.ActivityCustomSharingBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.helper.customsharing.CustomSharingAsyncTask;
-import app.fedilab.android.helper.customsharing.CustomSharingResponse;
-import app.fedilab.android.helper.customsharing.OnCustomSharingInterface;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.Emoji;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.customsharing.CustomSharingAsyncTask;
+import app.fedilab.android.mastodon.helper.customsharing.CustomSharingResponse;
+import app.fedilab.android.mastodon.helper.customsharing.OnCustomSharingInterface;
 import es.dmoral.toasty.Toasty;
 
 
@@ -51,7 +48,7 @@ import es.dmoral.toasty.Toasty;
  * Share status metadata to remote content aggregators
  */
 
-public class CustomSharingActivity extends BaseActivity implements OnCustomSharingInterface {
+public class CustomSharingActivity extends BaseBarActivity implements OnCustomSharingInterface {
 
     private String title, keywords, custom_sharing_url, encodedCustomSharingURL;
     private String bundle_url;
@@ -66,14 +63,13 @@ public class CustomSharingActivity extends BaseActivity implements OnCustomShari
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(CustomSharingActivity.this);
         binding = ActivityCustomSharingBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         Bundle b = getIntent().getExtras();
         status = null;

app/src/main/java/app/fedilab/android/mastodon/activities/DirectoryActivity.java

@@ -0,0 +1,81 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import static app.fedilab.android.mastodon.client.entities.app.Timeline.TimeLineEnum.ACCOUNT_DIRECTORY;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.jetbrains.annotations.NotNull;
+
+import app.fedilab.android.R;
+import app.fedilab.android.databinding.ActivityDirectoryBinding;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAccount;
+
+
+public class DirectoryActivity extends BaseBarActivity {
+
+    private static boolean local = false;
+    private static String order = "active";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActivityDirectoryBinding binding = ActivityDirectoryBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+        Bundle bundle = new Bundle();
+        bundle.putBoolean(Helper.ARG_DIRECTORY_LOCAL, local);
+        bundle.putString(Helper.ARG_DIRECTORY_ORDER, order);
+        bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, ACCOUNT_DIRECTORY);
+        Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_directory, new FragmentMastodonAccount(), bundle, null, null);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_directory, menu);
+        if (order.equals("active")) {
+            menu.findItem(R.id.order_active).setChecked(true);
+        } else {
+            menu.findItem(R.id.order_new).setChecked(true);
+        }
+        menu.findItem(R.id.action_local).setChecked(local);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NotNull MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        } else if (item.getItemId() == R.id.action_local) {
+            item.setChecked(!item.isChecked());
+            local = item.isChecked();
+        } else if (item.getItemId() == R.id.order_active) {
+            order = "active";
+        } else if (item.getItemId() == R.id.order_new) {
+            order = "new";
+        }
+        recreate();
+        return super.onOptionsItemSelected(item);
+    }
+
+}

app/src/main/java/app/fedilab/android/mastodon/activities/DraftActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,6 @@ package app.fedilab.android.activities;
 import static app.fedilab.android.BaseMainActivity.currentAccount;
 
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -30,25 +29,24 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.app.StatusDraft;
 import app.fedilab.android.databinding.ActivityDraftsBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.StatusDraftAdapter;
-import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.ui.drawer.StatusDraftAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM;
 
 public class DraftActivity extends BaseActivity implements StatusDraftAdapter.DraftActions {
 
@@ -62,20 +60,16 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityDraftsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
-        }
 
         //Remove title
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
         }
-        binding.toolbar.setPopupTheme(Helper.popupStyle());
         binding.title.setText(R.string.drafts);
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
         float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);
@@ -105,7 +99,7 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr
             finish();
             return true;
         } else if (item.getItemId() == R.id.action_delete) {
-            AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(DraftActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(DraftActivity.this);
             unfollowConfirm.setTitle(getString(R.string.delete_all));
             unfollowConfirm.setMessage(getString(R.string.remove_draft));
             unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());

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

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -18,7 +18,6 @@ import static app.fedilab.android.BaseMainActivity.currentAccount;
 import static app.fedilab.android.BaseMainActivity.instanceInfo;
 
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -31,12 +30,11 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.bumptech.glide.Glide;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;
 
 import java.util.LinkedHashMap;
@@ -45,18 +43,17 @@ import java.util.Locale;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Field;
 import app.fedilab.android.databinding.AccountFieldItemBinding;
 import app.fedilab.android.databinding.ActivityEditProfileBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Field;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
 import es.dmoral.toasty.Toasty;
 
-public class EditProfileActivity extends BaseActivity {
+public class EditProfileActivity extends BaseBarActivity {
 
     public static final int PICK_MEDIA_AVATAR = 5705;
     public static final int PICK_MEDIA_HEADER = 5706;
@@ -66,12 +63,11 @@ public class EditProfileActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityEditProfileBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         new ViewModelProvider(EditProfileActivity.this).get(AccountsVM.class).getConnectedAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken)
@@ -89,7 +85,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));
@@ -140,7 +136,7 @@ public class EditProfileActivity extends BaseActivity {
                     value = Html.fromHtml(field.value).toString();
                 fieldItemBinding.value.setText(value);
                 fieldItemBinding.remove.setOnClickListener(v -> {
-                    AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this, Helper.dialogStyle());
+                    AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
                     deleteConfirm.setTitle(getString(R.string.delete_field));
                     deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
                     deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -162,7 +158,7 @@ public class EditProfileActivity extends BaseActivity {
         binding.addField.setOnClickListener(view -> {
             AccountFieldItemBinding fieldItemBinding = AccountFieldItemBinding.inflate(getLayoutInflater());
             fieldItemBinding.remove.setOnClickListener(v -> {
-                AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
                 deleteConfirm.setTitle(getString(R.string.delete_field));
                 deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
                 deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -183,15 +179,6 @@ public class EditProfileActivity extends BaseActivity {
             }
         });
 
-        ThemeHelper.changeColorOutlineButton(EditProfileActivity.this, binding.visibilityPublic);
-        ThemeHelper.changeColorOutlineButton(EditProfileActivity.this, binding.visibilityUnlisted);
-        ThemeHelper.changeColorOutlineButton(EditProfileActivity.this, binding.visibilityPrivate);
-        ThemeHelper.changeColorOutlineButton(EditProfileActivity.this, binding.visibilityDirect);
-        DrawableCompat.setTintList(DrawableCompat.wrap(binding.bot.getThumbDrawable()), ThemeHelper.getSwitchCompatThumbDrawable(EditProfileActivity.this));
-        DrawableCompat.setTintList(DrawableCompat.wrap(binding.discoverable.getThumbDrawable()), ThemeHelper.getSwitchCompatThumbDrawable(EditProfileActivity.this));
-        DrawableCompat.setTintList(DrawableCompat.wrap(binding.sensitive.getThumbDrawable()), ThemeHelper.getSwitchCompatThumbDrawable(EditProfileActivity.this));
-        ThemeHelper.changeColorOutlineButton(EditProfileActivity.this, binding.locked);
-        ThemeHelper.changeColorOutlineButton(EditProfileActivity.this, binding.unlocked);
 
         //Actions with the activity
         accountsVM = new ViewModelProvider(EditProfileActivity.this).get(AccountsVM.class);
@@ -221,7 +208,7 @@ public class EditProfileActivity extends BaseActivity {
                                 Helper.recreateMainActivity(EditProfileActivity.this);
                                 new Thread(() -> {
                                     try {
-                                        new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
+                                        new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
                                     } catch (DBException e) {
                                         e.printStackTrace();
                                     }
@@ -248,7 +235,7 @@ public class EditProfileActivity extends BaseActivity {
                             currentAccount.mastodon_account = account;
                             new Thread(() -> {
                                 try {
-                                    new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
+                                    new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
                                 } catch (DBException e) {
                                     e.printStackTrace();
                                 }
@@ -342,7 +329,7 @@ public class EditProfileActivity extends BaseActivity {
                             currentAccount.mastodon_account = account;
                             new Thread(() -> {
                                 try {
-                                    new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
+                                    new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
                                     sendBroadCast(account);
                                 } catch (DBException e) {
                                     e.printStackTrace();

app/src/main/java/app/fedilab/android/mastodon/activities/FilterActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,6 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -28,28 +27,28 @@ import android.widget.Button;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelStoreOwner;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Filter;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityFiltersBinding;
 import app.fedilab.android.databinding.PopupAddFilterBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.FilterAdapter;
-import app.fedilab.android.ui.drawer.KeywordAdapter;
-import app.fedilab.android.viewmodel.mastodon.FiltersVM;
+import app.fedilab.android.mastodon.client.entities.api.Filter;
+import app.fedilab.android.mastodon.ui.drawer.FilterAdapter;
+import app.fedilab.android.mastodon.ui.drawer.KeywordAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
 
-public class FilterActivity extends BaseActivity implements FilterAdapter.Delete {
+public class FilterActivity extends BaseBarActivity implements FilterAdapter.Delete {
 
     private ActivityFiltersBinding binding;
     private List<Filter> filterList;
@@ -63,7 +62,7 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete
      * @param listener - {@link FilterAdapter.FilterAction}
      */
     public static void addEditFilter(Context context, Filter filter, FilterAdapter.FilterAction listener) {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, Helper.dialogStyle());
+        AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context);
         PopupAddFilterBinding popupAddFilterBinding = PopupAddFilterBinding.inflate(LayoutInflater.from(context));
         FiltersVM filtersVM = new ViewModelProvider((ViewModelStoreOwner) context).get(FiltersVM.class);
         dialogBuilder.setView(popupAddFilterBinding.getRoot());
@@ -237,7 +236,7 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete
         alertDialog.setTitle(context.getString(R.string.action_update_filter));
         alertDialog.setOnDismissListener(dialogInterface -> {
             //Hide keyboard
-            InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+            InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
             imm.hideSoftInputFromWindow(popupAddFilterBinding.addTitle.getWindowToken(), 0);
         });
         if (alertDialog.getWindow() != null) {
@@ -250,13 +249,12 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityFiltersBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         filterList = new ArrayList<>();
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         FiltersVM filtersVM = new ViewModelProvider(FilterActivity.this).get(FiltersVM.class);

app/src/main/java/app/fedilab/android/mastodon/activities/FollowRequestActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,13 +15,11 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -31,13 +29,12 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Accounts;
 import app.fedilab.android.databinding.ActivityStatusInfoBinding;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.AccountFollowRequestAdapter;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Accounts;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.ui.drawer.AccountFollowRequestAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
 
 
 public class FollowRequestActivity extends BaseActivity {
@@ -51,14 +48,13 @@ public class FollowRequestActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityStatusInfoBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         accountList = new ArrayList<>();
         flagLoading = false;

app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,6 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.InputFilter;
 import android.view.Menu;
@@ -24,29 +23,30 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Tag;
-import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityFollowedTagsBinding;
 import app.fedilab.android.databinding.PopupAddFollowedTagtBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.FollowedTagAdapter;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
-import app.fedilab.android.viewmodel.mastodon.TagVM;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.ui.drawer.FollowedTagAdapter;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.viewmodel.mastodon.TagVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class FollowedTagActivity extends BaseActivity implements FollowedTagAdapter.ActionOnTag {
+public class FollowedTagActivity extends BaseBarActivity implements FollowedTagAdapter.ActionOnTag {
 
 
     private ActivityFollowedTagsBinding binding;
@@ -60,14 +60,13 @@ public class FollowedTagActivity extends BaseActivity implements FollowedTagAdap
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityFollowedTagsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         canGoBack = false;
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         tagVM = new ViewModelProvider(FollowedTagActivity.this).get(TagVM.class);
         tagVM.followedTags(BaseMainActivity.currentInstance, BaseMainActivity.currentToken)
@@ -91,7 +90,7 @@ public class FollowedTagActivity extends BaseActivity implements FollowedTagAdap
             onBackPressed();
             return true;
         } else if (item.getItemId() == R.id.action_unfollow && tag != null) {
-            AlertDialog.Builder alt_bld = new AlertDialog.Builder(FollowedTagActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(FollowedTagActivity.this);
             alt_bld.setTitle(R.string.action_unfollow_tag);
             alt_bld.setMessage(R.string.action_unfollow_tag_confirm);
             alt_bld.setPositiveButton(R.string.unfollow, (dialog, id) -> {
@@ -111,7 +110,7 @@ public class FollowedTagActivity extends BaseActivity implements FollowedTagAdap
                         fragmentMastodonTimeline.onDestroyView();
                     }
                     invalidateOptionsMenu();
-                    setTitle(R.string.action_lists);
+                    setTitle(R.string.followed_tags);
                 });
                 if (tagList.size() == 0) {
                     binding.notContent.setVisibility(View.VISIBLE);
@@ -123,7 +122,7 @@ public class FollowedTagActivity extends BaseActivity implements FollowedTagAdap
             AlertDialog alert = alt_bld.create();
             alert.show();
         } else if (item.getItemId() == R.id.action_follow_tag) {
-            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(FollowedTagActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(FollowedTagActivity.this);
             PopupAddFollowedTagtBinding popupAddFollowedTagtBinding = PopupAddFollowedTagtBinding.inflate(getLayoutInflater());
             dialogBuilder.setView(popupAddFollowedTagtBinding.getRoot());
             popupAddFollowedTagtBinding.addTag.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});
@@ -180,7 +179,7 @@ public class FollowedTagActivity extends BaseActivity implements FollowedTagAdap
                     fragmentMastodonTimeline.onDestroyView();
                 }
             });
-            setTitle(R.string.action_lists);
+            setTitle(R.string.followed_tags);
             invalidateOptionsMenu();
         } else {
             super.onBackPressed();

app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java

@@ -0,0 +1,391 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import static app.fedilab.android.BaseMainActivity.currentAccount;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import app.fedilab.android.BaseMainActivity;
+import app.fedilab.android.R;
+import app.fedilab.android.activities.MainActivity;
+import app.fedilab.android.databinding.ActivityHashtagBinding;
+import app.fedilab.android.mastodon.client.entities.api.Filter;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.Pinned;
+import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
+import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
+import app.fedilab.android.mastodon.client.entities.app.TagTimeline;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.TagVM;
+import es.dmoral.toasty.Toasty;
+
+
+public class HashTagActivity extends BaseActivity {
+
+
+    public static int position;
+    private String tag;
+    private String stripTag;
+    private Boolean pinnedTag;
+    private Boolean followedTag;
+    private Boolean mutedTag;
+    private TagVM tagVM;
+    private Filter fedilabFilter;
+    private Filter.KeywordsAttributes keyword;
+    private PinnedTimeline pinnedTimeline;
+    private Pinned pinned;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActivityHashtagBinding binding = ActivityHashtagBinding.inflate(getLayoutInflater());
+
+        setContentView(binding.getRoot());
+        Bundle b = getIntent().getExtras();
+        if (b != null) {
+            tag = b.getString(Helper.ARG_SEARCH_KEYWORD, null);
+        }
+        if (tag == null)
+            finish();
+        pinnedTag = null;
+        followedTag = null;
+        mutedTag = null;
+        stripTag = tag.replaceAll("#", "");
+        setSupportActionBar(binding.toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        //Remove title
+        if (actionBar != null) {
+            actionBar.setDisplayShowTitleEnabled(false);
+        }
+        binding.title.setText(tag);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
+        tagVM = new ViewModelProvider(HashTagActivity.this).get(TagVM.class);
+        tagVM.getTag(MainActivity.currentInstance, MainActivity.currentToken, stripTag).observe(this, returnedTag -> {
+            if (returnedTag != null) {
+                followedTag = returnedTag.following;
+                invalidateOptionsMenu();
+            }
+        });
+        ReorderVM reorderVM = new ViewModelProvider(HashTagActivity.this).get(ReorderVM.class);
+        reorderVM.getAllPinned().observe(HashTagActivity.this, pinned -> {
+            if (pinned == null) {
+                pinned = new Pinned();
+                pinned.pinnedTimelines = new ArrayList<>();
+            }
+            this.pinned = pinned;
+            pinnedTag = false;
+            if (pinned.pinnedTimelines != null) {
+                for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
+                    if (pinnedTimeline.tagTimeline != null) {
+                        if (pinnedTimeline.tagTimeline.name.equalsIgnoreCase(stripTag)) {
+                            this.pinnedTimeline = pinnedTimeline;
+                            pinnedTag = true;
+                            break;
+                        }
+                    }
+                }
+                invalidateOptionsMenu();
+            }
+        });
+        if (MainActivity.filterFetched && MainActivity.mainFilters != null) {
+            mutedTag = false;
+            for (Filter filter : MainActivity.mainFilters) {
+                if (filter.title.equalsIgnoreCase(Helper.FEDILAB_MUTED_HASHTAGS)) {
+                    fedilabFilter = filter;
+                    String fetch = tag.startsWith("#") ? tag : "#" + tag;
+                    for (Filter.KeywordsAttributes keywordsAttributes : filter.keywords) {
+                        if (fetch.equalsIgnoreCase(keywordsAttributes.keyword)) {
+                            mutedTag = true;
+                            keyword = keywordsAttributes;
+                            invalidateOptionsMenu();
+                            break;
+                        }
+                    }
+                }
+            }
+            invalidateOptionsMenu();
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TAG);
+        bundle.putString(Helper.ARG_SEARCH_KEYWORD, tag);
+        Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_tags, new FragmentMastodonTimeline(), bundle, null, null);
+        binding.compose.setOnClickListener(v -> {
+            Intent intentToot = new Intent(HashTagActivity.this, ComposeActivity.class);
+            StatusDraft statusDraft = new StatusDraft();
+            Status status = new Status();
+            status.text = "#" + stripTag;
+            List<Status> statuses = new ArrayList<>();
+            statuses.add(status);
+            statusDraft.statusDraftList = statuses;
+            Bundle _b = new Bundle();
+            _b.putSerializable(Helper.ARG_STATUS_DRAFT, statusDraft);
+            intentToot.putExtras(_b);
+            startActivity(intentToot);
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        } else if (item.getItemId() == R.id.action_add_timeline) {
+
+            if (pinnedTag) {
+                AlertDialog.Builder unpinConfirm = new MaterialAlertDialogBuilder(HashTagActivity.this);
+                unpinConfirm.setMessage(getString(R.string.unpin_timeline_description));
+                unpinConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+                unpinConfirm.setPositiveButton(R.string.yes, (dialog, which) -> {
+                    if (pinned == null || pinned.pinnedTimelines == null) {
+                        return;
+                    }
+                    pinned.pinnedTimelines.remove(pinnedTimeline);
+                    try {
+                        new Pinned(HashTagActivity.this).updatePinned(pinned);
+                    } catch (DBException e) {
+                        e.printStackTrace();
+                    }
+                    pinnedTag = false;
+                    invalidateOptionsMenu();
+                    Bundle b = new Bundle();
+                    b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true);
+                    Intent intentBD = new Intent(Helper.BROADCAST_DATA);
+                    intentBD.putExtras(b);
+                    LocalBroadcastManager.getInstance(HashTagActivity.this).sendBroadcast(intentBD);
+                    dialog.dismiss();
+                });
+                unpinConfirm.show();
+            } else {
+                new Thread(() -> {
+                    try {
+                        Pinned pinned = new Pinned(HashTagActivity.this).getPinned(currentAccount);
+                        boolean canBeAdded = true;
+                        boolean update = true;
+                        if (pinned == null) {
+                            pinned = new Pinned();
+                            pinned.pinnedTimelines = new ArrayList<>();
+                            update = false;
+                        } else {
+                            for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
+                                if (pinnedTimeline.type == Timeline.TimeLineEnum.TAG) {
+                                    if (pinnedTimeline.tagTimeline.name.compareTo(stripTag.trim()) == 0) {
+                                        canBeAdded = false;
+                                    }
+                                }
+                            }
+                        }
+                        if (!canBeAdded) {
+                            Handler mainHandler = new Handler(Looper.getMainLooper());
+                            Runnable myRunnable = () -> Toasty.warning(HashTagActivity.this, getString(R.string.tags_already_stored), Toasty.LENGTH_SHORT).show();
+                            mainHandler.post(myRunnable);
+                            return;
+                        }
+                        pinnedTimeline = new PinnedTimeline();
+                        pinnedTimeline.type = Timeline.TimeLineEnum.TAG;
+                        pinnedTimeline.position = pinned.pinnedTimelines.size();
+                        pinnedTimeline.displayed = true;
+                        TagTimeline tagTimeline = new TagTimeline();
+                        tagTimeline.name = stripTag.trim();
+                        tagTimeline.isNSFW = false;
+                        tagTimeline.isART = false;
+                        tagTimeline.any = new ArrayList<>();
+                        tagTimeline.any.add(stripTag.trim());
+                        pinnedTimeline.tagTimeline = tagTimeline;
+                        pinned.pinnedTimelines.add(pinnedTimeline);
+                        if (pinned.instance == null || pinned.user_id == null) {
+                            pinned.instance = MainActivity.currentInstance;
+                            pinned.user_id = MainActivity.currentUserID;
+                        }
+                        if (update) {
+                            new Pinned(HashTagActivity.this).updatePinned(pinned);
+                        } else {
+                            new Pinned(HashTagActivity.this).insertPinned(pinned);
+                        }
+                        Bundle b = new Bundle();
+                        b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true);
+                        Intent intentBD = new Intent(Helper.BROADCAST_DATA);
+                        intentBD.putExtras(b);
+                        LocalBroadcastManager.getInstance(HashTagActivity.this).sendBroadcast(intentBD);
+                        pinnedTag = true;
+                        invalidateOptionsMenu();
+                    } catch (DBException e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+            }
+        } else if (item.getItemId() == R.id.action_follow_tag) {
+            if (!followedTag) {
+                tagVM.follow(MainActivity.currentInstance, MainActivity.currentToken, stripTag).observe(this, returnedTag -> {
+                    if (returnedTag != null) {
+                        followedTag = returnedTag.following;
+                        invalidateOptionsMenu();
+                    }
+                });
+            } else {
+                tagVM.unfollow(MainActivity.currentInstance, MainActivity.currentToken, stripTag).observe(this, returnedTag -> {
+                    if (returnedTag != null) {
+                        followedTag = returnedTag.following;
+                        invalidateOptionsMenu();
+                    }
+                });
+            }
+        } else if (item.getItemId() == R.id.action_mute) {
+
+            if (!mutedTag) {
+                if (MainActivity.mainFilters == null || fedilabFilter == null) {
+                    MainActivity.mainFilters = new ArrayList<>();
+                    Filter.FilterParams filterParams = new Filter.FilterParams();
+                    filterParams.title = Helper.FEDILAB_MUTED_HASHTAGS;
+                    filterParams.filter_action = "hide";
+                    filterParams.context = new ArrayList<>();
+                    filterParams.context.add("home");
+                    filterParams.context.add("public");
+                    filterParams.context.add("thread");
+                    filterParams.context.add("account");
+                    FiltersVM filtersVM = new ViewModelProvider(HashTagActivity.this).get(FiltersVM.class);
+                    filtersVM.addFilter(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, filterParams)
+                            .observe(HashTagActivity.this, filter -> {
+                                if (filter != null) {
+                                    MainActivity.mainFilters.add(filter);
+                                    mutedTag = false;
+                                    fedilabFilter = filter;
+                                    muteTags();
+                                    invalidateOptionsMenu();
+                                }
+                            });
+                } else {
+                    muteTags();
+                }
+            } else {
+                unmuteTags();
+            }
+
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    private void unmuteTags() {
+        String search = tag.startsWith("#") ? tag : "#" + tag;
+        for (Filter.KeywordsAttributes keywordsAttributes : fedilabFilter.keywords) {
+            if (search.equalsIgnoreCase(keywordsAttributes.keyword)) {
+                keyword = keywordsAttributes;
+                break;
+            }
+        }
+        if (keyword != null && keyword.id != null) {
+            FiltersVM filtersVM = new ViewModelProvider(HashTagActivity.this).get(FiltersVM.class);
+            filtersVM.removeKeyword(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, keyword.id);
+            fedilabFilter.keywords.remove(keyword);
+            mutedTag = false;
+            invalidateOptionsMenu();
+        }
+    }
+
+
+    private void muteTags() {
+        Filter.FilterParams filterParams = new Filter.FilterParams();
+        filterParams.id = fedilabFilter.id;
+        filterParams.keywords = new ArrayList<>();
+        Filter.KeywordsParams keywordsParams = new Filter.KeywordsParams();
+        keywordsParams.whole_word = true;
+        keywordsParams.keyword = tag.startsWith("#") ? tag : "#" + tag;
+        filterParams.keywords.add(keywordsParams);
+        filterParams.context = fedilabFilter.context;
+        FiltersVM filtersVM = new ViewModelProvider(HashTagActivity.this).get(FiltersVM.class);
+        filtersVM.editFilter(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, filterParams)
+                .observe(HashTagActivity.this, filter -> {
+                    fedilabFilter = filter;
+                    mutedTag = true;
+                    invalidateOptionsMenu();
+                });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_hashtag, menu);
+        MenuItem pin = menu.findItem(R.id.action_add_timeline);
+        MenuItem follow = menu.findItem(R.id.action_follow_tag);
+        MenuItem mute = menu.findItem(R.id.action_mute);
+        if (pinnedTag != null) {
+            pin.setVisible(true);
+            if (pinnedTag) {
+                pin.setIcon(R.drawable.tag_pin_off);
+                pin.setTitle(getString(R.string.unpin_tag));
+            } else {
+                pin.setTitle(getString(R.string.unpin_tag));
+                pin.setIcon(R.drawable.tag_pin);
+            }
+        } else {
+            pin.setVisible(false);
+        }
+        if (followedTag != null) {
+            follow.setVisible(true);
+            if (followedTag) {
+                follow.setTitle(getString(R.string.unfollow_tag));
+                follow.setIcon(R.drawable.tag_unfollow);
+            } else {
+                follow.setTitle(getString(R.string.follow_tag));
+                follow.setIcon(R.drawable.tag_follow);
+            }
+        } else {
+            follow.setVisible(false);
+        }
+        if (mutedTag != null) {
+            mute.setVisible(true);
+            if (mutedTag) {
+                mute.setTitle(getString(R.string.unmute_tag_action));
+                mute.setIcon(R.drawable.tag_unmuted);
+            } else {
+                mute.setTitle(getString(R.string.mute_tag_action));
+                mute.setIcon(R.drawable.tag_muted);
+            }
+        } else {
+            mute.setVisible(false);
+        }
+        return super.onCreateOptionsMenu(menu);
+    }
+
+}

app/src/main/java/app/fedilab/android/mastodon/activities/InstanceActivity.java

@@ -0,0 +1,158 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import android.app.Dialog;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.UnderlineSpan;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
+
+import com.bumptech.glide.Glide;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import app.fedilab.android.BaseMainActivity;
+import app.fedilab.android.R;
+import app.fedilab.android.activities.MainActivity;
+import app.fedilab.android.databinding.ActivityInstanceBinding;
+import app.fedilab.android.mastodon.client.entities.api.Instance;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.InstancesVM;
+
+
+public class InstanceActivity extends DialogFragment {
+
+    ActivityInstanceBinding binding;
+    private boolean applyMaxChar = false;
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        binding = ActivityInstanceBinding.inflate(getLayoutInflater());
+
+        MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(requireContext());
+        materialAlertDialogBuilder.setView(binding.getRoot());
+
+        Dialog dialog = materialAlertDialogBuilder.create();
+
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
+
+        final SpannableString contentAbout = new SpannableString(getString(R.string.action_about_instance));
+        contentAbout.setSpan(new UnderlineSpan(), 0, contentAbout.length(), 0);
+        contentAbout.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(requireContext(), R.attr.colorPrimary)), 0, contentAbout.length(),
+                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+        binding.about.setText(contentAbout);
+
+        final SpannableString contentPrivacy = new SpannableString(getString(R.string.action_privacy_policy));
+        contentPrivacy.setSpan(new UnderlineSpan(), 0, contentPrivacy.length(), 0);
+        contentPrivacy.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(requireContext(), R.attr.colorPrimary)), 0, contentPrivacy.length(),
+                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+        binding.privacy.setText(contentPrivacy);
+
+        binding.about.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/about"));
+        binding.privacy.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/privacy-policy"));
+        binding.close.setOnClickListener(view -> {
+            if (applyMaxChar) {
+                String max_char = binding.maxChar.getText().toString();
+
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                if (!max_char.isEmpty()) {
+                    try {
+                        editor.putInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, Integer.parseInt(max_char));
+                        editor.apply();
+                    } catch (Exception ignored) {
+                    }
+                }
+            }
+                    requireDialog().dismiss();
+                }
+
+        );
+
+        InstancesVM instancesVM = new ViewModelProvider(InstanceActivity.this).get(InstancesVM.class);
+        instancesVM.getInstance(BaseMainActivity.currentInstance).observe(InstanceActivity.this, instanceInfo -> {
+            binding.loader.setVisibility(View.GONE);
+
+            if (instanceInfo == null || instanceInfo.info == null || instanceInfo.info.description == null) {
+                binding.instanceData.setVisibility(View.GONE);
+                binding.contact.setVisibility(View.GONE);
+                int val = sharedpreferences.getInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, -1);
+                if (val != -1) {
+                    binding.maxChar.setText(String.valueOf(val));
+                }
+                applyMaxChar = true;
+
+            } else {
+                Instance instance = instanceInfo.info;
+
+                Glide.with(InstanceActivity.this)
+                        .asDrawable()
+                        .placeholder(R.drawable.default_banner)
+                        .load(instance.thumbnail)
+                        .into(binding.backgroundImage);
+
+                binding.name.setText(instance.title);
+
+                if (instance.description == null || instance.description.trim().length() == 0)
+                    binding.description.setText(getString(R.string.instance_no_description));
+                else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                    binding.description.setText(Html.fromHtml(instance.description, Html.FROM_HTML_MODE_LEGACY));
+                else
+                    binding.description.setText(Html.fromHtml(instance.description));
+
+                binding.version.setText(instance.version);
+
+                binding.uri.setText(instance.uri);
+
+                if (instance.email == null) {
+                    binding.contact.setVisibility(View.GONE);
+                } else {
+                    binding.contact.setVisibility(View.VISIBLE);
+                }
+
+                binding.contact.setOnClickListener(v -> {
+                    Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", instance.email, null));
+                    emailIntent.putExtra(Intent.EXTRA_SUBJECT, "[Mastodon] - " + instance.uri);
+                    startActivity(Intent.createChooser(emailIntent, getString(R.string.send_email)));
+                });
+
+                binding.instanceData.setVisibility(View.VISIBLE);
+            }
+        });
+
+        return dialog;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/InstanceHealthActivity.kt

@@ -0,0 +1,126 @@
+package app.fedilab.android.mastodon.activities
+
+import android.app.Dialog
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.SpannableString
+import android.text.style.UnderlineSpan
+import android.view.Window
+import androidx.core.view.isVisible
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import app.fedilab.android.BaseMainActivity
+import app.fedilab.android.R
+import app.fedilab.android.databinding.ActivityInstanceSocialBinding
+import app.fedilab.android.mastodon.client.entities.app.InstanceSocial
+import app.fedilab.android.mastodon.helper.Helper
+import app.fedilab.android.mastodon.helper.ThemeHelper
+import app.fedilab.android.mastodon.viewmodel.mastodon.InstanceSocialVM
+import com.bumptech.glide.Glide
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+class InstanceHealthActivity : DialogFragment() {
+    private var _binding: ActivityInstanceSocialBinding? = null
+    private val binding: ActivityInstanceSocialBinding get() = _binding!!
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        _binding = ActivityInstanceSocialBinding.inflate(layoutInflater)
+        binding.close.setOnClickListener { dialog?.dismiss() }
+        val content = SpannableString(binding.refInstance.text.toString())
+        content.setSpan(UnderlineSpan(), 0, content.length, 0)
+        binding.refInstance.text = content
+        binding.refInstance.setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://instances.social")))
+        }
+
+        val materialAlertDialogBuilder = MaterialAlertDialogBuilder(requireContext())
+        materialAlertDialogBuilder.setView(binding.root)
+
+        val dialog = materialAlertDialogBuilder.create()
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setOnShowListener { checkInstance() }
+
+        return dialog
+    }
+
+    private fun checkInstance() {
+        val instanceSocialVM =
+            ViewModelProvider(this@InstanceHealthActivity)[InstanceSocialVM::class.java]
+        instanceSocialVM.getInstances(BaseMainActivity.currentInstance.trim { it <= ' ' })
+            .observe(this@InstanceHealthActivity) { instanceSocialList: InstanceSocial? ->
+                val instance = instanceSocialList?.instances?.firstOrNull { instance ->
+                    instance.name.equals(
+                        BaseMainActivity.currentInstance.trim { it <= ' ' },
+                        ignoreCase = true
+                    )
+                }
+                if (instance != null) {
+                    instance.thumbnail?.takeIf { it != "null" }?.let { thumbnail ->
+                        Glide.with(this@InstanceHealthActivity)
+                            .asBitmap()
+                            .placeholder(R.drawable.default_banner)
+                            .load(thumbnail)
+                            .into(binding.backgroundImage)
+                    }
+                    binding.name.text = instance.name
+                    if (instance.up) {
+                        binding.up.setText(app.fedilab.android.R.string.is_up)
+                        binding.up.setTextColor(
+                            ThemeHelper.getAttColor(
+                                requireContext(),
+                                app.fedilab.android.R.attr.colorPrimary
+                            )
+                        )
+                    } else {
+                        binding.up.setText(app.fedilab.android.R.string.is_down)
+                        binding.up.setTextColor(
+                            ThemeHelper.getAttColor(
+                                requireContext(),
+                                app.fedilab.android.R.attr.colorError
+                            )
+                        )
+                    }
+                    binding.uptime.text = getString(
+                        app.fedilab.android.R.string.instance_health_uptime,
+                        instance.uptime * 100
+                    )
+                    if (instance.checked_at != null)
+                        binding.checkedAt.text =
+                            getString(
+                                app.fedilab.android.R.string.instance_health_checkedat,
+                                Helper.dateToString(instance.checked_at)
+                            )
+                    binding.values.text = getString(
+                        app.fedilab.android.R.string.instance_health_indication,
+                        instance.version,
+                        Helper.withSuffix(instance.active_users.toLong()),
+                        Helper.withSuffix(instance.statuses.toLong())
+                    )
+                } else {
+                    binding.instanceData.isVisible = false
+                    binding.noInstance.isVisible = true
+                }
+                binding.loader.isVisible = false
+            }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/InstanceProfileActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,73 +15,64 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
+import android.app.Dialog;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivityInstanceProfileBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
 import es.dmoral.toasty.Toasty;
 
-public class InstanceProfileActivity extends BaseActivity {
-
+public class InstanceProfileActivity extends DialogFragment {
 
     private String instance;
     private ActivityInstanceProfileBinding binding;
 
+    @NonNull
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeDialog(this);
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
         binding = ActivityInstanceProfileBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        Bundle b = getIntent().getExtras();
-        if (getSupportActionBar() != null)
-            getSupportActionBar().hide();
+
+        MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(requireContext());
+        materialAlertDialogBuilder.setView(binding.getRoot());
+
+        Dialog dialog = materialAlertDialogBuilder.create();
+
+        Bundle b = getArguments();
         if (b != null)
             instance = b.getString(Helper.ARG_INSTANCE, null);
         if (instance == null) {
-            finish();
+            requireDialog().dismiss();
         }
-        Button close = findViewById(R.id.close);
-        close.setOnClickListener(view -> finish());
+
+        binding.close.setOnClickListener(v -> requireDialog().dismiss());
+
         NodeInfoVM nodeInfoVM = new ViewModelProvider(InstanceProfileActivity.this).get(NodeInfoVM.class);
         nodeInfoVM.getNodeInfo(instance).observe(InstanceProfileActivity.this, nodeInfo -> {
             if (nodeInfo == null) {
-                Toasty.error(InstanceProfileActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-                finish();
+                Toasty.error(requireContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
+                requireDialog().dismiss();
                 return;
             }
             binding.name.setText(instance);
-            SpannableString descriptionSpan;
             binding.userCount.setText(Helper.withSuffix((nodeInfo.usage.users.total)));
             binding.statusCount.setText(Helper.withSuffix(((nodeInfo.usage.localPosts))));
             String softwareStr = nodeInfo.software.name + " - ";
             binding.software.setText(softwareStr);
             binding.version.setText(nodeInfo.software.version);
-            binding.instanceContainer.setVisibility(View.VISIBLE);
             binding.loader.setVisibility(View.GONE);
         });
+
+        return dialog;
     }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-
 }

app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,7 +16,6 @@ package app.fedilab.android.activities;
 
 
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputFilter;
@@ -28,7 +27,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
@@ -36,33 +34,36 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.MastodonList;
-import app.fedilab.android.client.entities.app.Pinned;
-import app.fedilab.android.client.entities.app.PinnedTimeline;
-import app.fedilab.android.client.entities.app.Timeline;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityListBinding;
 import app.fedilab.android.databinding.PopupAddListBinding;
 import app.fedilab.android.databinding.PopupManageAccountsListBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.AccountListAdapter;
-import app.fedilab.android.ui.drawer.MastodonListAdapter;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
-import app.fedilab.android.viewmodel.mastodon.ReorderVM;
-import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.MastodonList;
+import app.fedilab.android.mastodon.client.entities.app.Pinned;
+import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.ui.drawer.AccountListAdapter;
+import app.fedilab.android.mastodon.ui.drawer.MastodonListAdapter;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class MastodonListActivity extends BaseActivity implements MastodonListAdapter.ActionOnList {
+public class MastodonListActivity extends BaseBarActivity implements MastodonListAdapter.ActionOnList {
 
 
     AccountListAdapter accountsInListAdapter;
@@ -82,14 +83,13 @@ public class MastodonListActivity extends BaseActivity implements MastodonListAd
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityListBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         canGoBack = false;
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         flagLoading = false;
         orderASC = true;
@@ -146,8 +146,22 @@ public class MastodonListActivity extends BaseActivity implements MastodonListAd
         if (item.getItemId() == android.R.id.home) {
             onBackPressed();
             return true;
+        } else if (item.getItemId() == R.id.action_user_mute_home) {
+            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
+            dialogBuilder.setTitle(R.string.put_all_accounts_in_home_muted);
+            dialogBuilder.setPositiveButton(R.string.mute_them_all, (dialog, id) -> {
+                timelinesVM.getAccountsInList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, mastodonList.id, null, null, 0)
+                        .observe(MastodonListActivity.this, accounts -> {
+                            if (accounts != null && accounts.size() > 0) {
+                                accountsVM.muteAccountsHome(MainActivity.currentAccount, accounts);
+                            }
+                        });
+                dialog.dismiss();
+            });
+            dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
+            dialogBuilder.show();
         } else if (item.getItemId() == R.id.action_manage_users) {
-            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MastodonListActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
             PopupManageAccountsListBinding popupManageAccountsListBinding = PopupManageAccountsListBinding.inflate(getLayoutInflater());
             dialogBuilder.setView(popupManageAccountsListBinding.getRoot());
             popupManageAccountsListBinding.loader.setVisibility(View.VISIBLE);
@@ -244,7 +258,7 @@ public class MastodonListActivity extends BaseActivity implements MastodonListAd
             dialogBuilder.setPositiveButton(R.string.close, (dialog, id) -> dialog.dismiss());
             dialogBuilder.create().show();
         } else if (item.getItemId() == R.id.action_delete && mastodonList != null) {
-            AlertDialog.Builder alt_bld = new AlertDialog.Builder(MastodonListActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(MastodonListActivity.this);
             alt_bld.setTitle(R.string.action_lists_delete);
             alt_bld.setMessage(R.string.action_lists_confirm_delete);
             alt_bld.setPositiveButton(R.string.delete, (dialog, id) -> {
@@ -282,7 +296,7 @@ public class MastodonListActivity extends BaseActivity implements MastodonListAd
             AlertDialog alert = alt_bld.create();
             alert.show();
         } else if (item.getItemId() == R.id.action_add_list) {
-            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MastodonListActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
             PopupAddListBinding popupAddListBinding = PopupAddListBinding.inflate(getLayoutInflater());
             dialogBuilder.setView(popupAddListBinding.getRoot());
             popupAddListBinding.addList.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});
@@ -322,7 +336,7 @@ public class MastodonListActivity extends BaseActivity implements MastodonListAd
             dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
             dialogBuilder.create().show();
         } else if (item.getItemId() == R.id.action_edit) {
-            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MastodonListActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
             PopupAddListBinding popupAddListBinding = PopupAddListBinding.inflate(getLayoutInflater());
             dialogBuilder.setView(popupAddListBinding.getRoot());
             popupAddListBinding.addList.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});

app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -21,16 +21,11 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.graphics.Point;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.text.Html;
-import android.view.Display;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -45,32 +40,26 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.preference.PreferenceManager;
 import androidx.viewpager.widget.ViewPager;
 
-import com.github.stom79.mytransl.MyTransL;
-import com.github.stom79.mytransl.client.HttpsConnectionException;
-import com.github.stom79.mytransl.client.Results;
-import com.github.stom79.mytransl.translate.Params;
-import com.github.stom79.mytransl.translate.Translate;
-
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.databinding.ActivityMediaPagerBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MediaHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.interfaces.OnDownloadInterface;
-import app.fedilab.android.ui.fragment.media.FragmentMedia;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MediaHelper;
+import app.fedilab.android.mastodon.helper.TranslateHelper;
+import app.fedilab.android.mastodon.interfaces.OnDownloadInterface;
+import app.fedilab.android.mastodon.ui.fragment.media.FragmentMedia;
+import app.fedilab.android.mastodon.ui.fragment.media.FragmentMediaProfile;
 import es.dmoral.toasty.Toasty;
 
 
-public class MediaActivity extends BaseActivity implements OnDownloadInterface {
+public class MediaActivity extends BaseTransparentActivity implements OnDownloadInterface {
 
     int flags;
     private ArrayList<Attachment> attachments;
@@ -82,7 +71,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
         public void onReceive(Context context, Intent intent) {
             long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
             if (downloadID == id) {
-                DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+                DownloadManager manager = (DownloadManager) context.getSystemService(DOWNLOAD_SERVICE);
                 assert manager != null;
                 Uri uri = manager.getUriForDownloadedFile(downloadID);
                 Intent shareIntent = new Intent(Intent.ACTION_SEND);
@@ -104,17 +93,15 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
     };
     private boolean fullscreen;
     private Handler handler;
-    private int minTouch, maxTouch;
-    private float startX;
-    private float startY;
     private ActivityMediaPagerBinding binding;
     private FragmentMedia mCurrentFragment;
     private Status status;
+    private boolean mediaFromProfile;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
-        ThemeHelper.applyThemeBar(this);
+
         super.onCreate(savedInstanceState);
         ActivityCompat.postponeEnterTransition(MediaActivity.this);
         binding = ActivityMediaPagerBinding.inflate(getLayoutInflater());
@@ -127,12 +114,16 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
         if (b != null) {
             mediaPosition = b.getInt(Helper.ARG_MEDIA_POSITION, 1);
             attachments = (ArrayList<Attachment>) b.getSerializable(Helper.ARG_MEDIA_ARRAY);
+            mediaFromProfile = b.getBoolean(Helper.ARG_MEDIA_ARRAY_PROFILE, false);
             status = (Status) b.getSerializable(Helper.ARG_STATUS);
         }
+        if (mediaFromProfile && FragmentMediaProfile.mediaAttachmentProfile != null) {
+            attachments = new ArrayList<>();
+            attachments.addAll(FragmentMediaProfile.mediaAttachmentProfile);
+        }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         if (attachments == null || attachments.size() == 0)
@@ -144,14 +135,13 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
         binding.mediaViewpager.setAdapter(mPagerAdapter);
         binding.mediaViewpager.setSaveEnabled(false);
         binding.mediaViewpager.setCurrentItem(mediaPosition - 1);
-        binding.haulerView.setOnDragDismissedListener(dragDirection -> ActivityCompat.finishAfterTransition(MediaActivity.this));
         registerReceiver(onDownloadComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
         String description = attachments.get(mediaPosition - 1).description;
         handler = new Handler();
-        if (status != null) {
+        if (attachments.get(mediaPosition - 1).status != null) {
             binding.originalMessage.setOnClickListener(v -> {
                 Intent intentContext = new Intent(MediaActivity.this, ContextActivity.class);
-                intentContext.putExtra(Helper.ARG_STATUS, status);
+                intentContext.putExtra(Helper.ARG_STATUS, attachments.get(mediaPosition - 1).status);
                 intentContext.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 startActivity(intentContext);
             });
@@ -160,40 +150,14 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             binding.mediaDescription.setText(description);
             binding.translate.setOnClickListener(v -> {
                 String descriptionToTranslate = attachments.get(mediaPosition - 1).description;
-                MyTransL.translatorEngine et = MyTransL.translatorEngine.LIBRETRANSLATE;
-                final MyTransL myTransL = MyTransL.getInstance(et);
-                myTransL.setObfuscation(true);
-                Params params = new Params();
-                params.setSplit_sentences(false);
-                params.setFormat(Params.fType.TEXT);
-                params.setSource_lang("auto");
-                myTransL.setLibretranslateDomain("translate.fedilab.app");
-                String statusToTranslate;
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                    statusToTranslate = Html.fromHtml(descriptionToTranslate, Html.FROM_HTML_MODE_LEGACY).toString();
-                else
-                    statusToTranslate = Html.fromHtml(descriptionToTranslate).toString();
-                SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MediaActivity.this);
-                String translate = sharedpreferences.getString(getString(R.string.SET_LIVE_TRANSLATE), MyTransL.getLocale());
-                if (translate != null && translate.equalsIgnoreCase("default")) {
-                    translate = MyTransL.getLocale();
-                }
-                myTransL.translate(statusToTranslate, translate, params, new Results() {
-                    @Override
-                    public void onSuccess(Translate translate) {
-                        if (translate.getTranslatedContent() != null) {
-                            attachments.get(mediaPosition - 1).translation = translate.getTranslatedContent();
-                            binding.mediaDescriptionTranslated.setText(translate.getTranslatedContent());
-                            binding.mediaDescriptionTranslated.setVisibility(View.VISIBLE);
-                            binding.mediaDescription.setVisibility(View.GONE);
-                        } else {
-                            Toasty.error(MediaActivity.this, getString(R.string.toast_error_translate), Toast.LENGTH_LONG).show();
-                        }
-                    }
-
-                    @Override
-                    public void onFail(HttpsConnectionException httpsConnectionException) {
-
+                TranslateHelper.translate(MediaActivity.this, descriptionToTranslate, translated -> {
+                    if (translated != null) {
+                        attachments.get(mediaPosition - 1).translation = translated;
+                        binding.mediaDescriptionTranslated.setText(translated);
+                        binding.mediaDescriptionTranslated.setVisibility(View.VISIBLE);
+                        binding.mediaDescription.setVisibility(View.GONE);
+                    } else {
+                        Toasty.error(MediaActivity.this, getString(R.string.toast_error_translate), Toast.LENGTH_LONG).show();
                     }
                 });
             });
@@ -215,6 +179,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             }
 
             public void onPageSelected(int position) {
+                mediaPosition = position;
                 String description = attachments.get(position).description;
                 if (handler != null) {
                     handler.removeCallbacksAndMessages(null);
@@ -225,40 +190,14 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
                 }
                 binding.translate.setOnClickListener(v -> {
                     String descriptionToTranslate = attachments.get(position).description;
-                    MyTransL.translatorEngine et = MyTransL.translatorEngine.LIBRETRANSLATE;
-                    final MyTransL myTransL = MyTransL.getInstance(et);
-                    myTransL.setObfuscation(true);
-                    Params params = new Params();
-                    params.setSplit_sentences(false);
-                    params.setFormat(Params.fType.TEXT);
-                    params.setSource_lang("auto");
-                    myTransL.setLibretranslateDomain("translate.fedilab.app");
-                    String statusToTranslate;
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                        statusToTranslate = Html.fromHtml(descriptionToTranslate, Html.FROM_HTML_MODE_LEGACY).toString();
-                    else
-                        statusToTranslate = Html.fromHtml(descriptionToTranslate).toString();
-                    SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MediaActivity.this);
-                    String translate = sharedpreferences.getString(getString(R.string.SET_LIVE_TRANSLATE), MyTransL.getLocale());
-                    if (translate != null && translate.equalsIgnoreCase("default")) {
-                        translate = MyTransL.getLocale();
-                    }
-                    myTransL.translate(statusToTranslate, translate, params, new Results() {
-                        @Override
-                        public void onSuccess(Translate translate) {
-                            if (translate.getTranslatedContent() != null) {
-                                attachments.get(position).translation = translate.getTranslatedContent();
-                                binding.mediaDescriptionTranslated.setText(translate.getTranslatedContent());
-                                binding.mediaDescriptionTranslated.setVisibility(View.VISIBLE);
-                                binding.mediaDescription.setVisibility(View.GONE);
-                            } else {
-                                Toasty.error(MediaActivity.this, getString(R.string.toast_error_translate), Toast.LENGTH_LONG).show();
-                            }
-                        }
-
-                        @Override
-                        public void onFail(HttpsConnectionException httpsConnectionException) {
-
+                    TranslateHelper.translate(MediaActivity.this, descriptionToTranslate, translated -> {
+                        if (translated != null) {
+                            attachments.get(position).translation = translated;
+                            binding.mediaDescriptionTranslated.setText(translated);
+                            binding.mediaDescriptionTranslated.setVisibility(View.VISIBLE);
+                            binding.mediaDescription.setVisibility(View.GONE);
+                        } else {
+                            Toasty.error(MediaActivity.this, getString(R.string.toast_error_translate), Toast.LENGTH_LONG).show();
                         }
                     });
                 });
@@ -277,18 +216,23 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
                 }
             }
         });
-
-
         setFullscreen(true);
-        Display display = getWindowManager().getDefaultDisplay();
-        Point size = new Point();
-        display.getSize(size);
-        int screenHeight = size.y;
-        minTouch = (int) (screenHeight * 0.1);
-        maxTouch = (int) (screenHeight * 0.9);
-
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent event) {
+        try {
+            return super.dispatchTouchEvent(event);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+
+    public void toogleFullScreen() {
+        fullscreen = !fullscreen;
+        setFullscreen(fullscreen);
+    }
 
     @Override
     public boolean onCreateOptionsMenu(@NonNull Menu menu) {
@@ -306,8 +250,17 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             int position = binding.mediaViewpager.getCurrentItem();
             Attachment attachment = attachments.get(position);
             if (Build.VERSION.SDK_INT >= 23) {
-                if (ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                    ActivityCompat.requestPermissions(MediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE);
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+                    if (ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                        ActivityCompat.requestPermissions(MediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE);
+                    } else {
+                        if (attachment.type.compareTo("image") == 0) {
+                            MediaHelper.manageMove(MediaActivity.this, attachment.url, false);
+                        } else {
+                            MediaHelper.manageDownloadsNoPopup(MediaActivity.this, attachment.url);
+                            downloadID = -1;
+                        }
+                    }
                 } else {
                     if (attachment.type.compareTo("image") == 0) {
                         MediaHelper.manageMove(MediaActivity.this, attachment.url, false);
@@ -369,67 +322,38 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
         }
     }
 
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent event) {
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                startX = event.getX();
-                startY = event.getY();
-                break;
-            case MotionEvent.ACTION_UP:
-                float endX = event.getX();
-                float endY = event.getY();
-                if (endY > minTouch && endY < maxTouch && isAClick(startX, endX, startY, endY)) {
-                    setFullscreen(!fullscreen);
-                    if (!fullscreen) {
-                        String description = attachments.get(binding.mediaViewpager.getCurrentItem()).description;
-                        if (handler != null) {
-                            handler.removeCallbacksAndMessages(null);
-                        }
-                        handler = new Handler();
-                        if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) {
-                            binding.mediaDescription.setText(description);
-                            if (attachments.get(binding.mediaViewpager.getCurrentItem()).translation != null) {
-                                binding.mediaDescription.setVisibility(View.GONE);
-                                binding.mediaDescriptionTranslated.setText(attachments.get(binding.mediaViewpager.getCurrentItem()).translation);
-                                binding.mediaDescriptionTranslated.setVisibility(View.VISIBLE);
-                            } else {
-                                binding.mediaDescription.setVisibility(View.VISIBLE);
-                                binding.mediaDescriptionTranslated.setVisibility(View.GONE);
-                            }
-                        } else {
-                            binding.translate.setVisibility(View.GONE);
-                            binding.originalMessage.setVisibility(View.INVISIBLE);
-                            binding.mediaDescriptionTranslated.setVisibility(View.GONE);
-                            binding.mediaDescription.setVisibility(View.GONE);
-                        }
-                    } else {
-                        binding.originalMessage.setVisibility(View.INVISIBLE);
-                        binding.translate.setVisibility(View.GONE);
-                        binding.mediaDescriptionTranslated.setVisibility(View.GONE);
-                        binding.mediaDescription.setVisibility(View.GONE);
-                    }
+    private void toggleScreenContain(boolean fullscreen) {
+        if (!fullscreen) {
+            String description = attachments.get(binding.mediaViewpager.getCurrentItem()).description;
+            if (description != null && description.trim().length() > 0 && description.trim().compareTo("null") != 0) {
+                binding.mediaDescription.setText(description);
+                if (attachments.get(binding.mediaViewpager.getCurrentItem()).translation != null) {
+                    binding.mediaDescription.setVisibility(View.GONE);
+                    binding.mediaDescriptionTranslated.setText(attachments.get(binding.mediaViewpager.getCurrentItem()).translation);
+                    binding.mediaDescriptionTranslated.setVisibility(View.VISIBLE);
+                } else {
+                    binding.mediaDescription.setVisibility(View.VISIBLE);
+                    binding.mediaDescriptionTranslated.setVisibility(View.GONE);
                 }
-                break;
+            } else {
+                binding.translate.setVisibility(View.GONE);
+                if (status != null) {
+                    binding.originalMessage.setVisibility(View.VISIBLE);
+                } else {
+                    binding.originalMessage.setVisibility(View.INVISIBLE);
+                }
+                binding.mediaDescriptionTranslated.setVisibility(View.GONE);
+                binding.mediaDescription.setVisibility(View.GONE);
+            }
+        } else {
+            binding.originalMessage.setVisibility(View.INVISIBLE);
+            binding.translate.setVisibility(View.GONE);
+            binding.mediaDescriptionTranslated.setVisibility(View.GONE);
+            binding.mediaDescription.setVisibility(View.GONE);
         }
-        try {
-            return super.dispatchTouchEvent(event);
-        } catch (IllegalArgumentException ex) {
-            ex.printStackTrace();
-        }
-        return false;
-
     }
 
 
-    private boolean isAClick(float startX, float endX, float startY, float endY) {
-        float differenceX = Math.abs(startX - endX);
-        float differenceY = Math.abs(startY - endY);
-        int CLICK_ACTION_THRESHOLD = 200;
-        return !(differenceX > CLICK_ACTION_THRESHOLD/* =5 */ || differenceY > CLICK_ACTION_THRESHOLD);
-    }
-
     @Override
     public void onDestroy() {
         unregisterReceiver(onDownloadComplete);
@@ -451,6 +375,15 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
         super.onPostResume();
     }
 
+    // Shows the system bars by removing all the flags
+    // except for the ones that make the content appear under the system bars.
+    private void showSystemUI() {
+        View decorView = getWindow().getDecorView();
+        decorView.setSystemUiVisibility(flags |
+                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+    }
 
     public boolean getFullScreen() {
         return this.fullscreen;
@@ -462,15 +395,16 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             showSystemUI();
             binding.mediaDescription.setVisibility(View.VISIBLE);
             binding.translate.setVisibility(View.VISIBLE);
-            if (status != null) {
+            if (mediaFromProfile) {
                 binding.originalMessage.setVisibility(View.VISIBLE);
             }
         } else {
+            hideSystemUI();
             binding.mediaDescription.setVisibility(View.GONE);
             binding.translate.setVisibility(View.GONE);
             binding.originalMessage.setVisibility(View.INVISIBLE);
-            hideSystemUI();
         }
+        toggleScreenContain(fullscreen);
     }
 
     private void hideSystemUI() {
@@ -490,16 +424,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
                         | View.SYSTEM_UI_FLAG_FULLSCREEN);
     }
 
-    // Shows the system bars by removing all the flags
-    // except for the ones that make the content appear under the system bars.
-    private void showSystemUI() {
-        View decorView = getWindow().getDecorView();
-        decorView.setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-    }
-
     public FragmentMedia getCurrentFragment() {
         return mCurrentFragment;
     }

app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,7 +16,6 @@ package app.fedilab.android.activities;
 
 
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
@@ -25,7 +24,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 
 import java.util.ArrayList;
@@ -33,29 +31,27 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.databinding.ActivityPartnershipBinding;
-import app.fedilab.android.helper.CrossActionHelper;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.helper.CrossActionHelper;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
 
 
-public class PartnerShipActivity extends BaseActivity {
+public class PartnerShipActivity extends BaseBarActivity {
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         ActivityPartnershipBinding binding = ActivityPartnershipBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         TextView about_partnership = findViewById(R.id.about_partnership);
@@ -65,9 +61,8 @@ public class PartnerShipActivity extends BaseActivity {
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://masto.host"));
             startActivity(browserIntent);
         });
-        binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(PartnerShipActivity.this));
         setTitle(R.string.action_partnership);
-        binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
+        binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
         CrossActionHelper.fetchRemoteAccount(PartnerShipActivity.this, "@mastohost@mastodon.social", new CrossActionHelper.Callback() {
             @Override
             public void federatedStatus(Status status) {
@@ -98,7 +93,7 @@ public class PartnerShipActivity extends BaseActivity {
                                 if (relationShips != null && relationShips.size() > 0) {
                                     if (!relationShips.get(0).following) {
                                         binding.accountFollow.setVisibility(View.VISIBLE);
-                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false)
+                                        binding.accountFollow.setOnClickListener(v -> accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false, null)
                                                 .observe(PartnerShipActivity.this, relationShip -> binding.accountFollow.setVisibility(View.GONE)));
                                     }
                                 }

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

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -25,7 +25,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
-import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -34,6 +34,7 @@ import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.UnderlineSpan;
 import android.util.TypedValue;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -48,6 +49,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
@@ -59,6 +61,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.tabs.TabLayout;
 
 import java.lang.ref.WeakReference;
@@ -73,31 +76,35 @@ import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.Field;
-import app.fedilab.android.client.entities.api.IdentityProof;
-import app.fedilab.android.client.entities.api.MastodonList;
-import app.fedilab.android.client.entities.api.RelationShip;
-import app.fedilab.android.client.entities.app.Pinned;
-import app.fedilab.android.client.entities.app.PinnedTimeline;
-import app.fedilab.android.client.entities.app.RemoteInstance;
-import app.fedilab.android.client.entities.app.Timeline;
-import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityProfileBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.CrossActionHelper;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.SpannableHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.FieldAdapter;
-import app.fedilab.android.ui.drawer.IdentityProofsAdapter;
-import app.fedilab.android.ui.pageadapter.FedilabProfileTLPageAdapter;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
-import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;
-import app.fedilab.android.viewmodel.mastodon.ReorderVM;
-import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
+import app.fedilab.android.databinding.NotificationsRelatedAccountsBinding;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.FamiliarFollowers;
+import app.fedilab.android.mastodon.client.entities.api.Field;
+import app.fedilab.android.mastodon.client.entities.api.IdentityProof;
+import app.fedilab.android.mastodon.client.entities.api.MastodonList;
+import app.fedilab.android.mastodon.client.entities.api.RelationShip;
+import app.fedilab.android.mastodon.client.entities.app.Languages;
+import app.fedilab.android.mastodon.client.entities.app.Pinned;
+import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
+import app.fedilab.android.mastodon.client.entities.app.RemoteInstance;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.client.entities.app.WellKnownNodeinfo;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.CrossActionHelper;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.helper.SpannableHelper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.ui.drawer.FieldAdapter;
+import app.fedilab.android.mastodon.ui.drawer.IdentityProofsAdapter;
+import app.fedilab.android.mastodon.ui.pageadapter.FedilabProfileTLPageAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM;
 import es.dmoral.toasty.Toasty;
 
 
@@ -105,6 +112,7 @@ public class ProfileActivity extends BaseActivity {
 
 
     private RelationShip relationship;
+    private FamiliarFollowers familiarFollowers;
     private Account account;
     private ScheduledExecutorService scheduledExecutorService;
     private action doAction;
@@ -116,7 +124,6 @@ public class ProfileActivity extends BaseActivity {
     private String mention_str;
     private WellKnownNodeinfo.NodeInfo nodeInfo;
     private boolean checkRemotely;
-
     private final BroadcastReceiver broadcast_data = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -131,11 +138,12 @@ public class ProfileActivity extends BaseActivity {
             }
         }
     };
+    private boolean homeMuted;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityProfileBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
@@ -143,28 +151,30 @@ public class ProfileActivity extends BaseActivity {
         Bundle b = getIntent().getExtras();
         binding.accountFollow.setEnabled(false);
         checkRemotely = false;
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        homeMuted = false;
         if (b != null) {
             account = (Account) b.getSerializable(Helper.ARG_ACCOUNT);
             account_id = b.getString(Helper.ARG_USER_ID, null);
             mention_str = b.getString(Helper.ARG_MENTION, null);
             checkRemotely = b.getBoolean(Helper.ARG_CHECK_REMOTELY, false);
         }
-        postponeEnterTransition();
-
+        if (!checkRemotely) {
+            checkRemotely = sharedpreferences.getBoolean(getString(R.string.SET_PROFILE_REMOTELY), false);
+        }
+        ActivityCompat.postponeEnterTransition(ProfileActivity.this);
         //Remove title
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
         float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);
         binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);
-        binding.toolbar.setPopupTheme(Helper.popupStyle());
         accountsVM = new ViewModelProvider(ProfileActivity.this).get(AccountsVM.class);
         if (account != null) {
             initializeView(account);
@@ -187,9 +197,35 @@ public class ProfileActivity extends BaseActivity {
             Toasty.error(ProfileActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
             finish();
         }
+        //Check if account is homeMuted
+        accountsVM.isMuted(currentAccount, account).observe(this, result -> homeMuted = result != null && result);
         LocalBroadcastManager.getInstance(ProfileActivity.this).registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA));
     }
 
+
+    private void updateViewWithNewData(Account account) {
+        if (account != null) {
+            if (account.role != null && account.role.highlighted) {
+                binding.accountRole.setText(account.role.name);
+                binding.accountRole.setVisibility(View.VISIBLE);
+            }
+            if (binding.accountTabLayout.getTabCount() > 2) {
+                TabLayout.Tab statusTab = binding.accountTabLayout.getTabAt(0);
+                TabLayout.Tab followingTab = binding.accountTabLayout.getTabAt(1);
+                TabLayout.Tab followerTab = binding.accountTabLayout.getTabAt(2);
+                if (statusTab != null) {
+                    statusTab.setText(getString(R.string.status_cnt, Helper.withSuffix(account.statuses_count)));
+                }
+                if (followingTab != null) {
+                    followingTab.setText(getString(R.string.following_cnt, Helper.withSuffix(account.following_count)));
+                }
+                if (followerTab != null) {
+                    followerTab.setText(getString(R.string.followers_cnt, Helper.withSuffix(account.followers_count)));
+                }
+            }
+        }
+    }
+
     private void initializeView(Account account) {
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ProfileActivity.this);
         if (account == null) {
@@ -226,6 +262,13 @@ public class ProfileActivity extends BaseActivity {
                 updateAccount();
             }
         });
+        accountsVM.getFamiliarFollowers(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountListToCheck).observe(ProfileActivity.this, familiarFollowersList -> {
+            if (familiarFollowersList != null && familiarFollowersList.size() > 0) {
+                this.familiarFollowers = familiarFollowersList.get(0);
+                updateAccount();
+            }
+        });
+
         //Retrieve identity proofs
         accountsVM.getIdentityProofs(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id).observe(ProfileActivity.this, identityProofs -> {
             this.identityProofList = identityProofs;
@@ -263,10 +306,9 @@ public class ProfileActivity extends BaseActivity {
             public void onTabReselected(TabLayout.Tab tab) {
             }
         });
-        binding.accountTabLayout.setTabTextColors(ThemeHelper.getAttColor(ProfileActivity.this, R.attr.mTextColor), ContextCompat.getColor(ProfileActivity.this, R.color.cyanea_accent_dark_reference));
-        binding.accountTabLayout.setTabIconTint(ThemeHelper.getColorStateList(ProfileActivity.this));
         boolean disableGif = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_GIF), false);
         String targetedUrl = disableGif ? account.avatar_static : account.avatar;
+        // MastodonHelper.loadPPMastodon(binding.accountPp, account);
         Glide.with(ProfileActivity.this)
                 .asDrawable()
                 .dontTransform()
@@ -275,23 +317,32 @@ public class ProfileActivity extends BaseActivity {
                             @Override
                             public void onResourceReady(@NonNull final Drawable resource, Transition<? super Drawable> transition) {
                                 binding.profilePicture.setImageDrawable(resource);
-                                startPostponedEnterTransition();
+                                binding.accountPp.setImageDrawable(resource);
+                                if (resource instanceof Animatable) {
+                                    binding.profilePicture.animate();
+                                    binding.accountPp.animate();
+                                    ((Animatable) resource).start();
+                                }
+                                ActivityCompat.startPostponedEnterTransition(ProfileActivity.this);
                             }
 
                             @Override
                             public void onLoadFailed(@Nullable Drawable errorDrawable) {
                                 binding.profilePicture.setImageResource(R.drawable.ic_person);
-                                startPostponedEnterTransition();
+                                binding.accountPp.setImageResource(R.drawable.ic_person);
+                                ActivityCompat.startPostponedEnterTransition(ProfileActivity.this);
                             }
 
                             @Override
                             public void onLoadCleared(@Nullable Drawable placeholder) {
-
+                                binding.profilePicture.setImageResource(R.drawable.ic_person);
+                                binding.accountPp.setImageResource(R.drawable.ic_person);
+                                ActivityCompat.startPostponedEnterTransition(ProfileActivity.this);
                             }
                         }
                 );
         //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) {
@@ -314,7 +365,7 @@ public class ProfileActivity extends BaseActivity {
 
         final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(ProfileActivity.this, R.color.cyanea_accent_reference)), 0, content.length(),
+        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         binding.warningMessage.setText(content);
         binding.warningMessage.setOnClickListener(view -> {
@@ -346,7 +397,6 @@ public class ProfileActivity extends BaseActivity {
         else
             binding.warningContainer.setVisibility(View.GONE);
 
-        binding.openRemoteProfile.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(ProfileActivity.this));
         if (checkRemotely) {
             binding.openRemoteProfile.setVisibility(View.GONE);
         }
@@ -392,7 +442,7 @@ public class ProfileActivity extends BaseActivity {
                 TextView.BufferType.SPANNABLE);
         binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance());
 
-        MastodonHelper.loadPPMastodon(binding.accountPp, account);
+
         binding.accountPp.setOnClickListener(v -> {
             Intent intent = new Intent(ProfileActivity.this, MediaActivity.class);
             Bundle b = new Bundle();
@@ -419,7 +469,7 @@ public class ProfileActivity extends BaseActivity {
                 Toasty.info(ProfileActivity.this, getString(R.string.nothing_to_do), Toast.LENGTH_LONG).show();
             } else if (doAction == action.FOLLOW) {
                 binding.accountFollow.setEnabled(false);
-                accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false)
+                accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false, null)
                         .observe(ProfileActivity.this, relationShip -> {
                             this.relationship = relationShip;
                             updateAccount();
@@ -427,7 +477,7 @@ public class ProfileActivity extends BaseActivity {
             } else if (doAction == action.UNFOLLOW) {
                 boolean confirm_unfollow = sharedpreferences.getBoolean(getString(R.string.SET_UNFOLLOW_VALIDATION), true);
                 if (confirm_unfollow) {
-                    AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+                    AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(ProfileActivity.this);
                     unfollowConfirm.setTitle(getString(R.string.unfollow_confirm));
                     unfollowConfirm.setMessage(account.acct);
                     unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -483,16 +533,19 @@ public class ProfileActivity extends BaseActivity {
                 binding.instanceInfo.setVisibility(View.VISIBLE);
 
                 binding.instanceInfo.setOnClickListener(v -> {
-                    Intent intent = new Intent(ProfileActivity.this, InstanceProfileActivity.class);
+                    InstanceProfileActivity instanceProfileActivity = new InstanceProfileActivity();
                     Bundle b = new Bundle();
                     b.putString(Helper.ARG_INSTANCE, finalAccountInstance);
-                    intent.putExtras(b);
-                    startActivity(intent);
-
+                    instanceProfileActivity.setArguments(b);
+                    instanceProfileActivity.show(getSupportFragmentManager(), null);
                 });
             }
         });
-
+        if (accountInstance != null && !accountInstance.equalsIgnoreCase(MainActivity.currentInstance)) {
+            accountsVM.lookUpAccount(accountInstance, account.username).observe(ProfileActivity.this, this::updateViewWithNewData);
+        } else if (accountInstance != null && accountInstance.equalsIgnoreCase(MainActivity.currentInstance)) {
+            updateViewWithNewData(account);
+        }
     }
 
 
@@ -512,7 +565,7 @@ public class ProfileActivity extends BaseActivity {
             //Recyclerview for identity proof has not been inflated yet
             if (identityProofsRecycler == null) {
                 identity_proofs_indicator.setOnClickListener(v -> {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+                    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ProfileActivity.this);
                     identityProofsRecycler = new RecyclerView(ProfileActivity.this);
                     LinearLayoutManager mLayoutManager = new LinearLayoutManager(ProfileActivity.this);
                     identityProofsRecycler.setLayoutManager(mLayoutManager);
@@ -526,13 +579,33 @@ public class ProfileActivity extends BaseActivity {
                 });
             }
         }
-        binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(ProfileActivity.this));
+
+        if (familiarFollowers != null && familiarFollowers.accounts != null && familiarFollowers.accounts.size() > 0) {
+            binding.relatedAccounts.removeAllViews();
+            for (Account account : familiarFollowers.accounts) {
+                NotificationsRelatedAccountsBinding notificationsRelatedAccountsBinding = NotificationsRelatedAccountsBinding.inflate(LayoutInflater.from(ProfileActivity.this));
+                MastodonHelper.loadProfileMediaMastodonRound(ProfileActivity.this, notificationsRelatedAccountsBinding.profilePicture, account);
+                notificationsRelatedAccountsBinding.acc.setText(account.username);
+                notificationsRelatedAccountsBinding.relatedAccountContainer.setOnClickListener(v -> {
+                    Intent intent = new Intent(ProfileActivity.this, ProfileActivity.class);
+                    Bundle b = new Bundle();
+                    b.putSerializable(Helper.ARG_ACCOUNT, account);
+                    intent.putExtras(b);
+                    ActivityOptionsCompat options = ActivityOptionsCompat
+                            .makeSceneTransitionAnimation(ProfileActivity.this, notificationsRelatedAccountsBinding.profilePicture, getString(R.string.activity_porfile_pp));
+                    // start the new activity
+                    startActivity(intent, options.toBundle());
+                });
+                binding.relatedAccounts.addView(notificationsRelatedAccountsBinding.getRoot());
+            }
+            binding.familiarFollowers.setVisibility(View.VISIBLE);
+        }
 
         binding.accountFollow.setEnabled(true);
         //Visibility depending of the relationship
         if (relationship != null) {
             if (relationship.blocked_by) {
-                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
+                binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
                 binding.accountFollow.setVisibility(View.VISIBLE);
                 binding.accountFollow.setEnabled(false);
                 binding.accountFollow.setContentDescription(getString(R.string.action_disabled));
@@ -540,7 +613,7 @@ public class ProfileActivity extends BaseActivity {
 
             if (relationship.requested) {
                 binding.accountFollowRequest.setVisibility(View.VISIBLE);
-                binding.accountFollow.setImageResource(R.drawable.ic_baseline_hourglass_full_24);
+                binding.accountFollow.setIconResource(R.drawable.ic_baseline_hourglass_full_24);
                 binding.accountFollow.setVisibility(View.VISIBLE);
                 binding.accountFollow.setContentDescription(getString(R.string.follow_request));
                 doAction = action.UNFOLLOW;
@@ -551,19 +624,19 @@ public class ProfileActivity extends BaseActivity {
                 binding.accountFollowedBy.setVisibility(View.GONE);
             }
             if (relationship.following) {
-                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_remove_24);
-                binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));
+                binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_remove_24);
+                binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(this, R.attr.colorError)));
                 doAction = action.UNFOLLOW;
                 binding.accountFollow.setContentDescription(getString(R.string.action_unfollow));
                 binding.accountFollow.setVisibility(View.VISIBLE);
             } else if (relationship.blocking) {
-                binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));
-                binding.accountFollow.setImageResource(R.drawable.ic_baseline_lock_open_24);
+                binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ThemeHelper.getAttColor(this, R.attr.colorError)));
+                binding.accountFollow.setIconResource(R.drawable.ic_baseline_lock_open_24);
                 doAction = action.UNBLOCK;
                 binding.accountFollow.setVisibility(View.VISIBLE);
                 binding.accountFollow.setContentDescription(getString(R.string.action_unblock));
             } else {
-                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
+                binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
                 doAction = action.FOLLOW;
                 binding.accountFollow.setVisibility(View.VISIBLE);
                 binding.accountFollow.setContentDescription(getString(R.string.action_follow));
@@ -575,21 +648,20 @@ public class ProfileActivity extends BaseActivity {
                 binding.headerEditProfile.setVisibility(View.VISIBLE);
                 binding.headerEditProfile.bringToFront();
             }
-            binding.headerEditProfile.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(ProfileActivity.this));
             if (!relationship.following) {
                 binding.accountNotification.setVisibility(View.GONE);
             } else {
                 binding.accountNotification.setVisibility(View.VISIBLE);
             }
             if (relationship.notifying) {
-                binding.accountNotification.setImageResource(R.drawable.ic_baseline_notifications_active_24);
+                binding.accountNotification.setIconResource(R.drawable.ic_baseline_notifications_active_24);
             } else {
-                binding.accountNotification.setImageResource(R.drawable.ic_baseline_notifications_off_24);
+                binding.accountNotification.setIconResource(R.drawable.ic_baseline_notifications_off_24);
             }
             binding.accountNotification.setOnClickListener(v -> {
                 if (relationship != null && relationship.following) {
                     relationship.notifying = !relationship.notifying;
-                    accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, relationship.showing_reblogs, relationship.notifying)
+                    accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, relationship.showing_reblogs, relationship.notifying, relationship.languages)
                             .observe(ProfileActivity.this, relationShip -> {
                                 this.relationship = relationShip;
                                 updateAccount();
@@ -603,7 +675,7 @@ public class ProfileActivity extends BaseActivity {
                 binding.personalNote.setText(relationship.note);
             }
             binding.personalNote.setOnClickListener(view -> {
-                AlertDialog.Builder builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
                 builderInner.setTitle(R.string.note_for_account);
                 EditText input = new EditText(ProfileActivity.this);
                 LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
@@ -654,9 +726,12 @@ public class ProfileActivity extends BaseActivity {
                 menu.findItem(R.id.action_endorse).setVisible(false);
                 menu.findItem(R.id.action_direct_message).setVisible(false);
                 menu.findItem(R.id.action_add_to_list).setVisible(false);
+                menu.findItem(R.id.action_mute_home).setVisible(false);
+                menu.findItem(R.id.action_subscribed_language).setVisible(false);
             } else {
                 menu.findItem(R.id.action_block).setVisible(true);
                 menu.findItem(R.id.action_mute).setVisible(true);
+                menu.findItem(R.id.action_mute_home).setVisible(true);
                 menu.findItem(R.id.action_timed_mute).setVisible(true);
                 menu.findItem(R.id.action_mention).setVisible(true);
             }
@@ -665,6 +740,8 @@ public class ProfileActivity extends BaseActivity {
                 if (!relationship.following) {
                     menu.findItem(R.id.action_hide_boost).setVisible(false);
                     menu.findItem(R.id.action_endorse).setVisible(false);
+                    menu.findItem(R.id.action_mute_home).setVisible(false);
+                    menu.findItem(R.id.action_subscribed_language).setVisible(false);
                 }
                 if (relationship.blocking) {
                     menu.findItem(R.id.action_block).setTitle(R.string.action_unblock);
@@ -682,6 +759,11 @@ public class ProfileActivity extends BaseActivity {
                 } else {
                     menu.findItem(R.id.action_hide_boost).setTitle(getString(R.string.show_boost, account.username));
                 }
+                if (homeMuted) {
+                    menu.findItem(R.id.action_mute_home).setTitle(getString(R.string.unmute_home));
+                } else {
+                    menu.findItem(R.id.action_mute_home).setTitle(getString(R.string.mute_home));
+                }
             }
         }
         return true;
@@ -754,6 +836,10 @@ public class ProfileActivity extends BaseActivity {
                 pinnedTimeline.type = Timeline.TimeLineEnum.REMOTE;
                 pinnedTimeline.position = pinned.pinnedTimelines.size();
                 pinned.pinnedTimelines.add(pinnedTimeline);
+                if (pinned.instance == null || pinned.user_id == null) {
+                    pinned.instance = MainActivity.currentInstance;
+                    pinned.user_id = MainActivity.currentUserID;
+                }
                 Pinned finalPinned = pinned;
                 boolean finalPresent = present;
                 new Thread(() -> {
@@ -778,7 +864,7 @@ public class ProfileActivity extends BaseActivity {
             });
             return true;
         } else if (itemId == R.id.action_filter) {
-            AlertDialog.Builder filterTagDialog = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder filterTagDialog = new MaterialAlertDialogBuilder(ProfileActivity.this);
             Set<String> featuredTagsSet = sharedpreferences.getStringSet(getString(R.string.SET_FEATURED_TAGS), null);
             List<String> tags = new ArrayList<>();
             if (featuredTagsSet != null) {
@@ -819,13 +905,70 @@ public class ProfileActivity extends BaseActivity {
                             .observe(ProfileActivity.this, relationShip -> this.relationship = relationShip);
                 }
             return true;
+        } else if (itemId == R.id.action_subscribed_language) {
+            if (relationship != null) {
+                List<String> subscribedLanguages = relationship.languages;
+                Set<String> storedLanguages = sharedpreferences.getStringSet(getString(R.string.SET_SELECTED_LANGUAGE), null);
+                List<Languages.Language> languages = Languages.get(ProfileActivity.this);
+                if (languages == null) {
+                    return true;
+                }
+                String[] codesArr;
+                String[] languagesArr;
+                boolean[] presentArr;
+                if (storedLanguages != null && storedLanguages.size() > 0) {
+                    int i = 0;
+                    codesArr = new String[storedLanguages.size()];
+                    languagesArr = new String[storedLanguages.size()];
+                    presentArr = new boolean[storedLanguages.size()];
+                    for (String code : storedLanguages) {
+                        for (Languages.Language language : languages) {
+                            if (language.code.equalsIgnoreCase(code)) {
+                                languagesArr[i] = language.language;
+                            }
+                        }
+                        codesArr[i] = code;
+                        presentArr[i] = subscribedLanguages != null && subscribedLanguages.contains(code);
+                        i++;
+                    }
+                } else {
+                    codesArr = new String[languages.size()];
+                    presentArr = new boolean[languages.size()];
+                    languagesArr = new String[languages.size()];
+                    int i = 0;
+                    for (Languages.Language language : languages) {
+                        codesArr[i] = language.code;
+                        languagesArr[i] = language.language;
+                        if (subscribedLanguages != null && subscribedLanguages.contains(language.code)) {
+                            presentArr[i] = true;
+                        }
+                        i++;
+                    }
+                }
+                AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ProfileActivity.this);
+                builder.setTitle(getString(R.string.filter_languages));
+                builder.setMultiChoiceItems(languagesArr, presentArr, (dialog, which, isChecked) -> {
+                    List<String> languagesFilter = new ArrayList<>();
+                    for (int i = 0; i < codesArr.length; i++) {
+                        if (presentArr[i]) {
+                            languagesFilter.add(codesArr[i]);
+                        }
+                    }
+
+                    accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, relationship.showing_reblogs, relationship.notifying, languagesFilter)
+                            .observe(ProfileActivity.this, relationShip -> this.relationship = relationShip);
+                });
+                builder.setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss());
+                builder.create().show();
+            }
+            return true;
         } else if (itemId == R.id.action_hide_boost) {
             if (relationship != null)
                 if (relationship.showing_reblogs) {
-                    accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, false, relationship.notifying)
+                    accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, false, relationship.notifying, relationship.languages)
                             .observe(ProfileActivity.this, relationShip -> this.relationship = relationShip);
                 } else {
-                    accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, relationship.notifying)
+                    accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, relationship.notifying, relationship.languages)
                             .observe(ProfileActivity.this, relationShip -> this.relationship = relationShip);
                 }
             return true;
@@ -847,7 +990,7 @@ public class ProfileActivity extends BaseActivity {
                         }
                         accountsVM.getListContainingAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)
                                 .observe(ProfileActivity.this, mastodonListUserIs -> {
-                                    AlertDialog.Builder builderSingle = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+                                    AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(ProfileActivity.this);
                                     builderSingle.setTitle(getString(R.string.action_lists_add_to));
                                     builderSingle.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss());
                                     String[] listsId = new String[mastodonLists.size()];
@@ -870,18 +1013,22 @@ public class ProfileActivity extends BaseActivity {
                                     }
                                     builderSingle.setMultiChoiceItems(listsArray, presentArray, (dialog, which, isChecked) -> {
                                         if (relationship == null || !relationship.following) {
-                                            accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false)
+                                            accountsVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, true, false, null)
                                                     .observe(ProfileActivity.this, newRelationShip -> {
-                                                        relationship = newRelationShip;
-                                                        updateAccount();
-                                                        if (isChecked) {
-                                                            timelinesVM.addAccountsList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, listsId[which], userIds).observe(ProfileActivity.this, success -> {
-                                                                if (success == null || !success) {
-                                                                    Toasty.error(ProfileActivity.this, getString(R.string.toast_error_add_to_list), Toast.LENGTH_LONG).show();
-                                                                }
-                                                            });
+                                                        if (newRelationShip != null) {
+                                                            relationship = newRelationShip;
+                                                            updateAccount();
+                                                            if (isChecked) {
+                                                                timelinesVM.addAccountsList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, listsId[which], userIds).observe(ProfileActivity.this, success -> {
+                                                                    if (success == null || !success) {
+                                                                        Toasty.error(ProfileActivity.this, getString(R.string.toast_error_add_to_list), Toast.LENGTH_LONG).show();
+                                                                    }
+                                                                });
+                                                            } else {
+                                                                timelinesVM.deleteAccountsList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, listsId[which], userIds);
+                                                            }
                                                         } else {
-                                                            timelinesVM.deleteAccountsList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, listsId[which], userIds);
+                                                            Toasty.error(ProfileActivity.this, getString(R.string.toast_error_add_to_list), Toast.LENGTH_LONG).show();
                                                         }
                                                     });
                                         } else {
@@ -935,17 +1082,15 @@ public class ProfileActivity extends BaseActivity {
                             });
                     return true;
                 }
-                builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+                builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
                 builderInner.setTitle(stringArrayConf[0]);
 
                 builderInner.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-                builderInner.setNegativeButton(R.string.keep_notifications, (dialog, which) -> {
-                    accountsVM.mute(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, target, false, 0)
-                            .observe(ProfileActivity.this, relationShip -> {
-                                this.relationship = relationShip;
-                                updateAccount();
-                            });
-                });
+                builderInner.setNegativeButton(R.string.keep_notifications, (dialog, which) -> accountsVM.mute(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, target, false, 0)
+                        .observe(ProfileActivity.this, relationShip -> {
+                            this.relationship = relationShip;
+                            updateAccount();
+                        }));
                 builderInner.setPositiveButton(R.string.action_mute, (dialog, which) -> {
                     accountsVM.mute(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, target, true, 0)
                             .observe(ProfileActivity.this, relationShip -> {
@@ -956,6 +1101,28 @@ public class ProfileActivity extends BaseActivity {
                 });
                 builderInner.show();
             }
+        } else if (itemId == R.id.action_mute_home) {
+            AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
+            builderInner.setMessage(account.acct);
+            builderInner.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+            if (homeMuted) {
+                builderInner.setTitle(R.string.unmute_home);
+                builderInner.setPositiveButton(R.string.action_unmute, (dialog, which) -> accountsVM.unmuteHome(currentAccount, account)
+                        .observe(ProfileActivity.this, account -> {
+                            homeMuted = false;
+                            invalidateOptionsMenu();
+                            Toasty.info(ProfileActivity.this, getString(R.string.toast_unmute), Toasty.LENGTH_LONG).show();
+                        }));
+            } else {
+                builderInner.setTitle(R.string.mute_home);
+                builderInner.setPositiveButton(R.string.action_mute, (dialog, which) -> accountsVM.muteHome(currentAccount, account)
+                        .observe(ProfileActivity.this, account -> {
+                            homeMuted = true;
+                            invalidateOptionsMenu();
+                            Toasty.info(ProfileActivity.this, getString(R.string.toast_mute), Toasty.LENGTH_LONG).show();
+                        }));
+            }
+            builderInner.show();
         } else if (itemId == R.id.action_timed_mute) {
             MastodonHelper.scheduleBoost(ProfileActivity.this, MastodonHelper.ScheduleType.TIMED_MUTED, null, account, rs -> {
                 this.relationship = rs;
@@ -963,7 +1130,7 @@ public class ProfileActivity extends BaseActivity {
             });
             return true;
         } else if (itemId == R.id.action_report) {
-            AlertDialog.Builder builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
             builderInner.setTitle(R.string.report_account);
             //Text for report
             EditText input = new EditText(ProfileActivity.this);
@@ -983,7 +1150,7 @@ public class ProfileActivity extends BaseActivity {
             builderInner.show();
             return true;
         } else if (itemId == R.id.action_block) {
-            AlertDialog.Builder builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
             if (relationship != null) {
                 if (relationship.blocking) {
                     builderInner.setTitle(stringArrayConf[5]);
@@ -1023,7 +1190,7 @@ public class ProfileActivity extends BaseActivity {
             });
             builderInner.show();
         } else if (itemId == R.id.action_block_instance) {
-            AlertDialog.Builder builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
             String domain = account.acct.split("@")[1];
             builderInner.setMessage(getString(R.string.block_domain_confirm_message, domain));
             builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());

app/src/main/java/app/fedilab/android/mastodon/activities/ProxyActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,39 +15,44 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
+import android.app.Dialog;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.view.MenuItem;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
+import android.view.Window;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import androidx.preference.PreferenceManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivityProxyBinding;
 
 
-public class ProxyActivity extends BaseActivity {
+public class ProxyActivity extends DialogFragment {
 
     private ActivityProxyBinding binding;
     private int position;
 
+    @NonNull
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ProxyActivity.this);
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
         binding = ActivityProxyBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        if (getSupportActionBar() != null)
-            getSupportActionBar().hide();
+
+        MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(requireContext());
+        materialAlertDialogBuilder.setView(binding.getRoot());
+
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
 
         //Enable proxy
         boolean enable_proxy = sharedpreferences.getBoolean(getString(R.string.SET_PROXY_ENABLED), false);
         binding.enableProxy.setChecked(enable_proxy);
-        position = 0;
+        position = sharedpreferences.getInt(getString(R.string.SET_PROXY_TYPE), 0);
         String hostVal = sharedpreferences.getString(getString(R.string.SET_PROXY_HOST), "127.0.0.1");
         int portVal = sharedpreferences.getInt(getString(R.string.SET_PROXY_PORT), 8118);
         final String login = sharedpreferences.getString(getString(R.string.SET_PROXY_LOGIN), null);
@@ -62,22 +67,17 @@ public class ProxyActivity extends BaseActivity {
         if (pwd != null && binding.proxyPassword.length() > 0) {
             binding.proxyPassword.setText(pwd);
         }
-        ArrayAdapter<CharSequence> adapterTrans = ArrayAdapter.createFromResource(ProxyActivity.this,
-                R.array.proxy_type_choice, android.R.layout.simple_spinner_dropdown_item);
-        binding.type.setAdapter(adapterTrans);
-        binding.type.setSelection(sharedpreferences.getInt(getString(R.string.SET_PROXY_TYPE), 0), false);
-        binding.type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int p, long id) {
-                position = p;
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
+        if (position == 1) binding.protocol.check(R.id.protocol_socks);
+        binding.protocol.addOnButtonCheckedListener((group, checkedId, isChecked) -> {
+            if (isChecked) {
+                if (checkedId == R.id.protocol_http)
+                    position = 0;
+                else
+                    position = 1;
             }
         });
-        binding.setProxySave.setOnClickListener(view -> {
+
+        materialAlertDialogBuilder.setPositiveButton(R.string.save, (dialog1, which) -> {
             String hostVal1 = binding.host.getText().toString().trim();
             String portVal1 = binding.port.getText().toString().trim();
             String proxy_loginVal = binding.proxyLogin.getText().toString().trim();
@@ -91,18 +91,24 @@ public class ProxyActivity extends BaseActivity {
             editor.putString(getString(R.string.SET_PROXY_LOGIN), proxy_loginVal);
             editor.putString(getString(R.string.SET_PROXY_PASSWORD), proxy_passwordVal);
             editor.apply();
-            finish();
         });
+        materialAlertDialogBuilder.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+        Dialog dialog = materialAlertDialogBuilder.create();
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        return dialog;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        return super.onCreateView(inflater, container, savedInstanceState);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
     }
-
-
 }

app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,12 +15,8 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import static app.fedilab.android.helper.PinnedTimelineHelper.sortMenuItem;
-import static app.fedilab.android.helper.PinnedTimelineHelper.sortPositionAsc;
-
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -34,7 +30,6 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;
@@ -42,28 +37,31 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.app.BottomMenu;
-import app.fedilab.android.client.entities.app.InstanceSocial;
-import app.fedilab.android.client.entities.app.Pinned;
-import app.fedilab.android.client.entities.app.PinnedTimeline;
-import app.fedilab.android.client.entities.app.RemoteInstance;
-import app.fedilab.android.client.entities.app.Timeline;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityReorderTabsBinding;
 import app.fedilab.android.databinding.PopupSearchInstanceBinding;
-import app.fedilab.android.exception.DBException;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.helper.itemtouchhelper.OnStartDragListener;
-import app.fedilab.android.helper.itemtouchhelper.SimpleItemTouchHelperCallback;
-import app.fedilab.android.ui.drawer.ReorderBottomMenuAdapter;
-import app.fedilab.android.ui.drawer.ReorderTabAdapter;
-import app.fedilab.android.viewmodel.mastodon.InstanceSocialVM;
-import app.fedilab.android.viewmodel.mastodon.ReorderVM;
+import app.fedilab.android.mastodon.client.entities.app.BottomMenu;
+import app.fedilab.android.mastodon.client.entities.app.InstanceSocial;
+import app.fedilab.android.mastodon.client.entities.app.Pinned;
+import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
+import app.fedilab.android.mastodon.client.entities.app.RemoteInstance;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.PinnedTimelineHelper;
+import app.fedilab.android.mastodon.helper.itemtouchhelper.OnStartDragListener;
+import app.fedilab.android.mastodon.helper.itemtouchhelper.SimpleItemTouchHelperCallback;
+import app.fedilab.android.mastodon.ui.drawer.ReorderBottomMenuAdapter;
+import app.fedilab.android.mastodon.ui.drawer.ReorderTabAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.InstanceSocialVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
 import es.dmoral.toasty.Toasty;
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -74,7 +72,7 @@ import okhttp3.RequestBody;
 import okhttp3.Response;
 
 
-public class ReorderTimelinesActivity extends BaseActivity implements OnStartDragListener {
+public class ReorderTimelinesActivity extends BaseBarActivity implements OnStartDragListener {
 
 
     private ItemTouchHelper touchHelper;
@@ -100,13 +98,12 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityReorderTabsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         searchInstanceRunning = false;
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ReorderTimelinesActivity.this);
@@ -127,7 +124,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                 this.pinned.pinnedTimelines = new ArrayList<>();
                 update = false;
             }
-            sortPositionAsc(this.pinned.pinnedTimelines);
+            PinnedTimelineHelper.sortPositionAsc(this.pinned.pinnedTimelines);
             reorderTabAdapter = new ReorderTabAdapter(this.pinned, ReorderTimelinesActivity.this);
             ItemTouchHelper.Callback callback =
                     new SimpleItemTouchHelperCallback(reorderTabAdapter);
@@ -143,7 +140,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                 this.bottomMenu = new BottomMenu(getApplicationContext()).defaultBottomMenu();
                 this.bottomMenu.bottom_menu = new ArrayList<>();
             }
-            sortMenuItem(this.bottomMenu.bottom_menu);
+            PinnedTimelineHelper.sortMenuItem(this.bottomMenu.bottom_menu);
             reorderBottomMenuAdapter = new ReorderBottomMenuAdapter(this.bottomMenu, ReorderTimelinesActivity.this);
             ItemTouchHelper.Callback callback =
                     new SimpleItemTouchHelperCallback(reorderBottomMenuAdapter);
@@ -174,7 +171,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
     }
 
     private void addInstance() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(ReorderTimelinesActivity.this, Helper.dialogStyle());
+        AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(ReorderTimelinesActivity.this);
         PopupSearchInstanceBinding popupSearchInstanceBinding = PopupSearchInstanceBinding.inflate(getLayoutInflater());
         dialogBuilder.setView(popupSearchInstanceBinding.getRoot());
         TextWatcher textWatcher = autoComplete(popupSearchInstanceBinding);
@@ -265,7 +262,10 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                                     pinnedTimeline.type = Timeline.TimeLineEnum.REMOTE;
                                     pinnedTimeline.position = pinned.pinnedTimelines.size();
                                     pinned.pinnedTimelines.add(pinnedTimeline);
-
+                                    if (pinned.user_id == null || pinned.instance == null) {
+                                        pinned.user_id = MainActivity.currentUserID;
+                                        pinned.instance = MainActivity.currentInstance;
+                                    }
                                     if (update) {
                                         try {
                                             new Pinned(ReorderTimelinesActivity.this).updatePinned(pinned);

app/src/main/java/app/fedilab/android/mastodon/activities/ReportActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,7 +14,6 @@ package app.fedilab.android.activities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
@@ -22,7 +21,6 @@ import android.widget.RadioButton;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.LinearLayoutCompat;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
@@ -33,20 +31,19 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.RelationShip;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityReportBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.RulesAdapter;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.RelationShip;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.drawer.RulesAdapter;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class ReportActivity extends BaseActivity {
+public class ReportActivity extends BaseBarActivity {
 
     private ActivityReportBinding binding;
     private Status status;
@@ -64,14 +61,13 @@ public class ReportActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityReportBinding.inflate(getLayoutInflater());
 
         setContentView(binding.getRoot());
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         Bundle b = getIntent().getExtras();

app/src/main/java/app/fedilab/android/mastodon/activities/ScheduledActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,23 +17,20 @@ package app.fedilab.android.activities;
 import static app.fedilab.android.BaseMainActivity.currentAccount;
 
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.MenuItem;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
 
 import com.google.android.material.tabs.TabLayout;
 
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivityScheduledBinding;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.pageadapter.FedilabScheduledPageAdapter;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.ui.pageadapter.FedilabScheduledPageAdapter;
 
 public class ScheduledActivity extends BaseActivity {
 
@@ -42,7 +39,7 @@ public class ScheduledActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityScheduledBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
@@ -50,7 +47,6 @@ public class ScheduledActivity extends BaseActivity {
         //Remove title
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -68,8 +64,7 @@ public class ScheduledActivity extends BaseActivity {
         binding.scheduleViewpager.setAdapter(new FedilabScheduledPageAdapter(getSupportFragmentManager()));
         binding.scheduleViewpager.setOffscreenPageLimit(3);
         binding.scheduleViewpager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(binding.scheduleTablayout));
-        binding.scheduleTablayout.setTabTextColors(ThemeHelper.getAttColor(ScheduledActivity.this, R.attr.mTextColor), ContextCompat.getColor(ScheduledActivity.this, R.color.cyanea_accent_dark_reference));
-        binding.scheduleTablayout.setTabIconTint(ThemeHelper.getColorStateList(ScheduledActivity.this));
+
 
         binding.scheduleTablayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override

app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,8 +16,9 @@ package app.fedilab.android.activities;
 
 import android.app.SearchManager;
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
+import android.database.MatrixCursor;
 import android.os.Bundle;
+import android.provider.BaseColumns;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -27,38 +28,54 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
-import androidx.core.content.ContextCompat;
+import androidx.cursoradapter.widget.CursorAdapter;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.FutureTarget;
+import com.bumptech.glide.request.target.Target;
 import com.google.android.material.tabs.TabLayout;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.util.concurrent.ExecutionException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivitySearchResultTabsBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAccount;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTag;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.drawer.AccountsSearchTopBarAdapter;
+import app.fedilab.android.mastodon.ui.drawer.TagSearchTopBarAdapter;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAccount;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTag;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class SearchResultTabActivity extends BaseActivity {
+public class SearchResultTabActivity extends BaseBarActivity {
 
 
     private String search;
     private ActivitySearchResultTabsBinding binding;
     private TabLayout.Tab initial;
+    public Boolean tagEmpty, accountEmpty;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivitySearchResultTabsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
@@ -75,7 +92,6 @@ public class SearchResultTabActivity extends BaseActivity {
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         setTitle(search);
         initial = binding.searchTabLayout.newTab();
@@ -83,8 +99,6 @@ public class SearchResultTabActivity extends BaseActivity {
         binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.accounts)));
         binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.toots)));
         binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.action_cache)));
-        binding.searchTabLayout.setTabTextColors(ThemeHelper.getAttColor(SearchResultTabActivity.this, R.attr.mTextColor), ContextCompat.getColor(SearchResultTabActivity.this, R.color.cyanea_accent_dark_reference));
-        binding.searchTabLayout.setTabIconTint(ThemeHelper.getColorStateList(SearchResultTabActivity.this));
         binding.searchTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -136,15 +150,85 @@ public class SearchResultTabActivity extends BaseActivity {
                 search = query.trim();
                 ScreenSlidePagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
                 binding.searchViewpager.setAdapter(mPagerAdapter);
-                searchView.clearFocus();
                 setTitle(search);
                 searchView.setIconified(true);
+                searchView.setQuery(search, false);
+                searchView.clearFocus();
                 binding.searchTabLayout.selectTab(initial);
                 return false;
             }
 
             @Override
             public boolean onQueryTextChange(String newText) {
+                String pattern = "^(@[\\w_-]+@[a-z0-9.\\-]+|@[\\w_-]+)";
+                final Pattern mentionPattern = Pattern.compile(pattern);
+                String patternTag = "^#([\\w-]{2,})$";
+                final Pattern tagPattern = Pattern.compile(patternTag);
+                Matcher matcherMention, matcherTag;
+                matcherMention = mentionPattern.matcher(newText);
+                matcherTag = tagPattern.matcher(newText);
+                if (newText.trim().isEmpty()) {
+                    searchView.setSuggestionsAdapter(null);
+                }
+                if (matcherMention.matches()) {
+                    String[] from = new String[]{SearchManager.SUGGEST_COLUMN_ICON_1, SearchManager.SUGGEST_COLUMN_TEXT_1};
+                    int[] to = new int[]{R.id.account_pp, R.id.account_un};
+                    String searchGroup = matcherMention.group();
+                    AccountsVM accountsVM = new ViewModelProvider(SearchResultTabActivity.this).get(AccountsVM.class);
+                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,
+                            SearchManager.SUGGEST_COLUMN_ICON_1,
+                            SearchManager.SUGGEST_COLUMN_TEXT_1});
+                    accountsVM.searchAccounts(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, 5, false, false)
+                            .observe(SearchResultTabActivity.this, accounts -> {
+                                if (accounts == null) {
+                                    return;
+                                }
+                                AccountsSearchTopBarAdapter cursorAdapter = new AccountsSearchTopBarAdapter(SearchResultTabActivity.this, accounts, R.layout.drawer_account_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);
+                                searchView.setSuggestionsAdapter(cursorAdapter);
+                                new Thread(() -> {
+                                    int i = 0;
+                                    for (Account account : accounts) {
+                                        FutureTarget<File> futureTarget = Glide
+                                                .with(SearchResultTabActivity.this.getApplicationContext())
+                                                .load(account.avatar_static)
+                                                .downloadOnly(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL);
+                                        File cacheFile;
+                                        try {
+                                            cacheFile = futureTarget.get();
+                                            cursor.addRow(new String[]{String.valueOf(i), cacheFile.getAbsolutePath(), "@" + account.acct});
+                                            i++;
+                                        } catch (ExecutionException | InterruptedException e) {
+                                            e.printStackTrace();
+                                        }
+                                    }
+                                    runOnUiThread(() -> cursorAdapter.changeCursor(cursor));
+                                }).start();
+
+                            });
+                } else if (matcherTag.matches()) {
+                    SearchVM searchVM = new ViewModelProvider(SearchResultTabActivity.this).get(SearchVM.class);
+                    String[] from = new String[]{SearchManager.SUGGEST_COLUMN_TEXT_1};
+                    int[] to = new int[]{R.id.tag_name};
+                    String searchGroup = matcherTag.group();
+                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,
+                            SearchManager.SUGGEST_COLUMN_TEXT_1});
+                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, null,
+                            "hashtags", false, true, false, 0,
+                            null, null, 10).observe(SearchResultTabActivity.this,
+                            results -> {
+                                if (results == null || results.hashtags == null) {
+                                    return;
+                                }
+                                TagSearchTopBarAdapter cursorAdapter = new TagSearchTopBarAdapter(SearchResultTabActivity.this, results.hashtags, R.layout.drawer_tag_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);
+                                searchView.setSuggestionsAdapter(cursorAdapter);
+                                int i = 0;
+                                for (Tag tag : results.hashtags) {
+                                    cursor.addRow(new String[]{String.valueOf(i), "#" + tag.name});
+                                    i++;
+                                }
+                                runOnUiThread(() -> cursorAdapter.changeCursor(cursor));
+                            });
+                }
                 return false;
             }
         });
@@ -193,6 +277,18 @@ public class SearchResultTabActivity extends BaseActivity {
     }
 
 
+    public void moveToAccount() {
+        tagEmpty = null;
+        accountEmpty = null;
+        binding.searchViewpager.setCurrentItem(1);
+    }
+
+    public void moveToMessage() {
+        tagEmpty = null;
+        accountEmpty = null;
+        binding.searchViewpager.setCurrentItem(2);
+    }
+
     /**
      * Pager adapter for the 4 fragments
      */

app/src/main/java/app/fedilab/android/mastodon/activities/SettingsActivity.java

@@ -0,0 +1,57 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import static androidx.navigation.ui.NavigationUI.setupActionBarWithNavController;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.navigation.NavController;
+import androidx.navigation.Navigation;
+import androidx.navigation.ui.AppBarConfiguration;
+
+import app.fedilab.android.R;
+import app.fedilab.android.databinding.ActivitySettingsBinding;
+
+public class SettingsActivity extends BaseBarActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        app.fedilab.android.databinding.ActivitySettingsBinding binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        NavController navController = Navigation.findNavController(this, R.id.fragment_container);
+        AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder().build();
+        setupActionBarWithNavController(this, navController, appBarConfiguration);
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        NavController navController = Navigation.findNavController(this, R.id.fragment_container);
+        return navController.navigateUp() || super.onSupportNavigateUp();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        NavController navController = Navigation.findNavController(this, R.id.fragment_container);
+        if (item.getItemId() == android.R.id.home && navController.getCurrentDestination() != null && navController.getCurrentDestination().getId() == R.id.FragmentSettingsCategories) {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/StatusHistoryActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,38 +16,35 @@ package app.fedilab.android.activities;
 
 
 import android.content.res.Resources;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import app.fedilab.android.R;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityStatusHistoryBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.StatusHistoryAdapter;
-import app.fedilab.android.viewmodel.mastodon.StatusesVM;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.drawer.StatusHistoryAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class StatusHistoryActivity extends BaseActivity {
+public class StatusHistoryActivity extends BaseBarActivity {
 
     public static Resources.Theme theme;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         ActivityStatusHistoryBinding binding = ActivityStatusHistoryBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         Bundle b = getIntent().getExtras();

app/src/main/java/app/fedilab/android/mastodon/activities/StatusInfoActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,13 +15,11 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -31,16 +29,15 @@ import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Accounts;
-import app.fedilab.android.client.entities.api.RelationShip;
-import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.databinding.ActivityStatusInfoBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.drawer.AccountAdapter;
-import app.fedilab.android.viewmodel.mastodon.AccountsVM;
-import app.fedilab.android.viewmodel.mastodon.StatusesVM;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Accounts;
+import app.fedilab.android.mastodon.client.entities.api.RelationShip;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.drawer.AccountAdapter;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
 
 
 public class StatusInfoActivity extends BaseActivity {
@@ -56,14 +53,13 @@ public class StatusInfoActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityStatusInfoBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         accountList = new ArrayList<>();
         Bundle b = getIntent().getExtras();

app/src/main/java/app/fedilab/android/mastodon/activities/SuggestionActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,35 +14,30 @@ package app.fedilab.android.activities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import androidx.core.content.ContextCompat;
-
 import org.jetbrains.annotations.NotNull;
 
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivitySuggestionsBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonSuggestion;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonSuggestion;
 
 
-public class SuggestionActivity extends BaseActivity {
+public class SuggestionActivity extends BaseBarActivity {
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         ActivitySuggestionsBinding binding = ActivitySuggestionsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_suggestions, new FragmentMastodonSuggestion(), null, null, null);

app/src/main/java/app/fedilab/android/mastodon/activities/TrendsActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities;
+package app.fedilab.android.mastodon.activities;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,13 +14,11 @@ package app.fedilab.android.activities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
@@ -32,15 +30,14 @@ import com.google.android.material.tabs.TabLayout;
 import org.jetbrains.annotations.NotNull;
 
 import app.fedilab.android.R;
-import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityTrendsBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTag;
-import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
+import app.fedilab.android.mastodon.client.entities.app.Timeline;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTag;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
 
 
-public class TrendsActivity extends BaseActivity {
+public class TrendsActivity extends BaseBarActivity {
 
 
     private ActivityTrendsBinding binding;
@@ -48,20 +45,17 @@ public class TrendsActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityTrendsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
 
         binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.tags)));
         binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.toots)));
-        binding.searchTabLayout.setTabTextColors(ThemeHelper.getAttColor(TrendsActivity.this, R.attr.mTextColor), ContextCompat.getColor(TrendsActivity.this, R.color.cyanea_accent_dark_reference));
-        binding.searchTabLayout.setTabIconTint(ThemeHelper.getColorStateList(TrendsActivity.this));
         binding.searchTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {

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

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities.admin;
+package app.fedilab.android.mastodon.activities.admin;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -19,7 +19,6 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -54,20 +53,20 @@ import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.activities.BaseActivity;
-import app.fedilab.android.activities.InstanceProfileActivity;
 import app.fedilab.android.activities.MainActivity;
-import app.fedilab.android.activities.MediaActivity;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.admin.AdminAccount;
-import app.fedilab.android.client.entities.api.admin.AdminIp;
 import app.fedilab.android.databinding.ActivityAdminAccountBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.SpannableHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.AdminVM;
-import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;
+import app.fedilab.android.mastodon.activities.BaseActivity;
+import app.fedilab.android.mastodon.activities.InstanceProfileActivity;
+import app.fedilab.android.mastodon.activities.MediaActivity;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminIp;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.helper.SpannableHelper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
 import es.dmoral.toasty.Toasty;
 
 
@@ -83,7 +82,7 @@ public class AdminAccountActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityAdminAccountBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
@@ -99,7 +98,6 @@ public class AdminAccountActivity extends BaseActivity {
         //Remove title
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
         float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);
@@ -108,7 +106,6 @@ public class AdminAccountActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
-        binding.toolbar.setPopupTheme(Helper.popupStyle());
         adminVM = new ViewModelProvider(AdminAccountActivity.this).get(AdminVM.class);
         if (account_id != null) {
             adminVM.getAccount(MainActivity.currentInstance, MainActivity.currentToken, account_id).observe(this, this::initializeView);
@@ -272,7 +269,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) {
@@ -295,7 +292,7 @@ public class AdminAccountActivity extends BaseActivity {
 
         final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AdminAccountActivity.this, R.color.cyanea_accent_reference)), 0, content.length(),
+        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
         //This account was moved to another one
@@ -368,12 +365,11 @@ public class AdminAccountActivity extends BaseActivity {
                 binding.instanceInfo.setVisibility(View.VISIBLE);
 
                 binding.instanceInfo.setOnClickListener(v -> {
-                    Intent intent = new Intent(AdminAccountActivity.this, InstanceProfileActivity.class);
+                    InstanceProfileActivity instanceProfileActivity = new InstanceProfileActivity();
                     Bundle b = new Bundle();
                     b.putString(Helper.ARG_INSTANCE, finalAccountInstance);
-                    intent.putExtras(b);
-                    startActivity(intent);
-
+                    instanceProfileActivity.setArguments(b);
+                    instanceProfileActivity.show(getSupportFragmentManager(), null);
                 });
             }
         });

app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities.admin;
+package app.fedilab.android.mastodon.activities.admin;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,15 +14,14 @@ package app.fedilab.android.activities.admin;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import static app.fedilab.android.activities.admin.AdminActionActivity.AdminEnum.ACCOUNT;
-import static app.fedilab.android.activities.admin.AdminActionActivity.AdminEnum.DOMAIN;
-import static app.fedilab.android.activities.admin.AdminActionActivity.AdminEnum.REPORT;
+import static app.fedilab.android.mastodon.activities.admin.AdminActionActivity.AdminEnum.ACCOUNT;
+import static app.fedilab.android.mastodon.activities.admin.AdminActionActivity.AdminEnum.DOMAIN;
+import static app.fedilab.android.mastodon.activities.admin.AdminActionActivity.AdminEnum.REPORT;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -30,26 +29,26 @@ import android.view.MenuItem;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.gson.annotations.SerializedName;
 
 import app.fedilab.android.R;
-import app.fedilab.android.activities.BaseActivity;
-import app.fedilab.android.client.entities.api.admin.AdminDomainBlock;
 import app.fedilab.android.databinding.ActivityAdminActionsBinding;
 import app.fedilab.android.databinding.PopupAdminFilterAccountsBinding;
 import app.fedilab.android.databinding.PopupAdminFilterReportsBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.ui.fragment.admin.FragmentAdminAccount;
-import app.fedilab.android.ui.fragment.admin.FragmentAdminDomain;
-import app.fedilab.android.ui.fragment.admin.FragmentAdminReport;
+import app.fedilab.android.mastodon.activities.BaseBarActivity;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminDomainBlock;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.ui.fragment.admin.FragmentAdminAccount;
+import app.fedilab.android.mastodon.ui.fragment.admin.FragmentAdminDomain;
+import app.fedilab.android.mastodon.ui.fragment.admin.FragmentAdminReport;
 
-public class AdminActionActivity extends BaseActivity {
+public class AdminActionActivity extends BaseBarActivity {
 
     public static Boolean local = true, remote = true, active = true, pending = true, disabled = true, silenced = true, suspended = true, staff = null, orderByMostRecent = true;
     public static Boolean resolved = null, reportLocal = true, reportRemote = true;
@@ -81,13 +80,12 @@ public class AdminActionActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         binding = ActivityAdminActionsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, new IntentFilter(Helper.BROADCAST_DATA));
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         canGoBack = false;
         binding.reports.setOnClickListener(v -> displayTimeline(REPORT));
@@ -167,7 +165,7 @@ public class AdminActionActivity extends BaseActivity {
             return true;
         } else if (item.getItemId() == R.id.action_filter) {
             if (getTitle().toString().equalsIgnoreCase(getString(R.string.accounts))) {
-                AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdminActionActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder alertDialogBuilder = new MaterialAlertDialogBuilder(AdminActionActivity.this);
                 PopupAdminFilterAccountsBinding binding = PopupAdminFilterAccountsBinding.inflate(getLayoutInflater());
                 alertDialogBuilder.setView(binding.getRoot());
                 if (local != null && remote == null) {
@@ -261,7 +259,7 @@ public class AdminActionActivity extends BaseActivity {
                 AlertDialog alert = alertDialogBuilder.create();
                 alert.show();
             } else {
-                AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdminActionActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder alertDialogBuilder = new MaterialAlertDialogBuilder(AdminActionActivity.this);
                 PopupAdminFilterReportsBinding binding = PopupAdminFilterReportsBinding.inflate(getLayoutInflater());
                 alertDialogBuilder.setView(binding.getRoot());
                 if (resolved == null) {

app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminDomainBlockActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities.admin;
+package app.fedilab.android.mastodon.activities.admin;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,10 +15,7 @@ package app.fedilab.android.activities.admin;
  * see <http://www.gnu.org/licenses>. */
 
 
-import static app.fedilab.android.helper.Helper.BROADCAST_DATA;
-
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -28,21 +25,21 @@ import android.widget.ArrayAdapter;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import app.fedilab.android.R;
-import app.fedilab.android.activities.BaseActivity;
 import app.fedilab.android.activities.MainActivity;
-import app.fedilab.android.client.entities.api.admin.AdminDomainBlock;
 import app.fedilab.android.databinding.ActivityAdminDomainblockBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.AdminVM;
+import app.fedilab.android.mastodon.activities.BaseBarActivity;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminDomainBlock;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
 import es.dmoral.toasty.Toasty;
 
-public class AdminDomainBlockActivity extends BaseActivity {
+public class AdminDomainBlockActivity extends BaseBarActivity {
 
 
     private final String[] severityChoices = {"silence", "suspend", "noop"};
@@ -52,12 +49,11 @@ public class AdminDomainBlockActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeBar(this);
+
         ActivityAdminDomainblockBinding binding = ActivityAdminDomainblockBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         Bundle b = getIntent().getExtras();
         if (b != null) {
@@ -111,7 +107,7 @@ public class AdminDomainBlockActivity extends BaseActivity {
                                 } else {
                                     Toasty.error(AdminDomainBlockActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
                                 }
-                                Intent intent = new Intent(BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK, adminDomainBlockResult);
+                                Intent intent = new Intent(Helper.BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK, adminDomainBlockResult);
                                 LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent);
                                 finish();
                             }
@@ -133,13 +129,13 @@ public class AdminDomainBlockActivity extends BaseActivity {
             return true;
         } else if (itemId == R.id.action_delete) {
             if (adminDomainBlock.id != null) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(AdminDomainBlockActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder builder = new MaterialAlertDialogBuilder(AdminDomainBlockActivity.this);
                 builder.setMessage(getString(R.string.unblock_domain_confirm, adminDomainBlock.domain));
                 builder
                         .setPositiveButton(R.string.unblock_domain, (dialog, which) -> {
                             adminVM.deleteDomain(MainActivity.currentInstance, MainActivity.currentToken, adminDomainBlock.id)
                                     .observe(AdminDomainBlockActivity.this, adminDomainBlockResult -> {
-                                                Intent intent = new Intent(BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK_DELETE, adminDomainBlock);
+                                                Intent intent = new Intent(Helper.BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK_DELETE, adminDomainBlock);
                                                 LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent);
                                                 finish();
                                             }

app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminReportActivity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.activities.admin;
+package app.fedilab.android.mastodon.activities.admin;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -19,7 +19,6 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -55,24 +54,24 @@ import java.util.concurrent.TimeUnit;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
-import app.fedilab.android.activities.BaseActivity;
-import app.fedilab.android.activities.InstanceProfileActivity;
-import app.fedilab.android.activities.MediaActivity;
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.admin.AdminAccount;
-import app.fedilab.android.client.entities.api.admin.AdminIp;
 import app.fedilab.android.databinding.ActivityAdminAccountBinding;
-import app.fedilab.android.helper.Helper;
-import app.fedilab.android.helper.MastodonHelper;
-import app.fedilab.android.helper.SpannableHelper;
-import app.fedilab.android.helper.ThemeHelper;
-import app.fedilab.android.viewmodel.mastodon.AdminVM;
-import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;
+import app.fedilab.android.mastodon.activities.BaseBarActivity;
+import app.fedilab.android.mastodon.activities.InstanceProfileActivity;
+import app.fedilab.android.mastodon.activities.MediaActivity;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminIp;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.helper.SpannableHelper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
+import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
 import es.dmoral.toasty.Toasty;
 
 
-public class AdminReportActivity extends BaseActivity {
+public class AdminReportActivity extends BaseBarActivity {
 
     private AdminAccount adminAccount;
     private Account account;
@@ -83,7 +82,7 @@ public class AdminReportActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyTheme(this);
+
         binding = ActivityAdminAccountBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
@@ -100,7 +99,6 @@ public class AdminReportActivity extends BaseActivity {
         //Remove title
         if (actionBar != null) {
             actionBar.setDisplayShowTitleEnabled(false);
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
         float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);
@@ -109,7 +107,6 @@ public class AdminReportActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
-        binding.toolbar.setPopupTheme(Helper.popupStyle());
         if (account != null) {
             initializeView(account);
         } else {
@@ -291,7 +288,7 @@ public class AdminReportActivity extends BaseActivity {
                         }
                 );
         //Load header
-        MastodonHelper.loadProfileMediaMastodon(binding.bannerPp, account, MastodonHelper.MediaAccountType.HEADER);
+        MastodonHelper.loadProfileMediaMastodon(AdminReportActivity.this, binding.bannerPp, account, MastodonHelper.MediaAccountType.HEADER);
         //Redraws icon for locked accounts
         final float scale = getResources().getDisplayMetrics().density;
         if (account.locked) {
@@ -314,7 +311,7 @@ public class AdminReportActivity extends BaseActivity {
 
         final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AdminReportActivity.this, R.color.cyanea_accent_reference)), 0, content.length(),
+        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),
                 Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
         //This account was moved to another one
@@ -386,12 +383,11 @@ public class AdminReportActivity extends BaseActivity {
                 binding.instanceInfo.setVisibility(View.VISIBLE);
 
                 binding.instanceInfo.setOnClickListener(v -> {
-                    Intent intent = new Intent(AdminReportActivity.this, InstanceProfileActivity.class);
+                    InstanceProfileActivity instanceProfileActivity = new InstanceProfileActivity();
                     Bundle b = new Bundle();
                     b.putString(Helper.ARG_INSTANCE, finalAccountInstance);
-                    intent.putExtras(b);
-                    startActivity(intent);
-
+                    instanceProfileActivity.setArguments(b);
+                    instanceProfileActivity.show(getSupportFragmentManager(), null);
                 });
             }
         });

app/src/main/java/app/fedilab/android/mastodon/broadcastreceiver/NetworkStateReceiver.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.broadcastreceiver;
+package app.fedilab.android.mastodon.broadcastreceiver;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/mastodon/broadcastreceiver/ToastMessage.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.broadcastreceiver;
+package app.fedilab.android.mastodon.broadcastreceiver;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,15 +14,12 @@ package app.fedilab.android.broadcastreceiver;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import static app.fedilab.android.helper.Helper.RECEIVE_TOAST_CONTENT;
-import static app.fedilab.android.helper.Helper.RECEIVE_TOAST_TYPE;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import app.fedilab.android.helper.Helper;
+import app.fedilab.android.mastodon.helper.Helper;
 import es.dmoral.toasty.Toasty;
 
 public class ToastMessage extends BroadcastReceiver {
@@ -30,8 +27,8 @@ public class ToastMessage extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         Bundle b = intent.getExtras();
         if (b != null) {
-            String type = b.getString(RECEIVE_TOAST_TYPE, null);
-            String content = b.getString(RECEIVE_TOAST_CONTENT, null);
+            String type = b.getString(Helper.RECEIVE_TOAST_TYPE, null);
+            String content = b.getString(Helper.RECEIVE_TOAST_CONTENT, null);
             if (type != null && content != null) {
                 switch (type) {
                     case Helper.RECEIVE_TOAST_TYPE_ERROR:

app/src/main/java/app/fedilab/android/mastodon/client/NodeInfoService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client;
+package app.fedilab.android.mastodon.client;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,7 @@ package app.fedilab.android.client;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
+import app.fedilab.android.mastodon.client.entities.app.WellKnownNodeinfo;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Path;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/JoinMastodonService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.JoinMastodonInstance;
+import app.fedilab.android.mastodon.client.entities.api.JoinMastodonInstance;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAccountsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,17 +17,18 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.FeaturedTag;
-import app.fedilab.android.client.entities.api.IdentityProof;
-import app.fedilab.android.client.entities.api.MastodonList;
-import app.fedilab.android.client.entities.api.Preferences;
-import app.fedilab.android.client.entities.api.RelationShip;
-import app.fedilab.android.client.entities.api.Report;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.api.Suggestion;
-import app.fedilab.android.client.entities.api.Tag;
-import app.fedilab.android.client.entities.api.Token;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.FamiliarFollowers;
+import app.fedilab.android.mastodon.client.entities.api.FeaturedTag;
+import app.fedilab.android.mastodon.client.entities.api.IdentityProof;
+import app.fedilab.android.mastodon.client.entities.api.MastodonList;
+import app.fedilab.android.mastodon.client.entities.api.Preferences;
+import app.fedilab.android.mastodon.client.entities.api.RelationShip;
+import app.fedilab.android.mastodon.client.entities.api.Report;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.api.Suggestion;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
+import app.fedilab.android.mastodon.client.entities.api.Token;
 import okhttp3.MultipartBody;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -95,7 +96,7 @@ public interface MastodonAccountsService {
             @Field("source[privacy]") String privacy,
             @Field("source[sensitive]") Boolean sensitive,
             @Field("source[language]") String language,
-            @Field("fields_attributes") List<app.fedilab.android.client.entities.api.Field.FieldParams> fields
+            @Field("fields_attributes") List<app.fedilab.android.mastodon.client.entities.api.Field.FieldParams> fields
     );
 
     //Get Account
@@ -105,6 +106,12 @@ public interface MastodonAccountsService {
             @Path("id") String id
     );
 
+    //Get Account
+    @GET("accounts/lookup")
+    Call<Account> lookUpAccount(
+            @Query("acct") String acct
+    );
+
     //Get Account statuses
     @GET("accounts/{id}/statuses")
     Call<List<Status>> getAccountStatuses(
@@ -167,7 +174,8 @@ public interface MastodonAccountsService {
             @Header("Authorization") String app_token,
             @Path("id") String id,
             @Field("reblogs") boolean reblogs,
-            @Field("notify") boolean notify
+            @Field("notify") boolean notify,
+            @Field("languages[]") List<String> languages
     );
 
     //Follow account
@@ -247,6 +255,13 @@ public interface MastodonAccountsService {
             @Query("id[]") List<String> ids
     );
 
+    //Get familiar followers
+    @GET("accounts/familiar_followers ")
+    Call<List<FamiliarFollowers>> getFamiliarFollowers(
+            @Header("Authorization") String token,
+            @Query("id[]") List<String> ids
+    );
+
     //Get search
     @GET("accounts/search")
     Call<List<Account>> searchAccounts(
@@ -403,4 +418,15 @@ public interface MastodonAccountsService {
             @Header("Authorization") String token,
             @Path("account_id") String account_id
     );
+
+
+    //Get user suggestions
+    @GET("directory")
+    Call<List<Account>> getDirectory(
+            @Header("Authorization") String token,
+            @Query("offset") Integer offset,
+            @Query("limit") Integer limit,
+            @Query("order") String order,
+            @Query("local") Boolean local
+    );
 }

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAdminService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,9 +17,9 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.admin.AdminAccount;
-import app.fedilab.android.client.entities.api.admin.AdminDomainBlock;
-import app.fedilab.android.client.entities.api.admin.AdminReport;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminDomainBlock;
+import app.fedilab.android.mastodon.client.entities.api.admin.AdminReport;
 import retrofit2.Call;
 import retrofit2.http.DELETE;
 import retrofit2.http.Field;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAnnouncementsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Announcement;
+import app.fedilab.android.mastodon.client.entities.api.Announcement;
 import retrofit2.Call;
 import retrofit2.http.DELETE;
 import retrofit2.http.FormUrlEncoded;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAppsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,8 +15,8 @@ package app.fedilab.android.client.endpoints;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.entities.api.App;
-import app.fedilab.android.client.entities.api.Token;
+import app.fedilab.android.mastodon.client.entities.api.App;
+import app.fedilab.android.mastodon.client.entities.api.Token;
 import retrofit2.Call;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonFiltersService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Filter;
+import app.fedilab.android.mastodon.client.entities.api.Filter;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -96,7 +96,7 @@ public interface MastodonFiltersService {
     );
 
     //Remove a keyword for a filter
-    @DELETE("filter_keywords/{id}")
+    @DELETE("filters/keywords/{id}")
     Call<Void> removeKeywordFilter(
             @Header("Authorization") String token,
             @Path("id") String id

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonInstanceService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,11 +17,11 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Activity;
-import app.fedilab.android.client.entities.api.Emoji;
-import app.fedilab.android.client.entities.api.Instance;
-import app.fedilab.android.client.entities.api.Tag;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Activity;
+import app.fedilab.android.mastodon.client.entities.api.Emoji;
+import app.fedilab.android.mastodon.client.entities.api.Instance;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonNotificationsService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,8 +16,8 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Notification;
-import app.fedilab.android.client.entities.api.PushSubscription;
+import app.fedilab.android.mastodon.client.entities.api.Notification;
+import app.fedilab.android.mastodon.client.entities.api.PushSubscription;
 import retrofit2.Call;
 import retrofit2.http.DELETE;
 import retrofit2.http.Field;
@@ -71,7 +71,12 @@ public interface MastodonNotificationsService {
             @Field("data[alerts][favourite]") boolean favourite,
             @Field("data[alerts][reblog]") boolean reblog,
             @Field("data[alerts][mention]") boolean mention,
-            @Field("data[alerts][poll]") boolean poll
+            @Field("data[alerts][poll]") boolean poll,
+            @Field("data[alerts][status]") boolean status,
+            @Field("data[alerts][update]") boolean update,
+            @Field("data[alerts][admin.sign_up]") boolean admin_sign_up,
+            @Field("data[alerts][admin.report]") boolean admin_report
+
     );
 
     @GET("push/subscription")

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonOembedService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,7 @@ package app.fedilab.android.client.endpoints;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.entities.api.Oembed;
+import app.fedilab.android.mastodon.client.entities.api.Oembed;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonSearchService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -15,7 +15,7 @@ package app.fedilab.android.client.endpoints;
  * see <http://www.gnu.org/licenses>. */
 
 
-import app.fedilab.android.client.entities.api.Results;
+import app.fedilab.android.mastodon.client.entities.api.Results;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Header;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonStatusesService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,14 +17,14 @@ package app.fedilab.android.client.endpoints;
 import java.util.Date;
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Attachment;
-import app.fedilab.android.client.entities.api.Card;
-import app.fedilab.android.client.entities.api.Context;
-import app.fedilab.android.client.entities.api.Poll;
-import app.fedilab.android.client.entities.api.ScheduledStatus;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.api.StatusSource;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Attachment;
+import app.fedilab.android.mastodon.client.entities.api.Card;
+import app.fedilab.android.mastodon.client.entities.api.Context;
+import app.fedilab.android.mastodon.client.entities.api.Poll;
+import app.fedilab.android.mastodon.client.entities.api.ScheduledStatus;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.api.StatusSource;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 import retrofit2.Call;
@@ -59,7 +59,9 @@ public interface MastodonStatusesService {
             @Field("sensitive") Boolean sensitive,
             @Field("spoiler_text") String spoiler_text,
             @Field("visibility") String visibility,
-            @Field("language") String language
+            @Field("language") String language,
+            @Field("quote_id") String quote_id,
+            @Field("content_type") String content_type
     );
 
     @GET("statuses/{id}/source")
@@ -89,10 +91,12 @@ public interface MastodonStatusesService {
             @Field("sensitive") Boolean sensitive,
             @Field("spoiler_text") String spoiler_text,
             @Field("visibility") String visibility,
-            @Field("language") String language
+            @Field("language") String language,
+            @Field("media_attributes[id][]") List<String> media_id,
+            @Field("media_attributes[description][]") List<String> media_description,
+            @Field("media_attributes[focus][]") List<String> focus
     );
 
-
     //Post a scheduled status
     @FormUrlEncoded
     @POST("statuses")
@@ -251,7 +255,7 @@ public interface MastodonStatusesService {
             @Part MultipartBody.Part file,
             @Part MultipartBody.Part thumbnail,
             @Part("description") RequestBody description,
-            @Part("focus") String focus
+            @Part("focus") RequestBody focus
     );
 
     //Edit a Media
@@ -314,4 +318,18 @@ public interface MastodonStatusesService {
             @Header("Authorization") String token,
             @Path("id") String id
     );
+
+    @POST("statuses/{id}/react/{name}")
+    Call<Void> addReaction(
+            @Header("Authorization") String app_token,
+            @Path("id") String id,
+            @Path("name") String name
+    );
+
+    @POST("statuses/{id}/unreact/{name}")
+    Call<Void> removeReaction(
+            @Header("Authorization") String app_token,
+            @Path("id") String id,
+            @Path("name") String name
+    );
 }

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTagService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Tag;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Header;

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTimelinesService.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -16,15 +16,15 @@ package app.fedilab.android.client.endpoints;
 
 import java.util.List;
 
-import app.fedilab.android.client.entities.api.Account;
-import app.fedilab.android.client.entities.api.Conversation;
-import app.fedilab.android.client.entities.api.Marker;
-import app.fedilab.android.client.entities.api.MastodonList;
-import app.fedilab.android.client.entities.api.Status;
-import app.fedilab.android.client.entities.api.Tag;
-import app.fedilab.android.client.entities.misskey.MisskeyNote;
-import app.fedilab.android.client.entities.nitter.Nitter;
-import app.fedilab.android.client.entities.peertube.PeertubeVideo;
+import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.Conversation;
+import app.fedilab.android.mastodon.client.entities.api.Marker;
+import app.fedilab.android.mastodon.client.entities.api.MastodonList;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
+import app.fedilab.android.mastodon.client.entities.misskey.MisskeyNote;
+import app.fedilab.android.mastodon.client.entities.nitter.Nitter;
+import app.fedilab.android.mastodon.client.entities.peertube.PeertubeVideo;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -53,6 +53,19 @@ public interface MastodonTimelinesService {
             @Query("limit") Integer limit
     );
 
+    @GET("timelines/bubble")
+    Call<List<Status>> getBubble(
+            @Header("Authorization") String token,
+            @Query("only_media") Boolean only_media,
+            @Query("remote") Boolean remote,
+            @Query("with_muted") Boolean with_muted,
+            @Query("exclude_visibilities") List<String> exclude_visibilities,
+            @Query("reply_visibility") String reply_visibility,
+            @Query("max_id") String max_id,
+            @Query("since_id") String since_id,
+            @Query("min_id") String min_id,
+            @Query("limit") Integer limit
+    );
 
     @GET("trends/statuses")
     Call<List<Status>> getStatusTrends(
@@ -62,7 +75,9 @@ public interface MastodonTimelinesService {
 
 
     @GET("trends/tags")
-    Call<List<Tag>> getTagTrends(@Header("Authorization") String token);
+    Call<List<Tag>> getTagTrends(@Header("Authorization") String token,
+                                 @Query("offset") Integer offset,
+                                 @Query("limit") Integer limit);
 
     //Public Tags timelines
     @GET("timelines/tag/{hashtag}")

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/PleromaAPI.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2022 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/ProgressRequestBody.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.endpoints;
+package app.fedilab.android.mastodon.client.endpoints;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities.api;
+package app.fedilab.android.mastodon.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -14,10 +14,13 @@ package app.fedilab.android.client.entities.api;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import android.app.Activity;
 import android.content.Context;
 import android.text.Spannable;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
@@ -26,7 +29,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import app.fedilab.android.helper.SpannableHelper;
+import app.fedilab.android.mastodon.helper.SpannableHelper;
 
 public class Account implements Serializable {
 
@@ -72,27 +75,68 @@ public class Account implements Serializable {
     public List<Field> fields;
     @SerializedName("suspended")
     public boolean suspended;
+    @SerializedName("limited")
+    public boolean limited;
     @SerializedName("discoverable")
     public boolean discoverable;
+    @SerializedName("group")
+    public boolean group;
     @SerializedName("mute_expires_at")
     public Date mute_expires_at;
     @SerializedName("moved")
     public Account moved;
+    @SerializedName("role")
+    public Role role;
     public transient RelationShip relationShip;
 
     public synchronized Spannable getSpanDisplayName(Context context, WeakReference<View> viewWeakReference) {
         if (display_name == null || display_name.isEmpty()) {
             display_name = username;
         }
-        return SpannableHelper.convert(context, display_name, null, this, null, false, viewWeakReference);
+        return SpannableHelper.convert(context, display_name, null, this, null, viewWeakReference);
+    }
+
+    public synchronized Spannable getSpanDisplayName(Activity activity, WeakReference<View> viewWeakReference) {
+        if (display_name == null || display_name.isEmpty()) {
+            display_name = username;
+        }
+        return SpannableHelper.convertEmoji(activity, display_name, this, viewWeakReference);
     }
 
     public synchronized Spannable getSpanDisplayNameTitle(Context context, WeakReference<View> viewWeakReference, String title) {
-        return SpannableHelper.convert(context, title, null, this, null, false, viewWeakReference);
+        return SpannableHelper.convert(context, title, null, this, null, viewWeakReference);
     }
 
     public synchronized Spannable getSpanNote(Context context, WeakReference<View> viewWeakReference) {
-        return SpannableHelper.convert(context, note, null, this, null, true, viewWeakReference);
+        return SpannableHelper.convert(context, note, null, this, null, viewWeakReference);
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        boolean same = false;
+        if (obj instanceof Account) {
+            same = this.id.equals(((Account) obj).id);
+        }
+        return same;
+    }
+
+    public static class Role implements Serializable {
+        @SerializedName("id")
+        public String id;
+        @SerializedName("name")
+        public String name;
+        @SerializedName("color")
+        public String color;
+        @SerializedName("position")
+        public int position;
+        @SerializedName("permissions")
+        public int permissions;
+        @SerializedName("highlighted")
+        public boolean highlighted;
+        @SerializedName("created_at")
+        public Date created_at;
+        @SerializedName("updated_at")
+        public Date updated_at;
     }
 
     public static class AccountParams implements Serializable {

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Accounts.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities.api;
+package app.fedilab.android.mastodon.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Activity.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities.api;
+package app.fedilab.android.mastodon.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Announcement.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities.api;
+package app.fedilab.android.mastodon.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab
@@ -24,7 +24,7 @@ import java.lang.ref.WeakReference;
 import java.util.Date;
 import java.util.List;
 
-import app.fedilab.android.helper.SpannableHelper;
+import app.fedilab.android.mastodon.helper.SpannableHelper;
 
 public class Announcement {
     @SerializedName("id")
@@ -56,7 +56,7 @@ public class Announcement {
 
 
     public synchronized Spannable getSpanContent(Context context, WeakReference<View> viewWeakReference) {
-        return SpannableHelper.convert(context, content, null, null, this, true, viewWeakReference);
+        return SpannableHelper.convert(context, content, null, null, this, viewWeakReference);
     }
 
 }

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/App.java

@@ -1,4 +1,4 @@
-package app.fedilab.android.client.entities.api;
+package app.fedilab.android.mastodon.client.entities.api;
 /* Copyright 2021 Thomas Schneider
  *
  * This file is a part of Fedilab